diff --git a/Makefile.dep b/Makefile.dep index 0fde751..7345dd5 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/item.h ./core/slog.h ./core/threadmanager.cpp ./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/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/image.h ./core/plugindata.cpp ./core/request.cpp ./core/app.h ./core/basethread.cpp ./core/sessionidmanager.h ./core/winix_const.h ./core/sessionidmanager.cpp ./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 ./templates/generic.cpp ./templates/currentdate.cpp ./templates/server.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/cache.cpp ../ezc/src/cache.h ../ezc/src/blocks.h ../ezc/src/blocks.cpp ../ezc/src/objects.h ../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/item.h ./core/slog.h ./core/threadmanager.cpp ./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/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/image.h ./core/plugindata.cpp ./core/request.cpp ./core/app.h ./core/basethread.cpp ./core/sessionidmanager.h ./core/winix_const.h ./core/sessionidmanager.cpp ./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 ./templates/generic.cpp ./templates/currentdate.cpp ./templates/server.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/cache.cpp ../ezc/src/cache.h ../ezc/src/blocks.h ../ezc/src/blocks.cpp ../ezc/src/objects.h ../ezc/src/outstreams.h ../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 4ff5f89..ada5090 100644 --- a/core/Makefile.dep +++ b/core/Makefile.dep @@ -27,21 +27,22 @@ app.o: ../../winix/core/user.h ../../winix/core/group.h app.o: ../../winix/core/dircontainer.h ../../winix/core/ugcontainer.h log.h app.o: textstream.h logmanipulators.h slog.h cur.h request.h error.h app.o: ../../winix/templates/htmltextstream.h -app.o: ../../pikotools/space/spacetojson.h session.h user.h plugindata.h -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/blocks.h ../../ezc/src/cache.h -app.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -app.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h -app.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -app.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h -app.o: ../../winix/core/config.h ../../winix/core/users.h ugcontainer.h -app.o: lastcontainer.h mounts.h mountparser.h crypt.h run.h users.h groups.h -app.o: group.h loadavg.h image.h threadmanager.h timezones.h timezone.h -app.o: sessionmanager.h sessioncontainer.h ipbancontainer.h -app.o: sessionidmanager.h ../../tito/src/base64.h ../../tito/src/aes.h +app.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +app.o: session.h user.h plugindata.h rebus.h ipban.h mount.h +app.o: ../../winix/templates/locale.h ../../winix/notify/notify.h +app.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h +app.o: ../../winix/templates/locale.h ../../winix/templates/localefilter.h +app.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h ../../ezc/src/blocks.h +app.o: ../../ezc/src/cache.h ../../ezc/src/functions.h +app.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h +app.o: ../../ezc/src/pattern.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 sessionidmanager.h +app.o: ../../tito/src/base64.h ../../tito/src/aes.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 @@ -86,9 +87,9 @@ compress.o: logmanipulators.h slog.h cur.h request.h item.h error.h config.h compress.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h compress.o: htmlfilter.h ../../winix/templates/htmltextstream.h compress.o: ../../winix/core/textstream.h misc.h ../../pikotools/utf8/utf8.h -compress.o: winix_const.h ../../pikotools/space/spacetojson.h session.h -compress.o: user.h plugindata.h rebus.h ipban.h mount.h -compress.o: ../../winix/templates/locale.h +compress.o: winix_const.h ../../pikotools/space/spacetojson.h +compress.o: ../../ezc/src/outstreams.h session.h user.h plugindata.h rebus.h +compress.o: ipban.h mount.h ../../winix/templates/locale.h config.o: config.h ../../pikotools/space/spaceparser.h config.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h config.o: htmlfilter.h log.h textstream.h logmanipulators.h @@ -101,29 +102,29 @@ config.o: ../../pikotools/textstream/types.h slog.h cur.h request.h config.o: requesttypes.h item.h error.h config.o: ../../winix/templates/htmltextstream.h config.o: ../../winix/core/textstream.h misc.h ../../pikotools/utf8/utf8.h -config.o: winix_const.h ../../pikotools/space/spacetojson.h session.h user.h -config.o: plugindata.h rebus.h ipban.h mount.h ../../winix/templates/locale.h -config.o: plugin.h pluginmsg.h system.h job.h basethread.h synchro.h dirs.h -config.o: dircontainer.h ../../winix/db/db.h ../../winix/db/dbbase.h -config.o: ../../winix/db/dbconn.h ../../winix/db/dbtextstream.h -config.o: ../../winix/core/error.h ../../winix/db/dbitemquery.h -config.o: ../../winix/core/item.h ../../winix/db/dbitemcolumns.h -config.o: ../../winix/core/user.h ../../winix/core/group.h -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/blocks.h -config.o: ../../ezc/src/cache.h ../../ezc/src/functions.h -config.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -config.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h -config.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -config.o: ../../winix/notify/templatesnotify.h ../../winix/core/config.h -config.o: ../../winix/core/users.h ugcontainer.h lastcontainer.h mounts.h -config.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h -config.o: image.h threadmanager.h timezones.h timezone.h sessionmanager.h -config.o: sessioncontainer.h ipbancontainer.h sessionidmanager.h -config.o: ../../tito/src/base64.h ../../tito/src/aes.h +config.o: winix_const.h ../../pikotools/space/spacetojson.h +config.o: ../../ezc/src/outstreams.h session.h user.h plugindata.h rebus.h +config.o: ipban.h mount.h ../../winix/templates/locale.h plugin.h pluginmsg.h +config.o: system.h job.h basethread.h synchro.h dirs.h dircontainer.h +config.o: ../../winix/db/db.h ../../winix/db/dbbase.h ../../winix/db/dbconn.h +config.o: ../../winix/db/dbtextstream.h ../../winix/core/error.h +config.o: ../../winix/db/dbitemquery.h ../../winix/core/item.h +config.o: ../../winix/db/dbitemcolumns.h ../../winix/core/user.h +config.o: ../../winix/core/group.h ../../winix/core/dircontainer.h +config.o: ../../winix/core/ugcontainer.h ../../winix/notify/notify.h +config.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h +config.o: ../../winix/templates/locale.h ../../winix/templates/localefilter.h +config.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h +config.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h +config.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h +config.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h +config.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +config.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +config.o: ../../winix/core/config.h ../../winix/core/users.h ugcontainer.h +config.o: lastcontainer.h mounts.h mountparser.h crypt.h run.h users.h +config.o: groups.h group.h loadavg.h image.h threadmanager.h timezones.h +config.o: timezone.h sessionmanager.h sessioncontainer.h ipbancontainer.h +config.o: sessionidmanager.h ../../tito/src/base64.h ../../tito/src/aes.h config.o: ../../winix/functions/functions.h config.o: ../../winix/functions/functionbase.h ../../winix/core/request.h config.o: ../../winix/core/system.h ../../winix/core/synchro.h @@ -166,8 +167,9 @@ crypt.o: ../../pikotools/membuffer/membuffer.h crypt.o: ../../pikotools/textstream/types.h slog.h cur.h request.h crypt.o: requesttypes.h item.h error.h ../../winix/templates/htmltextstream.h crypt.o: ../../winix/core/textstream.h misc.h winix_const.h -crypt.o: ../../pikotools/space/spacetojson.h session.h plugindata.h rebus.h -crypt.o: ipban.h mount.h ../../winix/templates/locale.h +crypt.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +crypt.o: session.h plugindata.h rebus.h ipban.h mount.h +crypt.o: ../../winix/templates/locale.h dircontainer.o: dircontainer.h item.h ../../pikotools/space/space.h dircontainer.o: ../../pikotools/textstream/types.h dircontainer.o: ../../pikotools/date/date.h log.h textstream.h @@ -182,9 +184,9 @@ dircontainer.o: ../../pikotools/space/space.h htmlfilter.h dircontainer.o: ../../winix/templates/htmltextstream.h dircontainer.o: ../../winix/core/textstream.h misc.h dircontainer.o: ../../pikotools/utf8/utf8.h winix_const.h -dircontainer.o: ../../pikotools/space/spacetojson.h session.h user.h -dircontainer.o: plugindata.h rebus.h ipban.h mount.h -dircontainer.o: ../../winix/templates/locale.h +dircontainer.o: ../../pikotools/space/spacetojson.h +dircontainer.o: ../../ezc/src/outstreams.h session.h user.h plugindata.h +dircontainer.o: rebus.h ipban.h mount.h ../../winix/templates/locale.h dirs.o: dirs.h item.h ../../pikotools/space/space.h dirs.o: ../../pikotools/textstream/types.h ../../pikotools/date/date.h dirs.o: dircontainer.h ../../winix/db/db.h ../../winix/db/dbbase.h @@ -202,12 +204,12 @@ dirs.o: ../../winix/core/group.h ../../winix/core/dircontainer.h dirs.o: ../../winix/core/ugcontainer.h log.h textstream.h logmanipulators.h dirs.o: slog.h cur.h request.h error.h config.h htmlfilter.h dirs.o: ../../winix/templates/htmltextstream.h -dirs.o: ../../pikotools/space/spacetojson.h session.h user.h plugindata.h -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/blocks.h +dirs.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +dirs.o: session.h user.h plugindata.h rebus.h ipban.h mount.h +dirs.o: ../../winix/templates/locale.h ../../winix/notify/notify.h +dirs.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h +dirs.o: ../../winix/templates/locale.h ../../winix/templates/localefilter.h +dirs.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h ../../ezc/src/blocks.h dirs.o: ../../ezc/src/cache.h ../../ezc/src/functions.h dirs.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h dirs.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h @@ -232,8 +234,9 @@ groups.o: ../../winix/core/group.h ../../winix/core/dircontainer.h groups.o: ../../winix/core/ugcontainer.h log.h textstream.h logmanipulators.h groups.o: slog.h cur.h request.h error.h config.h htmlfilter.h groups.o: ../../winix/templates/htmltextstream.h -groups.o: ../../pikotools/space/spacetojson.h session.h user.h plugindata.h -groups.o: rebus.h ipban.h mount.h ../../winix/templates/locale.h +groups.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +groups.o: session.h user.h plugindata.h rebus.h ipban.h mount.h +groups.o: ../../winix/templates/locale.h htmlfilter.o: htmlfilter.h httpsimpleparser.o: httpsimpleparser.h misc.h item.h httpsimpleparser.o: ../../pikotools/space/space.h @@ -262,13 +265,13 @@ image.o: ../../winix/core/group.h ../../winix/core/dircontainer.h image.o: ../../winix/core/ugcontainer.h log.h logmanipulators.h slog.h cur.h image.o: request.h error.h config.h htmlfilter.h image.o: ../../winix/templates/htmltextstream.h -image.o: ../../pikotools/space/spacetojson.h session.h user.h plugindata.h -image.o: rebus.h ipban.h mount.h ../../winix/templates/locale.h -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/blocks.h +image.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +image.o: session.h user.h plugindata.h rebus.h ipban.h mount.h +image.o: ../../winix/templates/locale.h ../../winix/core/config.h system.h +image.o: job.h dirs.h dircontainer.h ../../winix/notify/notify.h +image.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h +image.o: ../../winix/templates/locale.h ../../winix/templates/localefilter.h +image.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h ../../ezc/src/blocks.h image.o: ../../ezc/src/cache.h ../../ezc/src/functions.h image.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h image.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h @@ -325,8 +328,9 @@ ipbancontainer.o: ../../pikotools/space/space.h htmlfilter.h ipbancontainer.o: ../../winix/templates/htmltextstream.h ipbancontainer.o: ../../winix/core/textstream.h misc.h ipbancontainer.o: ../../pikotools/utf8/utf8.h winix_const.h -ipbancontainer.o: ../../pikotools/space/spacetojson.h session.h user.h -ipbancontainer.o: plugindata.h rebus.h mount.h ../../winix/templates/locale.h +ipbancontainer.o: ../../pikotools/space/spacetojson.h +ipbancontainer.o: ../../ezc/src/outstreams.h session.h user.h plugindata.h +ipbancontainer.o: rebus.h mount.h ../../winix/templates/locale.h item.o: item.h ../../pikotools/space/space.h item.o: ../../pikotools/textstream/types.h ../../pikotools/date/date.h misc.h item.o: requesttypes.h ../../pikotools/textstream/textstream.h @@ -347,28 +351,28 @@ job.o: requesttypes.h item.h error.h config.h job.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h job.o: htmlfilter.h ../../winix/templates/htmltextstream.h job.o: ../../winix/core/textstream.h misc.h ../../pikotools/utf8/utf8.h -job.o: winix_const.h ../../pikotools/space/spacetojson.h session.h user.h -job.o: plugindata.h rebus.h ipban.h mount.h ../../winix/templates/locale.h -job.o: system.h dirs.h dircontainer.h ../../winix/db/db.h -job.o: ../../winix/db/dbbase.h ../../winix/db/dbconn.h -job.o: ../../winix/db/dbtextstream.h ../../winix/core/error.h -job.o: ../../winix/db/dbitemquery.h ../../winix/core/item.h -job.o: ../../winix/db/dbitemcolumns.h ../../winix/core/user.h -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/blocks.h -job.o: ../../ezc/src/cache.h ../../ezc/src/functions.h -job.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -job.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h -job.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -job.o: ../../winix/notify/templatesnotify.h ../../winix/core/config.h -job.o: ../../winix/core/users.h ugcontainer.h lastcontainer.h mounts.h -job.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h image.h -job.o: threadmanager.h timezones.h timezone.h sessionmanager.h -job.o: sessioncontainer.h ipbancontainer.h sessionidmanager.h -job.o: ../../tito/src/base64.h ../../tito/src/aes.h +job.o: winix_const.h ../../pikotools/space/spacetojson.h +job.o: ../../ezc/src/outstreams.h session.h user.h plugindata.h rebus.h +job.o: ipban.h mount.h ../../winix/templates/locale.h system.h dirs.h +job.o: dircontainer.h ../../winix/db/db.h ../../winix/db/dbbase.h +job.o: ../../winix/db/dbconn.h ../../winix/db/dbtextstream.h +job.o: ../../winix/core/error.h ../../winix/db/dbitemquery.h +job.o: ../../winix/core/item.h ../../winix/db/dbitemcolumns.h +job.o: ../../winix/core/user.h ../../winix/core/group.h +job.o: ../../winix/core/dircontainer.h ../../winix/core/ugcontainer.h +job.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h +job.o: ../../winix/templates/patterns.h ../../winix/templates/locale.h +job.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h +job.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h ../../ezc/src/cache.h +job.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h +job.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h +job.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +job.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +job.o: ../../winix/core/config.h ../../winix/core/users.h ugcontainer.h +job.o: lastcontainer.h mounts.h mountparser.h crypt.h run.h users.h groups.h +job.o: group.h loadavg.h image.h threadmanager.h timezones.h timezone.h +job.o: sessionmanager.h sessioncontainer.h ipbancontainer.h +job.o: sessionidmanager.h ../../tito/src/base64.h ../../tito/src/aes.h job.o: ../../winix/functions/functions.h ../../winix/functions/functionbase.h job.o: ../../winix/core/request.h ../../winix/core/system.h job.o: ../../winix/core/synchro.h ../../winix/functions/functionparser.h @@ -414,9 +418,9 @@ lastcontainer.o: ../../pikotools/space/space.h htmlfilter.h lastcontainer.o: ../../winix/templates/htmltextstream.h lastcontainer.o: ../../winix/core/textstream.h misc.h lastcontainer.o: ../../pikotools/utf8/utf8.h winix_const.h -lastcontainer.o: ../../pikotools/space/spacetojson.h session.h user.h -lastcontainer.o: plugindata.h rebus.h ipban.h mount.h -lastcontainer.o: ../../winix/templates/locale.h +lastcontainer.o: ../../pikotools/space/spacetojson.h +lastcontainer.o: ../../ezc/src/outstreams.h session.h user.h plugindata.h +lastcontainer.o: rebus.h ipban.h mount.h ../../winix/templates/locale.h loadavg.o: loadavg.h log.h textstream.h logmanipulators.h loadavg.o: ../../pikotools/textstream/textstream.h loadavg.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h @@ -428,9 +432,9 @@ loadavg.o: requesttypes.h item.h error.h config.h loadavg.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h loadavg.o: htmlfilter.h ../../winix/templates/htmltextstream.h loadavg.o: ../../winix/core/textstream.h misc.h ../../pikotools/utf8/utf8.h -loadavg.o: winix_const.h ../../pikotools/space/spacetojson.h session.h user.h -loadavg.o: plugindata.h rebus.h ipban.h mount.h -loadavg.o: ../../winix/templates/locale.h +loadavg.o: winix_const.h ../../pikotools/space/spacetojson.h +loadavg.o: ../../ezc/src/outstreams.h session.h user.h plugindata.h rebus.h +loadavg.o: ipban.h mount.h ../../winix/templates/locale.h lock.o: lock.h synchro.h log.o: log.h textstream.h logmanipulators.h log.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h @@ -442,9 +446,9 @@ log.o: requesttypes.h item.h error.h config.h log.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h log.o: htmlfilter.h ../../winix/templates/htmltextstream.h log.o: ../../winix/core/textstream.h misc.h ../../pikotools/utf8/utf8.h -log.o: winix_const.h ../../pikotools/space/spacetojson.h session.h user.h -log.o: plugindata.h rebus.h ipban.h mount.h ../../winix/templates/locale.h -log.o: timezones.h timezone.h +log.o: winix_const.h ../../pikotools/space/spacetojson.h +log.o: ../../ezc/src/outstreams.h session.h user.h plugindata.h rebus.h +log.o: ipban.h mount.h ../../winix/templates/locale.h timezones.h timezone.h misc.o: misc.h item.h ../../pikotools/space/space.h misc.o: ../../pikotools/textstream/types.h ../../pikotools/date/date.h misc.o: requesttypes.h ../../pikotools/textstream/textstream.h @@ -455,10 +459,10 @@ misc.o: winix_const.h log.h textstream.h logmanipulators.h slog.h cur.h misc.o: request.h error.h config.h ../../pikotools/space/spaceparser.h misc.o: ../../pikotools/space/space.h htmlfilter.h 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/blocks.h +misc.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +misc.o: session.h user.h plugindata.h rebus.h ipban.h mount.h +misc.o: ../../winix/templates/locale.h ../../winix/templates/templates.h +misc.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h ../../ezc/src/blocks.h misc.o: ../../ezc/src/cache.h ../../ezc/src/functions.h misc.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h misc.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h @@ -501,9 +505,10 @@ mountparser.o: ../../winix/core/dircontainer.h ../../winix/core/ugcontainer.h mountparser.o: log.h textstream.h logmanipulators.h slog.h cur.h request.h mountparser.o: error.h config.h htmlfilter.h mountparser.o: ../../winix/templates/htmltextstream.h -mountparser.o: ../../pikotools/space/spacetojson.h session.h user.h -mountparser.o: plugindata.h rebus.h ipban.h ../../winix/templates/locale.h -mountparser.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h +mountparser.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +mountparser.o: session.h user.h plugindata.h rebus.h ipban.h +mountparser.o: ../../winix/templates/locale.h ../../winix/notify/notify.h +mountparser.o: ../../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 @@ -533,23 +538,23 @@ mounts.o: ../../winix/core/group.h ../../winix/core/dircontainer.h mounts.o: ../../winix/core/ugcontainer.h log.h textstream.h logmanipulators.h mounts.o: slog.h cur.h request.h config.h htmlfilter.h mounts.o: ../../winix/templates/htmltextstream.h -mounts.o: ../../pikotools/space/spacetojson.h session.h user.h plugindata.h -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/blocks.h -mounts.o: ../../ezc/src/cache.h ../../ezc/src/functions.h -mounts.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -mounts.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h -mounts.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -mounts.o: ../../winix/notify/templatesnotify.h ../../winix/core/config.h -mounts.o: ../../winix/core/users.h ugcontainer.h lastcontainer.h -mounts.o: mountparser.h plugin.h pluginmsg.h system.h job.h basethread.h -mounts.o: synchro.h crypt.h run.h users.h groups.h group.h loadavg.h image.h -mounts.o: threadmanager.h timezones.h timezone.h sessionmanager.h -mounts.o: sessioncontainer.h ipbancontainer.h sessionidmanager.h -mounts.o: ../../tito/src/base64.h ../../tito/src/aes.h +mounts.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +mounts.o: session.h user.h plugindata.h rebus.h ipban.h +mounts.o: ../../winix/templates/locale.h ../../winix/notify/notify.h +mounts.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h +mounts.o: ../../winix/templates/locale.h ../../winix/templates/localefilter.h +mounts.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h +mounts.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h +mounts.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h +mounts.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h +mounts.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +mounts.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +mounts.o: ../../winix/core/config.h ../../winix/core/users.h ugcontainer.h +mounts.o: lastcontainer.h mountparser.h plugin.h pluginmsg.h system.h job.h +mounts.o: basethread.h synchro.h crypt.h run.h users.h groups.h group.h +mounts.o: loadavg.h image.h threadmanager.h timezones.h timezone.h +mounts.o: sessionmanager.h sessioncontainer.h ipbancontainer.h +mounts.o: sessionidmanager.h ../../tito/src/base64.h ../../tito/src/aes.h mounts.o: ../../winix/functions/functions.h mounts.o: ../../winix/functions/functionbase.h ../../winix/core/request.h mounts.o: ../../winix/core/system.h ../../winix/core/synchro.h @@ -593,10 +598,11 @@ plugin.o: requesttypes.h item.h error.h config.h plugin.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h plugin.o: htmlfilter.h ../../winix/templates/htmltextstream.h plugin.o: ../../winix/core/textstream.h misc.h ../../pikotools/utf8/utf8.h -plugin.o: winix_const.h ../../pikotools/space/spacetojson.h session.h user.h -plugin.o: plugindata.h rebus.h ipban.h mount.h ../../winix/templates/locale.h -plugin.o: system.h job.h basethread.h synchro.h dirs.h dircontainer.h -plugin.o: ../../winix/db/db.h ../../winix/db/dbbase.h ../../winix/db/dbconn.h +plugin.o: winix_const.h ../../pikotools/space/spacetojson.h +plugin.o: ../../ezc/src/outstreams.h session.h user.h plugindata.h rebus.h +plugin.o: ipban.h mount.h ../../winix/templates/locale.h system.h job.h +plugin.o: basethread.h synchro.h dirs.h dircontainer.h ../../winix/db/db.h +plugin.o: ../../winix/db/dbbase.h ../../winix/db/dbconn.h plugin.o: ../../winix/db/dbtextstream.h ../../winix/core/error.h plugin.o: ../../winix/db/dbitemquery.h ../../winix/core/item.h plugin.o: ../../winix/db/dbitemcolumns.h ../../winix/core/user.h @@ -661,16 +667,17 @@ plugindata.o: ../../pikotools/space/space.h htmlfilter.h plugindata.o: ../../winix/templates/htmltextstream.h plugindata.o: ../../winix/core/textstream.h misc.h plugindata.o: ../../pikotools/utf8/utf8.h winix_const.h -plugindata.o: ../../pikotools/space/spacetojson.h session.h user.h rebus.h -plugindata.o: ipban.h mount.h ../../winix/templates/locale.h system.h job.h -plugindata.o: basethread.h synchro.h dirs.h dircontainer.h -plugindata.o: ../../winix/db/db.h ../../winix/db/dbbase.h -plugindata.o: ../../winix/db/dbconn.h ../../winix/db/dbtextstream.h -plugindata.o: ../../winix/core/error.h ../../winix/db/dbitemquery.h -plugindata.o: ../../winix/core/item.h ../../winix/db/dbitemcolumns.h -plugindata.o: ../../winix/core/user.h ../../winix/core/group.h -plugindata.o: ../../winix/core/dircontainer.h ../../winix/core/ugcontainer.h -plugindata.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h +plugindata.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +plugindata.o: session.h user.h rebus.h ipban.h mount.h +plugindata.o: ../../winix/templates/locale.h system.h job.h basethread.h +plugindata.o: synchro.h dirs.h dircontainer.h ../../winix/db/db.h +plugindata.o: ../../winix/db/dbbase.h ../../winix/db/dbconn.h +plugindata.o: ../../winix/db/dbtextstream.h ../../winix/core/error.h +plugindata.o: ../../winix/db/dbitemquery.h ../../winix/core/item.h +plugindata.o: ../../winix/db/dbitemcolumns.h ../../winix/core/user.h +plugindata.o: ../../winix/core/group.h ../../winix/core/dircontainer.h +plugindata.o: ../../winix/core/ugcontainer.h ../../winix/notify/notify.h +plugindata.o: ../../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/blocks.h @@ -732,9 +739,9 @@ postmultiparser.o: ../../pikotools/utf8/utf8.h winix_const.h log.h postmultiparser.o: textstream.h logmanipulators.h slog.h cur.h request.h postmultiparser.o: ../../winix/templates/htmltextstream.h postmultiparser.o: ../../winix/core/textstream.h -postmultiparser.o: ../../pikotools/space/spacetojson.h session.h user.h -postmultiparser.o: plugindata.h rebus.h ipban.h mount.h -postmultiparser.o: ../../winix/templates/locale.h +postmultiparser.o: ../../pikotools/space/spacetojson.h +postmultiparser.o: ../../ezc/src/outstreams.h session.h user.h plugindata.h +postmultiparser.o: rebus.h ipban.h mount.h ../../winix/templates/locale.h rebus.o: log.h textstream.h logmanipulators.h rebus.o: ../../pikotools/textstream/textstream.h rebus.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h @@ -746,8 +753,9 @@ rebus.o: requesttypes.h item.h error.h config.h rebus.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h rebus.o: htmlfilter.h ../../winix/templates/htmltextstream.h rebus.o: ../../winix/core/textstream.h misc.h ../../pikotools/utf8/utf8.h -rebus.o: winix_const.h ../../pikotools/space/spacetojson.h session.h user.h -rebus.o: plugindata.h rebus.h ipban.h mount.h ../../winix/templates/locale.h +rebus.o: winix_const.h ../../pikotools/space/spacetojson.h +rebus.o: ../../ezc/src/outstreams.h session.h user.h plugindata.h rebus.h +rebus.o: ipban.h mount.h ../../winix/templates/locale.h request.o: request.h requesttypes.h ../../pikotools/textstream/textstream.h request.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h request.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h @@ -757,18 +765,19 @@ request.o: ../../pikotools/textstream/types.h item.h error.h config.h request.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h request.o: htmlfilter.h textstream.h ../../winix/templates/htmltextstream.h request.o: ../../winix/core/textstream.h misc.h ../../pikotools/utf8/utf8.h -request.o: winix_const.h ../../pikotools/space/spacetojson.h log.h -request.o: logmanipulators.h slog.h cur.h session.h user.h plugindata.h -request.o: rebus.h ipban.h mount.h ../../winix/templates/locale.h plugin.h -request.o: pluginmsg.h system.h job.h basethread.h synchro.h dirs.h -request.o: dircontainer.h ../../winix/db/db.h ../../winix/db/dbbase.h -request.o: ../../winix/db/dbconn.h ../../winix/db/dbtextstream.h -request.o: ../../winix/core/error.h ../../winix/db/dbitemquery.h -request.o: ../../winix/core/item.h ../../winix/db/dbitemcolumns.h -request.o: ../../winix/core/user.h ../../winix/core/group.h -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_const.h ../../pikotools/space/spacetojson.h +request.o: ../../ezc/src/outstreams.h log.h logmanipulators.h slog.h cur.h +request.o: session.h user.h plugindata.h rebus.h ipban.h mount.h +request.o: ../../winix/templates/locale.h plugin.h pluginmsg.h system.h job.h +request.o: basethread.h synchro.h dirs.h dircontainer.h ../../winix/db/db.h +request.o: ../../winix/db/dbbase.h ../../winix/db/dbconn.h +request.o: ../../winix/db/dbtextstream.h ../../winix/core/error.h +request.o: ../../winix/db/dbitemquery.h ../../winix/core/item.h +request.o: ../../winix/db/dbitemcolumns.h ../../winix/core/user.h +request.o: ../../winix/core/group.h ../../winix/core/dircontainer.h +request.o: ../../winix/core/ugcontainer.h ../../winix/notify/notify.h +request.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h +request.o: ../../winix/templates/locale.h request.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h request.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h request.o: ../../ezc/src/cache.h ../../ezc/src/functions.h @@ -824,8 +833,9 @@ run.o: requesttypes.h item.h error.h config.h run.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h run.o: htmlfilter.h ../../winix/templates/htmltextstream.h run.o: ../../winix/core/textstream.h misc.h ../../pikotools/utf8/utf8.h -run.o: winix_const.h ../../pikotools/space/spacetojson.h session.h user.h -run.o: plugindata.h rebus.h ipban.h mount.h ../../winix/templates/locale.h +run.o: winix_const.h ../../pikotools/space/spacetojson.h +run.o: ../../ezc/src/outstreams.h session.h user.h plugindata.h rebus.h +run.o: ipban.h mount.h ../../winix/templates/locale.h session.o: session.h item.h ../../pikotools/space/space.h session.o: ../../pikotools/textstream/types.h ../../pikotools/date/date.h session.o: error.h user.h plugindata.h rebus.h textstream.h ipban.h misc.h @@ -850,7 +860,8 @@ sessioncontainer.o: ../../pikotools/space/space.h htmlfilter.h sessioncontainer.o: ../../winix/templates/htmltextstream.h sessioncontainer.o: ../../winix/core/textstream.h misc.h sessioncontainer.o: ../../pikotools/utf8/utf8.h winix_const.h -sessioncontainer.o: ../../pikotools/space/spacetojson.h mount.h log.h +sessioncontainer.o: ../../pikotools/space/spacetojson.h +sessioncontainer.o: ../../ezc/src/outstreams.h mount.h log.h sessioncontainer.o: logmanipulators.h slog.h ../../winix/templates/locale.h sessionidmanager.o: sessionidmanager.h ../../tito/src/base64.h sessionidmanager.o: ../../pikotools/space/space.h @@ -866,9 +877,9 @@ sessionidmanager.o: ../../pikotools/textstream/types.h slog.h cur.h request.h sessionidmanager.o: requesttypes.h item.h error.h config.h htmlfilter.h sessionidmanager.o: ../../winix/templates/htmltextstream.h sessionidmanager.o: ../../winix/core/textstream.h misc.h winix_const.h -sessionidmanager.o: ../../pikotools/space/spacetojson.h session.h user.h -sessionidmanager.o: plugindata.h rebus.h ipban.h mount.h -sessionidmanager.o: ../../winix/templates/locale.h +sessionidmanager.o: ../../pikotools/space/spacetojson.h +sessionidmanager.o: ../../ezc/src/outstreams.h session.h user.h plugindata.h +sessionidmanager.o: rebus.h ipban.h mount.h ../../winix/templates/locale.h sessionmanager.o: sessionmanager.h sessioncontainer.h session.h item.h sessionmanager.o: ../../pikotools/space/space.h sessionmanager.o: ../../pikotools/textstream/types.h @@ -884,15 +895,15 @@ sessionmanager.o: ../../pikotools/space/space.h htmlfilter.h sessionmanager.o: ../../winix/templates/htmltextstream.h sessionmanager.o: ../../winix/core/textstream.h misc.h sessionmanager.o: ../../pikotools/utf8/utf8.h winix_const.h -sessionmanager.o: ../../pikotools/space/spacetojson.h mount.h -sessionmanager.o: ipbancontainer.h lastcontainer.h system.h job.h -sessionmanager.o: basethread.h synchro.h dirs.h dircontainer.h -sessionmanager.o: ../../winix/db/db.h ../../winix/db/dbbase.h -sessionmanager.o: ../../winix/db/dbconn.h ../../winix/db/dbtextstream.h -sessionmanager.o: ../../winix/core/error.h ../../winix/db/dbitemquery.h -sessionmanager.o: ../../winix/core/item.h ../../winix/db/dbitemcolumns.h -sessionmanager.o: ../../winix/core/user.h ../../winix/core/group.h -sessionmanager.o: ../../winix/core/dircontainer.h +sessionmanager.o: ../../pikotools/space/spacetojson.h +sessionmanager.o: ../../ezc/src/outstreams.h mount.h ipbancontainer.h +sessionmanager.o: lastcontainer.h system.h job.h basethread.h synchro.h +sessionmanager.o: dirs.h dircontainer.h ../../winix/db/db.h +sessionmanager.o: ../../winix/db/dbbase.h ../../winix/db/dbconn.h +sessionmanager.o: ../../winix/db/dbtextstream.h ../../winix/core/error.h +sessionmanager.o: ../../winix/db/dbitemquery.h ../../winix/core/item.h +sessionmanager.o: ../../winix/db/dbitemcolumns.h ../../winix/core/user.h +sessionmanager.o: ../../winix/core/group.h ../../winix/core/dircontainer.h sessionmanager.o: ../../winix/core/ugcontainer.h log.h logmanipulators.h sessionmanager.o: slog.h ../../winix/templates/locale.h sessionmanager.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h @@ -968,7 +979,8 @@ sessionparser.o: ../../pikotools/space/space.h htmlfilter.h sessionparser.o: ../../winix/templates/htmltextstream.h sessionparser.o: ../../winix/core/textstream.h misc.h sessionparser.o: ../../pikotools/utf8/utf8.h winix_const.h -sessionparser.o: ../../pikotools/space/spacetojson.h mount.h users.h log.h +sessionparser.o: ../../pikotools/space/spacetojson.h +sessionparser.o: ../../ezc/src/outstreams.h mount.h users.h log.h sessionparser.o: logmanipulators.h slog.h ../../winix/templates/locale.h slog.o: slog.h cur.h request.h requesttypes.h slog.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h @@ -979,9 +991,9 @@ slog.o: ../../pikotools/textstream/types.h item.h error.h config.h slog.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h slog.o: htmlfilter.h textstream.h ../../winix/templates/htmltextstream.h slog.o: ../../winix/core/textstream.h misc.h ../../pikotools/utf8/utf8.h -slog.o: winix_const.h ../../pikotools/space/spacetojson.h session.h user.h -slog.o: plugindata.h rebus.h ipban.h mount.h logmanipulators.h -slog.o: ../../winix/templates/locale.h +slog.o: winix_const.h ../../pikotools/space/spacetojson.h +slog.o: ../../ezc/src/outstreams.h session.h user.h plugindata.h rebus.h +slog.o: ipban.h mount.h logmanipulators.h ../../winix/templates/locale.h synchro.o: synchro.h system.o: system.h job.h basethread.h synchro.h ../../pikotools/space/space.h system.o: ../../pikotools/textstream/types.h dirs.h item.h @@ -1001,21 +1013,21 @@ system.o: ../../winix/core/group.h ../../winix/core/dircontainer.h system.o: ../../winix/core/ugcontainer.h log.h textstream.h logmanipulators.h system.o: slog.h cur.h request.h error.h config.h htmlfilter.h system.o: ../../winix/templates/htmltextstream.h -system.o: ../../pikotools/space/spacetojson.h session.h user.h plugindata.h -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/blocks.h -system.o: ../../ezc/src/cache.h ../../ezc/src/functions.h -system.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -system.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h -system.o: ../../winix/notify/notifythread.h ../../winix/core/basethread.h -system.o: ../../winix/notify/templatesnotify.h ../../winix/core/config.h -system.o: ../../winix/core/users.h ugcontainer.h lastcontainer.h mounts.h -system.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h -system.o: image.h threadmanager.h timezones.h timezone.h -system.o: ../../winix/templates/templates.h +system.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +system.o: session.h user.h plugindata.h rebus.h ipban.h mount.h +system.o: ../../winix/templates/locale.h ../../winix/notify/notify.h +system.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h +system.o: ../../winix/templates/locale.h ../../winix/templates/localefilter.h +system.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h +system.o: ../../ezc/src/blocks.h ../../ezc/src/cache.h +system.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h +system.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h +system.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h +system.o: ../../winix/core/basethread.h ../../winix/notify/templatesnotify.h +system.o: ../../winix/core/config.h ../../winix/core/users.h ugcontainer.h +system.o: lastcontainer.h mounts.h mountparser.h crypt.h run.h users.h +system.o: groups.h group.h loadavg.h image.h threadmanager.h timezones.h +system.o: timezone.h ../../winix/templates/templates.h system.o: ../../winix/templates/patterncacher.h system.o: ../../winix/templates/indexpatterns.h system.o: ../../winix/templates/patterns.h @@ -1063,9 +1075,9 @@ threadmanager.o: ../../pikotools/space/space.h htmlfilter.h threadmanager.o: ../../winix/templates/htmltextstream.h threadmanager.o: ../../winix/core/textstream.h misc.h threadmanager.o: ../../pikotools/utf8/utf8.h winix_const.h -threadmanager.o: ../../pikotools/space/spacetojson.h session.h user.h -threadmanager.o: plugindata.h rebus.h ipban.h mount.h -threadmanager.o: ../../winix/templates/locale.h +threadmanager.o: ../../pikotools/space/spacetojson.h +threadmanager.o: ../../ezc/src/outstreams.h session.h user.h plugindata.h +threadmanager.o: rebus.h ipban.h mount.h ../../winix/templates/locale.h timezone.o: timezone.h ../../pikotools/date/date.h timezone.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h timezone.o: misc.h item.h requesttypes.h @@ -1088,8 +1100,8 @@ timezones.o: winix_const.h log.h textstream.h logmanipulators.h slog.h cur.h timezones.o: request.h error.h config.h htmlfilter.h timezones.o: ../../winix/templates/htmltextstream.h timezones.o: ../../winix/core/textstream.h -timezones.o: ../../pikotools/space/spacetojson.h session.h user.h -timezones.o: plugindata.h rebus.h ipban.h mount.h +timezones.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +timezones.o: session.h user.h plugindata.h rebus.h ipban.h mount.h timezones.o: ../../winix/templates/locale.h user.o: user.h users.o: users.h sessionmanager.h sessioncontainer.h session.h item.h @@ -1103,10 +1115,10 @@ users.o: ../../pikotools/textstream/types.h config.h users.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h users.o: htmlfilter.h ../../winix/templates/htmltextstream.h users.o: ../../winix/core/textstream.h misc.h ../../pikotools/utf8/utf8.h -users.o: winix_const.h ../../pikotools/space/spacetojson.h mount.h -users.o: ipbancontainer.h lastcontainer.h system.h job.h basethread.h -users.o: synchro.h dirs.h dircontainer.h ../../winix/db/db.h -users.o: ../../winix/db/dbbase.h ../../winix/db/dbconn.h +users.o: winix_const.h ../../pikotools/space/spacetojson.h +users.o: ../../ezc/src/outstreams.h mount.h ipbancontainer.h lastcontainer.h +users.o: system.h job.h basethread.h synchro.h dirs.h dircontainer.h +users.o: ../../winix/db/db.h ../../winix/db/dbbase.h ../../winix/db/dbconn.h users.o: ../../winix/db/dbtextstream.h ../../winix/core/error.h users.o: ../../winix/db/dbitemquery.h ../../winix/core/item.h users.o: ../../winix/db/dbitemcolumns.h ../../winix/core/user.h diff --git a/core/app.cpp b/core/app.cpp index 0384356..3b0e58a 100644 --- a/core/app.cpp +++ b/core/app.cpp @@ -554,16 +554,27 @@ void App::CreateJSONAnswer() if( !req.return_info_only ) { - json_out_stream << L"{\n"; + json_out_stream << L"{\n\"out\": {\n"; - for(size_t i=1 ; ifirst); + json_out_stream << L"\": \""; + JSONescape(json_out_stream, i->second->Str()); + json_out_stream << L"\""; + is_first = false; } - json_out_stream << L"\"info\": "; + json_out_stream << L"}\n,\n\"info\": "; } if( req.info_serializer ) @@ -604,7 +615,7 @@ bool sent = false; { if( cur.request->function == &functions.fun_cat ) { - TemplatesFunctions::item_print_content(cur.request->out_streams[0], + TemplatesFunctions::item_print_content(cur.request->out_main_stream, cur.request->item.content, cur.request->item.content_type); sent = true; } @@ -1241,33 +1252,40 @@ void App::FilterContent() req.status == WINIX_ERR_OK && req.function && (req.function == &functions.fun_cat || req.function == &functions.fun_run); - size_t start = req.out_streams.size(); // default nothing should be filtered - size_t end = req.out_streams.size(); + bool filter_main_stream = false; + bool filter_json = false; if( config.html_filter && !req.send_bin_stream && !raw ) { if( req.return_json ) { - if( !req.return_info_only ) + if( !req.return_info_only && req.out_streams_use_html_filter ) { - start = 1; + filter_json = true; } } else { - start = 0; - end = 1; + if( req.out_main_stream_use_html_filter ) + filter_main_stream = true; } } - - for(size_t i=start ; isecond; // !! IMPROVE ME may some kind of html_filtered.reserve() here? (optimization) - TemplatesFunctions::html_filter.Filter(req.out_streams[i].Str(), html_filtered); - req.out_streams[i].Str(std::move(html_filtered)); + TemplatesFunctions::html_filter.Filter(stream.Str(), html_filtered); + stream.Str(std::move(html_filtered)); } } } @@ -1398,7 +1416,7 @@ size_t output_size = 0; } else { - source = &cur.request->out_streams[0].Str(); + source = &cur.request->out_main_stream.Str(); } SelectCompression(source->length(), compressing, compress_encoding); diff --git a/core/config.cpp b/core/config.cpp index 5914400..c0bd60c 100644 --- a/core/config.cpp +++ b/core/config.cpp @@ -278,7 +278,7 @@ void Config::AssignValues(bool stdout_is_closed) ezc_max_elements = Size(L"ezc_max_elements", 50000); ezc_max_loop_elements = Size(L"ezc_max_loop_elements", 5000); - ezc_out_streams_size = Size(L"ezc_out_streams_size", 16); + ezc_out_streams_size = Size(L"ezc_out_streams_size", 128); ezc_error_prefix = Text(L"ezc_error_prefix", L""); @@ -304,8 +304,8 @@ void Config::AssignValues(bool stdout_is_closed) incorrect_login_cannot_login_treshold = Size(L"incorrect_login_cannot_login_treshold", 20); incorrect_login_cannot_login_delay = Size(L"incorrect_login_cannot_login_delay", 1800); - pid_file = Text(L"pid_file", L""); + allow_ezc_out_in_executable_items = Bool(L"allow_ezc_out_in_executable_items", false); } diff --git a/core/config.h b/core/config.h index ec7ddbd..08ee767 100644 --- a/core/config.h +++ b/core/config.h @@ -609,7 +609,9 @@ public: size_t ezc_max_loop_elements; // how many output streams do we have in Request class - // default: 16 (64 maximum) + // those streams used in ajax responses + // you can use no more [ezc out] statements than this limit + // default: 128 size_t ezc_out_streams_size; // prefix and postfix used when there is an error in Ezc patterns @@ -728,6 +730,10 @@ public: // pid file is saved after winix has dropped privileges std::wstring pid_file; + // allow to use [ezc out] statement in executable items (used in 'run' winix function) + // default false + // warning: if you enable this options a user can override a different output stream when using ajax + bool allow_ezc_out_in_executable_items; Config(); diff --git a/core/request.cpp b/core/request.cpp index fafdefb..256a97e 100644 --- a/core/request.cpp +++ b/core/request.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2014, Tomasz Sowa + * Copyright (c) 2008-2015, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -63,26 +63,21 @@ void Request::SetConfig(Config * pconfig) void Request::ClearOutputStreams() { -size_t len = 16; +size_t len = 0; + + out_main_stream.Clear(); if( config ) len = config->ezc_out_streams_size; - if( len < 1 || len > 64 ) - len = 16; - - if( out_streams.size() != len ) - out_streams.resize(len); - - if( use_html_filter.size() != len ) - use_html_filter.resize(len); - - for(size_t i=0 ; i out_streams; + // main text output stream where the html otput is generated from ezc templates + // here the whole html page (with doctype, head, body) is generated + HtmlTextStream out_main_stream; + + // text output streams used in ajax requests (send in JSON format to the client) + // in ezc templates you can use [ezc out "stream_name"] keyword + // to switch between streams + Ezc::OutStreams out_streams; // if true the JSON object is generated only from info (out_streams are not used) // default: false @@ -295,14 +297,14 @@ struct Request // default: false bool page_generated; - // whether or not the html filter should be used - // the size of the table is the same as out_streams - // default: all items true - std::vector use_html_filter; + // whether or not the main html stream should be filtered by our html filter + bool out_main_stream_use_html_filter; + + // whether or not the ajax streams should be filtered by our html filter + // this filter is only aplied to streams in "out" space, "info" space is not touched + bool out_streams_use_html_filter; - - // if this variable is true then winix always return 200 OK header // when the status would be 404 (not found) or 403 (permission denied) // default: false diff --git a/db/Makefile.dep b/db/Makefile.dep index a39f2f8..80e1bd3 100644 --- a/db/Makefile.dep +++ b/db/Makefile.dep @@ -18,11 +18,12 @@ db.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h db.o: ../../winix/core/cur.h ../../winix/core/request.h db.o: ../../winix/core/error.h ../../winix/core/config.h db.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -db.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -db.o: ../../winix/core/user.h ../../winix/core/plugindata.h -db.o: ../../winix/core/rebus.h ../../winix/core/ipban.h -db.o: ../../winix/core/mount.h ../../winix/templates/locale.h -db.o: ../../winix/core/log.h ../../winix/core/misc.h +db.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +db.o: ../../winix/core/session.h ../../winix/core/user.h +db.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h +db.o: ../../winix/core/ipban.h ../../winix/core/mount.h +db.o: ../../winix/templates/locale.h ../../winix/core/log.h +db.o: ../../winix/core/misc.h dbbase.o: dbbase.h dbconn.h dbtextstream.h ../../winix/core/textstream.h dbbase.o: ../../winix/core/misc.h ../../winix/core/item.h dbbase.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h diff --git a/functions/Makefile.dep b/functions/Makefile.dep index e10753b..1bedfa9 100644 --- a/functions/Makefile.dep +++ b/functions/Makefile.dep @@ -23,10 +23,10 @@ account.o: ../../winix/core/cur.h ../../winix/core/request.h account.o: ../../winix/core/error.h ../../winix/core/config.h account.o: ../../winix/core/htmlfilter.h account.o: ../../winix/templates/htmltextstream.h -account.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -account.o: ../../winix/core/user.h ../../winix/core/plugindata.h -account.o: ../../winix/core/rebus.h ipban.h mount.h -account.o: ../../winix/templates/locale.h ../../winix/core/request.h +account.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +account.o: ../../winix/core/session.h ../../winix/core/user.h +account.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +account.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h account.o: ../../winix/core/config.h ../../winix/core/system.h account.o: ../../winix/core/job.h ../../winix/core/basethread.h account.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -76,10 +76,10 @@ adduser.o: ../../winix/core/cur.h ../../winix/core/request.h adduser.o: ../../winix/core/error.h ../../winix/core/config.h adduser.o: ../../winix/core/htmlfilter.h adduser.o: ../../winix/templates/htmltextstream.h -adduser.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -adduser.o: ../../winix/core/user.h ../../winix/core/plugindata.h -adduser.o: ../../winix/core/rebus.h ipban.h mount.h -adduser.o: ../../winix/templates/locale.h ../../winix/core/request.h +adduser.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +adduser.o: ../../winix/core/session.h ../../winix/core/user.h +adduser.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +adduser.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h adduser.o: ../../winix/core/config.h ../../winix/core/system.h adduser.o: ../../winix/core/job.h ../../winix/core/basethread.h adduser.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -139,9 +139,9 @@ cat.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h cat.o: ../../winix/core/cur.h ../../winix/core/request.h cat.o: ../../winix/core/error.h ../../winix/core/config.h cat.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -cat.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -cat.o: ../../winix/core/user.h ../../winix/core/plugindata.h -cat.o: ../../winix/core/rebus.h ipban.h mount.h +cat.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +cat.o: ../../winix/core/session.h ../../winix/core/user.h +cat.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h mount.h cat.o: ../../winix/templates/locale.h ../../winix/core/request.h cat.o: ../../winix/core/config.h ../../winix/core/system.h cat.o: ../../winix/core/job.h ../../winix/core/basethread.h @@ -188,10 +188,10 @@ chmod.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h chmod.o: ../../winix/core/cur.h ../../winix/core/request.h chmod.o: ../../winix/core/error.h ../../winix/core/config.h chmod.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -chmod.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -chmod.o: ../../winix/core/user.h ../../winix/core/plugindata.h -chmod.o: ../../winix/core/rebus.h ipban.h mount.h -chmod.o: ../../winix/templates/locale.h ../../winix/core/request.h +chmod.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +chmod.o: ../../winix/core/session.h ../../winix/core/user.h +chmod.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +chmod.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h chmod.o: ../../winix/core/config.h ../../winix/core/system.h chmod.o: ../../winix/core/job.h ../../winix/core/basethread.h chmod.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -238,10 +238,10 @@ chown.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h chown.o: ../../winix/core/cur.h ../../winix/core/request.h chown.o: ../../winix/core/error.h ../../winix/core/config.h chown.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -chown.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -chown.o: ../../winix/core/user.h ../../winix/core/plugindata.h -chown.o: ../../winix/core/rebus.h ipban.h mount.h -chown.o: ../../winix/templates/locale.h ../../winix/core/request.h +chown.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +chown.o: ../../winix/core/session.h ../../winix/core/user.h +chown.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +chown.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h chown.o: ../../winix/core/config.h ../../winix/core/system.h chown.o: ../../winix/core/job.h ../../winix/core/basethread.h chown.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -290,10 +290,10 @@ ckeditor.o: ../../winix/core/cur.h ../../winix/core/request.h ckeditor.o: ../../winix/core/error.h ../../winix/core/config.h ckeditor.o: ../../winix/core/htmlfilter.h ckeditor.o: ../../winix/templates/htmltextstream.h -ckeditor.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -ckeditor.o: ../../winix/core/user.h ../../winix/core/plugindata.h -ckeditor.o: ../../winix/core/rebus.h ipban.h mount.h -ckeditor.o: ../../winix/templates/locale.h ../../winix/core/request.h +ckeditor.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +ckeditor.o: ../../winix/core/session.h ../../winix/core/user.h +ckeditor.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +ckeditor.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h ckeditor.o: ../../winix/core/config.h ../../winix/core/system.h ckeditor.o: ../../winix/core/job.h ../../winix/core/basethread.h ckeditor.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -339,16 +339,16 @@ cp.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h cp.o: ../../winix/core/cur.h ../../winix/core/request.h cp.o: ../../winix/core/error.h ../../winix/core/config.h cp.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -cp.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -cp.o: ../../winix/core/user.h ../../winix/core/plugindata.h -cp.o: ../../winix/core/rebus.h ipban.h mount.h ../../winix/templates/locale.h -cp.o: ../../winix/core/request.h ../../winix/core/config.h -cp.o: ../../winix/core/system.h ../../winix/core/job.h -cp.o: ../../winix/core/basethread.h ../../winix/core/synchro.h -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: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +cp.o: ../../winix/core/session.h ../../winix/core/user.h +cp.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h mount.h +cp.o: ../../winix/templates/locale.h ../../winix/core/request.h +cp.o: ../../winix/core/config.h ../../winix/core/system.h +cp.o: ../../winix/core/job.h ../../winix/core/basethread.h +cp.o: ../../winix/core/synchro.h ../../winix/core/dirs.h +cp.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h +cp.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h +cp.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h cp.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h ../../ezc/src/cache.h cp.o: functions.h functionparser.h ../../winix/core/cur.h account.h adduser.h cp.o: cat.h chmod.h privchanger.h chown.h ckeditor.h default.h download.h @@ -400,10 +400,10 @@ default.o: ../../winix/core/cur.h ../../winix/core/request.h default.o: ../../winix/core/error.h ../../winix/core/config.h default.o: ../../winix/core/htmlfilter.h default.o: ../../winix/templates/htmltextstream.h -default.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -default.o: ../../winix/core/user.h ../../winix/core/plugindata.h -default.o: ../../winix/core/rebus.h ipban.h mount.h -default.o: ../../winix/templates/locale.h ../../winix/core/request.h +default.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +default.o: ../../winix/core/session.h ../../winix/core/user.h +default.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +default.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h default.o: ../../winix/core/config.h ../../winix/core/system.h default.o: ../../winix/core/job.h ../../winix/core/basethread.h default.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -452,10 +452,10 @@ download.o: ../../winix/core/cur.h ../../winix/core/request.h download.o: ../../winix/core/error.h ../../winix/core/config.h download.o: ../../winix/core/htmlfilter.h download.o: ../../winix/templates/htmltextstream.h -download.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -download.o: ../../winix/core/user.h ../../winix/core/plugindata.h -download.o: ../../winix/core/rebus.h ipban.h mount.h -download.o: ../../winix/templates/locale.h ../../winix/core/request.h +download.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +download.o: ../../winix/core/session.h ../../winix/core/user.h +download.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +download.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h download.o: ../../winix/core/config.h ../../winix/core/system.h download.o: ../../winix/core/job.h ../../winix/core/basethread.h download.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -502,10 +502,10 @@ emacs.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h emacs.o: ../../winix/core/cur.h ../../winix/core/request.h emacs.o: ../../winix/core/error.h ../../winix/core/config.h emacs.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -emacs.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -emacs.o: ../../winix/core/user.h ../../winix/core/plugindata.h -emacs.o: ../../winix/core/rebus.h ipban.h mount.h -emacs.o: ../../winix/templates/locale.h ../../winix/core/request.h +emacs.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +emacs.o: ../../winix/core/session.h ../../winix/core/user.h +emacs.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +emacs.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h emacs.o: ../../winix/core/config.h ../../winix/core/system.h emacs.o: ../../winix/core/job.h ../../winix/core/basethread.h emacs.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -558,9 +558,9 @@ env.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h env.o: ../../winix/core/cur.h ../../winix/core/request.h env.o: ../../winix/core/error.h ../../winix/core/config.h env.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -env.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -env.o: ../../winix/core/user.h ../../winix/core/plugindata.h -env.o: ../../winix/core/rebus.h ipban.h mount.h +env.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +env.o: ../../winix/core/session.h ../../winix/core/user.h +env.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h mount.h env.o: ../../winix/templates/locale.h ../../winix/core/request.h env.o: ../../winix/core/config.h ../../winix/core/system.h env.o: ../../winix/core/job.h ../../winix/core/basethread.h @@ -612,14 +612,15 @@ functionbase.o: ../../winix/core/error.h ../../winix/core/config.h functionbase.o: ../../winix/core/htmlfilter.h functionbase.o: ../../winix/templates/htmltextstream.h functionbase.o: ../../pikotools/space/spacetojson.h -functionbase.o: ../../winix/core/session.h ../../winix/core/user.h -functionbase.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h -functionbase.o: ipban.h mount.h ../../winix/templates/locale.h -functionbase.o: ../../winix/core/request.h ../../winix/core/config.h -functionbase.o: ../../winix/core/system.h ../../winix/core/job.h -functionbase.o: ../../winix/core/basethread.h ../../winix/core/synchro.h -functionbase.o: ../../winix/core/dirs.h ../../winix/core/dircontainer.h -functionbase.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h +functionbase.o: ../../ezc/src/outstreams.h ../../winix/core/session.h +functionbase.o: ../../winix/core/user.h ../../winix/core/plugindata.h +functionbase.o: ../../winix/core/rebus.h ipban.h mount.h +functionbase.o: ../../winix/templates/locale.h ../../winix/core/request.h +functionbase.o: ../../winix/core/config.h ../../winix/core/system.h +functionbase.o: ../../winix/core/job.h ../../winix/core/basethread.h +functionbase.o: ../../winix/core/synchro.h ../../winix/core/dirs.h +functionbase.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h +functionbase.o: ../../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/blocks.h @@ -671,14 +672,14 @@ functionparser.o: ../../winix/core/error.h ../../winix/core/config.h functionparser.o: ../../winix/core/htmlfilter.h functionparser.o: ../../winix/templates/htmltextstream.h functionparser.o: ../../pikotools/space/spacetojson.h -functionparser.o: ../../winix/core/session.h ../../winix/core/user.h -functionparser.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h -functionparser.o: ipban.h functionbase.h ../../winix/core/request.h -functionparser.o: ../../winix/core/config.h ../../winix/core/system.h -functionparser.o: ../../winix/core/job.h ../../winix/core/basethread.h -functionparser.o: ../../winix/core/synchro.h ../../winix/core/dirs.h -functionparser.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h -functionparser.o: ../../winix/notify/notifypool.h +functionparser.o: ../../ezc/src/outstreams.h ../../winix/core/session.h +functionparser.o: ../../winix/core/user.h ../../winix/core/plugindata.h +functionparser.o: ../../winix/core/rebus.h ipban.h functionbase.h +functionparser.o: ../../winix/core/request.h ../../winix/core/config.h +functionparser.o: ../../winix/core/system.h ../../winix/core/job.h +functionparser.o: ../../winix/core/basethread.h ../../winix/core/synchro.h +functionparser.o: ../../winix/core/dirs.h ../../winix/core/dircontainer.h +functionparser.o: ../../winix/notify/notify.h ../../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 @@ -726,21 +727,21 @@ functions.o: ../../winix/core/slog.h ../../winix/core/cur.h functions.o: ../../winix/core/request.h ../../winix/core/error.h functions.o: ../../winix/core/config.h ../../winix/core/htmlfilter.h functions.o: ../../winix/templates/htmltextstream.h -functions.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -functions.o: ../../winix/core/user.h ../../winix/core/plugindata.h -functions.o: ../../winix/core/rebus.h ipban.h mount.h -functions.o: ../../winix/templates/locale.h ../../winix/core/request.h -functions.o: ../../winix/core/config.h ../../winix/core/system.h -functions.o: ../../winix/core/job.h ../../winix/core/basethread.h -functions.o: ../../winix/core/synchro.h ../../winix/core/dirs.h -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/blocks.h ../../ezc/src/cache.h -functions.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h -functions.o: ../../ezc/src/patternparser.h ../../winix/notify/notifythread.h -functions.o: ../../winix/core/basethread.h +functions.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +functions.o: ../../winix/core/session.h ../../winix/core/user.h +functions.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +functions.o: mount.h ../../winix/templates/locale.h +functions.o: ../../winix/core/request.h ../../winix/core/config.h +functions.o: ../../winix/core/system.h ../../winix/core/job.h +functions.o: ../../winix/core/basethread.h ../../winix/core/synchro.h +functions.o: ../../winix/core/dirs.h ../../winix/core/dircontainer.h +functions.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h +functions.o: ../../winix/templates/patterns.h locale.h +functions.o: ../../winix/templates/localefilter.h ../../ezc/src/ezc.h +functions.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h +functions.o: ../../ezc/src/cache.h ../../ezc/src/objects.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 functions.o: ../../winix/core/mounts.h ../../winix/core/mountparser.h @@ -793,10 +794,10 @@ imgcrop.o: ../../winix/core/cur.h ../../winix/core/request.h imgcrop.o: ../../winix/core/error.h ../../winix/core/config.h imgcrop.o: ../../winix/core/htmlfilter.h imgcrop.o: ../../winix/templates/htmltextstream.h -imgcrop.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -imgcrop.o: ../../winix/core/user.h ../../winix/core/plugindata.h -imgcrop.o: ../../winix/core/rebus.h ipban.h mount.h -imgcrop.o: ../../winix/templates/locale.h ../../winix/core/request.h +imgcrop.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +imgcrop.o: ../../winix/core/session.h ../../winix/core/user.h +imgcrop.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +imgcrop.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h imgcrop.o: ../../winix/core/config.h ../../winix/core/system.h imgcrop.o: ../../winix/core/job.h ../../winix/core/basethread.h imgcrop.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -843,16 +844,16 @@ ipban.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h ipban.o: ../../winix/core/cur.h ../../winix/core/request.h ipban.o: ../../winix/core/error.h ../../winix/core/config.h ipban.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -ipban.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -ipban.o: ../../winix/core/user.h ../../winix/core/plugindata.h -ipban.o: ../../winix/core/rebus.h mount.h ../../winix/templates/locale.h -ipban.o: ../../winix/core/request.h ../../winix/core/config.h -ipban.o: ../../winix/core/system.h ../../winix/core/job.h -ipban.o: ../../winix/core/basethread.h ../../winix/core/synchro.h -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: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +ipban.o: ../../winix/core/session.h ../../winix/core/user.h +ipban.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h mount.h +ipban.o: ../../winix/templates/locale.h ../../winix/core/request.h +ipban.o: ../../winix/core/config.h ../../winix/core/system.h +ipban.o: ../../winix/core/job.h ../../winix/core/basethread.h +ipban.o: ../../winix/core/synchro.h ../../winix/core/dirs.h +ipban.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h +ipban.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h +ipban.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h ipban.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h ipban.o: ../../ezc/src/cache.h functions.h functionparser.h ipban.o: ../../winix/core/cur.h account.h adduser.h cat.h chmod.h @@ -893,10 +894,10 @@ last.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h last.o: ../../winix/core/cur.h ../../winix/core/request.h last.o: ../../winix/core/error.h ../../winix/core/config.h last.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -last.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -last.o: ../../winix/core/user.h ../../winix/core/plugindata.h -last.o: ../../winix/core/rebus.h ipban.h mount.h -last.o: ../../winix/templates/locale.h ../../winix/core/request.h +last.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +last.o: ../../winix/core/session.h ../../winix/core/user.h +last.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +last.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h last.o: ../../winix/core/config.h ../../winix/core/system.h last.o: ../../winix/core/job.h ../../winix/core/basethread.h last.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -942,16 +943,16 @@ ln.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h ln.o: ../../winix/core/cur.h ../../winix/core/request.h ln.o: ../../winix/core/error.h ../../winix/core/config.h ln.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -ln.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -ln.o: ../../winix/core/user.h ../../winix/core/plugindata.h -ln.o: ../../winix/core/rebus.h ipban.h mount.h ../../winix/templates/locale.h -ln.o: ../../winix/core/request.h ../../winix/core/config.h -ln.o: ../../winix/core/system.h ../../winix/core/job.h -ln.o: ../../winix/core/basethread.h ../../winix/core/synchro.h -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: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +ln.o: ../../winix/core/session.h ../../winix/core/user.h +ln.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h mount.h +ln.o: ../../winix/templates/locale.h ../../winix/core/request.h +ln.o: ../../winix/core/config.h ../../winix/core/system.h +ln.o: ../../winix/core/job.h ../../winix/core/basethread.h +ln.o: ../../winix/core/synchro.h ../../winix/core/dirs.h +ln.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h +ln.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h +ln.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h ln.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h ../../ezc/src/cache.h ln.o: functions.h functionparser.h ../../winix/core/cur.h account.h adduser.h ln.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h default.h @@ -994,10 +995,10 @@ locale.o: ../../winix/core/cur.h ../../winix/core/request.h locale.o: ../../winix/core/error.h ../../winix/core/config.h locale.o: ../../winix/core/htmlfilter.h locale.o: ../../winix/templates/htmltextstream.h -locale.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -locale.o: ../../winix/core/user.h ../../winix/core/plugindata.h -locale.o: ../../winix/core/rebus.h ipban.h mount.h -locale.o: ../../winix/templates/locale.h ../../winix/core/request.h +locale.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +locale.o: ../../winix/core/session.h ../../winix/core/user.h +locale.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +locale.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h locale.o: ../../winix/core/config.h ../../winix/core/system.h locale.o: ../../winix/core/job.h ../../winix/core/basethread.h locale.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -1050,10 +1051,10 @@ login.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h login.o: ../../winix/core/cur.h ../../winix/core/request.h login.o: ../../winix/core/error.h ../../winix/core/config.h login.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -login.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -login.o: ../../winix/core/user.h ../../winix/core/plugindata.h -login.o: ../../winix/core/rebus.h ipban.h mount.h -login.o: ../../winix/templates/locale.h ../../winix/core/request.h +login.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +login.o: ../../winix/core/session.h ../../winix/core/user.h +login.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +login.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h login.o: ../../winix/core/config.h ../../winix/core/system.h login.o: ../../winix/core/job.h ../../winix/core/basethread.h login.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -1102,10 +1103,10 @@ logout.o: ../../winix/core/cur.h ../../winix/core/request.h logout.o: ../../winix/core/error.h ../../winix/core/config.h logout.o: ../../winix/core/htmlfilter.h logout.o: ../../winix/templates/htmltextstream.h -logout.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -logout.o: ../../winix/core/user.h ../../winix/core/plugindata.h -logout.o: ../../winix/core/rebus.h ipban.h mount.h -logout.o: ../../winix/templates/locale.h ../../winix/core/request.h +logout.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +logout.o: ../../winix/core/session.h ../../winix/core/user.h +logout.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +logout.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h logout.o: ../../winix/core/config.h ../../winix/core/system.h logout.o: ../../winix/core/job.h ../../winix/core/basethread.h logout.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -1151,16 +1152,16 @@ ls.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h ls.o: ../../winix/core/cur.h ../../winix/core/request.h ls.o: ../../winix/core/error.h ../../winix/core/config.h ls.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -ls.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -ls.o: ../../winix/core/user.h ../../winix/core/plugindata.h -ls.o: ../../winix/core/rebus.h ipban.h mount.h ../../winix/templates/locale.h -ls.o: ../../winix/core/request.h ../../winix/core/config.h -ls.o: ../../winix/core/system.h ../../winix/core/job.h -ls.o: ../../winix/core/basethread.h ../../winix/core/synchro.h -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: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +ls.o: ../../winix/core/session.h ../../winix/core/user.h +ls.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h mount.h +ls.o: ../../winix/templates/locale.h ../../winix/core/request.h +ls.o: ../../winix/core/config.h ../../winix/core/system.h +ls.o: ../../winix/core/job.h ../../winix/core/basethread.h +ls.o: ../../winix/core/synchro.h ../../winix/core/dirs.h +ls.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h +ls.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h +ls.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h ls.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h ../../ezc/src/cache.h ls.o: functions.h functionparser.h ../../winix/core/cur.h account.h adduser.h ls.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h default.h @@ -1200,9 +1201,9 @@ man.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h man.o: ../../winix/core/cur.h ../../winix/core/request.h man.o: ../../winix/core/error.h ../../winix/core/config.h man.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -man.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -man.o: ../../winix/core/user.h ../../winix/core/plugindata.h -man.o: ../../winix/core/rebus.h ipban.h mount.h +man.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +man.o: ../../winix/core/session.h ../../winix/core/user.h +man.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h mount.h man.o: ../../winix/templates/locale.h ../../winix/core/request.h man.o: ../../winix/core/config.h ../../winix/core/system.h man.o: ../../winix/core/job.h ../../winix/core/basethread.h @@ -1249,10 +1250,10 @@ meta.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h meta.o: ../../winix/core/cur.h ../../winix/core/request.h meta.o: ../../winix/core/error.h ../../winix/core/config.h meta.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -meta.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -meta.o: ../../winix/core/user.h ../../winix/core/plugindata.h -meta.o: ../../winix/core/rebus.h ipban.h mount.h -meta.o: ../../winix/templates/locale.h ../../winix/core/request.h +meta.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +meta.o: ../../winix/core/session.h ../../winix/core/user.h +meta.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +meta.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h meta.o: ../../winix/core/config.h ../../winix/core/system.h meta.o: ../../winix/core/job.h ../../winix/core/basethread.h meta.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -1299,10 +1300,10 @@ mkdir.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h mkdir.o: ../../winix/core/cur.h ../../winix/core/request.h mkdir.o: ../../winix/core/error.h ../../winix/core/config.h mkdir.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -mkdir.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -mkdir.o: ../../winix/core/user.h ../../winix/core/plugindata.h -mkdir.o: ../../winix/core/rebus.h ipban.h mount.h -mkdir.o: ../../winix/templates/locale.h ../../winix/core/request.h +mkdir.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +mkdir.o: ../../winix/core/session.h ../../winix/core/user.h +mkdir.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +mkdir.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h mkdir.o: ../../winix/core/config.h ../../winix/core/system.h mkdir.o: ../../winix/core/job.h ../../winix/core/basethread.h mkdir.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -1362,16 +1363,16 @@ mount.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h mount.o: ../../winix/core/cur.h ../../winix/core/request.h mount.o: ../../winix/core/error.h ../../winix/core/config.h mount.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -mount.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -mount.o: ../../winix/core/user.h ../../winix/core/plugindata.h -mount.o: ../../winix/core/rebus.h ipban.h ../../winix/templates/locale.h -mount.o: ../../winix/core/request.h ../../winix/core/config.h -mount.o: ../../winix/core/system.h ../../winix/core/job.h -mount.o: ../../winix/core/basethread.h ../../winix/core/synchro.h -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: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +mount.o: ../../winix/core/session.h ../../winix/core/user.h +mount.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +mount.o: ../../winix/templates/locale.h ../../winix/core/request.h +mount.o: ../../winix/core/config.h ../../winix/core/system.h +mount.o: ../../winix/core/job.h ../../winix/core/basethread.h +mount.o: ../../winix/core/synchro.h ../../winix/core/dirs.h +mount.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h +mount.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h +mount.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h mount.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h mount.o: ../../ezc/src/cache.h functions.h functionparser.h mount.o: ../../winix/core/cur.h account.h adduser.h cat.h chmod.h @@ -1411,16 +1412,16 @@ mv.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h mv.o: ../../winix/core/cur.h ../../winix/core/request.h mv.o: ../../winix/core/error.h ../../winix/core/config.h mv.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -mv.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -mv.o: ../../winix/core/user.h ../../winix/core/plugindata.h -mv.o: ../../winix/core/rebus.h ipban.h mount.h ../../winix/templates/locale.h -mv.o: ../../winix/core/request.h ../../winix/core/config.h -mv.o: ../../winix/core/system.h ../../winix/core/job.h -mv.o: ../../winix/core/basethread.h ../../winix/core/synchro.h -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: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +mv.o: ../../winix/core/session.h ../../winix/core/user.h +mv.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h mount.h +mv.o: ../../winix/templates/locale.h ../../winix/core/request.h +mv.o: ../../winix/core/config.h ../../winix/core/system.h +mv.o: ../../winix/core/job.h ../../winix/core/basethread.h +mv.o: ../../winix/core/synchro.h ../../winix/core/dirs.h +mv.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h +mv.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h +mv.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h mv.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h ../../ezc/src/cache.h mv.o: functions.h functionparser.h ../../winix/core/cur.h account.h adduser.h mv.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h default.h @@ -1472,10 +1473,10 @@ nicedit.o: ../../winix/core/cur.h ../../winix/core/request.h nicedit.o: ../../winix/core/error.h ../../winix/core/config.h nicedit.o: ../../winix/core/htmlfilter.h nicedit.o: ../../winix/templates/htmltextstream.h -nicedit.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -nicedit.o: ../../winix/core/user.h ../../winix/core/plugindata.h -nicedit.o: ../../winix/core/rebus.h ipban.h mount.h -nicedit.o: ../../winix/templates/locale.h ../../winix/core/request.h +nicedit.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +nicedit.o: ../../winix/core/session.h ../../winix/core/user.h +nicedit.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +nicedit.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h nicedit.o: ../../winix/core/config.h ../../winix/core/system.h nicedit.o: ../../winix/core/job.h ../../winix/core/basethread.h nicedit.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -1522,10 +1523,10 @@ node.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h node.o: ../../winix/core/cur.h ../../winix/core/request.h node.o: ../../winix/core/error.h ../../winix/core/config.h node.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -node.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -node.o: ../../winix/core/user.h ../../winix/core/plugindata.h -node.o: ../../winix/core/rebus.h ipban.h mount.h -node.o: ../../winix/templates/locale.h ../../winix/core/request.h +node.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +node.o: ../../winix/core/session.h ../../winix/core/user.h +node.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +node.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h node.o: ../../winix/core/config.h ../../winix/core/system.h node.o: ../../winix/core/job.h ../../winix/core/basethread.h node.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -1574,10 +1575,10 @@ passwd.o: ../../winix/core/cur.h ../../winix/core/request.h passwd.o: ../../winix/core/error.h ../../winix/core/config.h passwd.o: ../../winix/core/htmlfilter.h passwd.o: ../../winix/templates/htmltextstream.h -passwd.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -passwd.o: ../../winix/core/user.h ../../winix/core/plugindata.h -passwd.o: ../../winix/core/rebus.h ipban.h mount.h -passwd.o: ../../winix/templates/locale.h ../../winix/core/request.h +passwd.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +passwd.o: ../../winix/core/session.h ../../winix/core/user.h +passwd.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +passwd.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h passwd.o: ../../winix/core/config.h ../../winix/core/system.h passwd.o: ../../winix/core/job.h ../../winix/core/basethread.h passwd.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -1625,10 +1626,10 @@ priv.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h priv.o: ../../winix/core/cur.h ../../winix/core/request.h priv.o: ../../winix/core/error.h ../../winix/core/config.h priv.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -priv.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -priv.o: ../../winix/core/user.h ../../winix/core/plugindata.h -priv.o: ../../winix/core/rebus.h ipban.h mount.h -priv.o: ../../winix/templates/locale.h ../../winix/core/request.h +priv.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +priv.o: ../../winix/core/session.h ../../winix/core/user.h +priv.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +priv.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h priv.o: ../../winix/core/config.h ../../winix/core/system.h priv.o: ../../winix/core/job.h ../../winix/core/basethread.h priv.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -1681,12 +1682,12 @@ privchanger.o: ../../winix/core/cur.h ../../winix/core/request.h privchanger.o: ../../winix/core/error.h ../../winix/core/config.h privchanger.o: ../../winix/core/htmlfilter.h privchanger.o: ../../winix/templates/htmltextstream.h -privchanger.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -privchanger.o: ../../winix/core/user.h ../../winix/core/plugindata.h -privchanger.o: ../../winix/core/rebus.h ipban.h functionbase.h -privchanger.o: ../../winix/core/config.h ../../winix/core/synchro.h -privchanger.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h -privchanger.o: ../../winix/templates/locale.h +privchanger.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +privchanger.o: ../../winix/core/session.h ../../winix/core/user.h +privchanger.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +privchanger.o: functionbase.h ../../winix/core/config.h +privchanger.o: ../../winix/core/synchro.h ../../winix/notify/notify.h +privchanger.o: ../../winix/notify/notifypool.h ../../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/blocks.h @@ -1730,16 +1731,16 @@ pw.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h pw.o: ../../winix/core/cur.h ../../winix/core/request.h pw.o: ../../winix/core/error.h ../../winix/core/config.h pw.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -pw.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -pw.o: ../../winix/core/user.h ../../winix/core/plugindata.h -pw.o: ../../winix/core/rebus.h ipban.h mount.h ../../winix/templates/locale.h -pw.o: ../../winix/core/request.h ../../winix/core/config.h -pw.o: ../../winix/core/system.h ../../winix/core/job.h -pw.o: ../../winix/core/basethread.h ../../winix/core/synchro.h -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: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +pw.o: ../../winix/core/session.h ../../winix/core/user.h +pw.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h mount.h +pw.o: ../../winix/templates/locale.h ../../winix/core/request.h +pw.o: ../../winix/core/config.h ../../winix/core/system.h +pw.o: ../../winix/core/job.h ../../winix/core/basethread.h +pw.o: ../../winix/core/synchro.h ../../winix/core/dirs.h +pw.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h +pw.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h +pw.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h pw.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h ../../ezc/src/cache.h pw.o: functions.h functionparser.h ../../winix/core/cur.h account.h adduser.h pw.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h default.h @@ -1782,10 +1783,10 @@ reload.o: ../../winix/core/cur.h ../../winix/core/request.h reload.o: ../../winix/core/error.h ../../winix/core/config.h reload.o: ../../winix/core/htmlfilter.h reload.o: ../../winix/templates/htmltextstream.h -reload.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -reload.o: ../../winix/core/user.h ../../winix/core/plugindata.h -reload.o: ../../winix/core/rebus.h ipban.h mount.h -reload.o: ../../winix/templates/locale.h ../../winix/core/request.h +reload.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +reload.o: ../../winix/core/session.h ../../winix/core/user.h +reload.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +reload.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h reload.o: ../../winix/core/config.h ../../winix/core/system.h reload.o: ../../winix/core/job.h ../../winix/core/basethread.h reload.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -1837,16 +1838,16 @@ rm.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h rm.o: ../../winix/core/cur.h ../../winix/core/request.h rm.o: ../../winix/core/error.h ../../winix/core/config.h rm.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -rm.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -rm.o: ../../winix/core/user.h ../../winix/core/plugindata.h -rm.o: ../../winix/core/rebus.h ipban.h mount.h ../../winix/templates/locale.h -rm.o: ../../winix/core/request.h ../../winix/core/config.h -rm.o: ../../winix/core/system.h ../../winix/core/job.h -rm.o: ../../winix/core/basethread.h ../../winix/core/synchro.h -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: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +rm.o: ../../winix/core/session.h ../../winix/core/user.h +rm.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h mount.h +rm.o: ../../winix/templates/locale.h ../../winix/core/request.h +rm.o: ../../winix/core/config.h ../../winix/core/system.h +rm.o: ../../winix/core/job.h ../../winix/core/basethread.h +rm.o: ../../winix/core/synchro.h ../../winix/core/dirs.h +rm.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h +rm.o: ../../winix/notify/notifypool.h ../../winix/templates/patterns.h +rm.o: locale.h ../../winix/templates/localefilter.h ../../ezc/src/ezc.h rm.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h ../../ezc/src/cache.h rm.o: functions.h functionparser.h ../../winix/core/cur.h account.h adduser.h rm.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h default.h @@ -1898,10 +1899,10 @@ rmuser.o: ../../winix/core/cur.h ../../winix/core/request.h rmuser.o: ../../winix/core/error.h ../../winix/core/config.h rmuser.o: ../../winix/core/htmlfilter.h rmuser.o: ../../winix/templates/htmltextstream.h -rmuser.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -rmuser.o: ../../winix/core/user.h ../../winix/core/plugindata.h -rmuser.o: ../../winix/core/rebus.h ipban.h mount.h -rmuser.o: ../../winix/templates/locale.h ../../winix/core/request.h +rmuser.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +rmuser.o: ../../winix/core/session.h ../../winix/core/user.h +rmuser.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +rmuser.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h rmuser.o: ../../winix/core/config.h ../../winix/core/system.h rmuser.o: ../../winix/core/job.h ../../winix/core/basethread.h rmuser.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -1962,9 +1963,9 @@ run.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h run.o: ../../winix/core/cur.h ../../winix/core/request.h run.o: ../../winix/core/error.h ../../winix/core/config.h run.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -run.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -run.o: ../../winix/core/user.h ../../winix/core/plugindata.h -run.o: ../../winix/core/rebus.h ipban.h mount.h +run.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +run.o: ../../winix/core/session.h ../../winix/core/user.h +run.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h mount.h run.o: ../../winix/templates/locale.h ../../winix/core/request.h run.o: ../../winix/core/config.h ../../winix/core/system.h run.o: ../../winix/core/job.h ../../winix/core/basethread.h @@ -2011,10 +2012,10 @@ sort.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h sort.o: ../../winix/core/cur.h ../../winix/core/request.h sort.o: ../../winix/core/error.h ../../winix/core/config.h sort.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -sort.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -sort.o: ../../winix/core/user.h ../../winix/core/plugindata.h -sort.o: ../../winix/core/rebus.h ipban.h mount.h -sort.o: ../../winix/templates/locale.h ../../winix/core/request.h +sort.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +sort.o: ../../winix/core/session.h ../../winix/core/user.h +sort.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +sort.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h sort.o: ../../winix/core/config.h ../../winix/core/system.h sort.o: ../../winix/core/job.h ../../winix/core/basethread.h sort.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -2078,14 +2079,15 @@ specialdefault.o: ../../winix/core/error.h ../../winix/core/config.h specialdefault.o: ../../winix/core/htmlfilter.h specialdefault.o: ../../winix/templates/htmltextstream.h specialdefault.o: ../../pikotools/space/spacetojson.h -specialdefault.o: ../../winix/core/session.h ../../winix/core/user.h -specialdefault.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h -specialdefault.o: ipban.h mount.h ../../winix/templates/locale.h -specialdefault.o: ../../winix/core/request.h ../../winix/core/config.h -specialdefault.o: ../../winix/core/system.h ../../winix/core/job.h -specialdefault.o: ../../winix/core/basethread.h ../../winix/core/synchro.h -specialdefault.o: ../../winix/core/dirs.h ../../winix/core/dircontainer.h -specialdefault.o: ../../winix/notify/notify.h ../../winix/notify/notifypool.h +specialdefault.o: ../../ezc/src/outstreams.h ../../winix/core/session.h +specialdefault.o: ../../winix/core/user.h ../../winix/core/plugindata.h +specialdefault.o: ../../winix/core/rebus.h ipban.h mount.h +specialdefault.o: ../../winix/templates/locale.h ../../winix/core/request.h +specialdefault.o: ../../winix/core/config.h ../../winix/core/system.h +specialdefault.o: ../../winix/core/job.h ../../winix/core/basethread.h +specialdefault.o: ../../winix/core/synchro.h ../../winix/core/dirs.h +specialdefault.o: ../../winix/core/dircontainer.h ../../winix/notify/notify.h +specialdefault.o: ../../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/blocks.h @@ -2130,10 +2132,10 @@ stat.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h stat.o: ../../winix/core/cur.h ../../winix/core/request.h stat.o: ../../winix/core/error.h ../../winix/core/config.h stat.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -stat.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -stat.o: ../../winix/core/user.h ../../winix/core/plugindata.h -stat.o: ../../winix/core/rebus.h ipban.h mount.h -stat.o: ../../winix/templates/locale.h ../../winix/core/request.h +stat.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +stat.o: ../../winix/core/session.h ../../winix/core/user.h +stat.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +stat.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h stat.o: ../../winix/core/config.h ../../winix/core/system.h stat.o: ../../winix/core/job.h ../../winix/core/basethread.h stat.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -2182,10 +2184,10 @@ subject.o: ../../winix/core/cur.h ../../winix/core/request.h subject.o: ../../winix/core/error.h ../../winix/core/config.h subject.o: ../../winix/core/htmlfilter.h subject.o: ../../winix/templates/htmltextstream.h -subject.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -subject.o: ../../winix/core/user.h ../../winix/core/plugindata.h -subject.o: ../../winix/core/rebus.h ipban.h mount.h -subject.o: ../../winix/templates/locale.h ../../winix/core/request.h +subject.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +subject.o: ../../winix/core/session.h ../../winix/core/user.h +subject.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +subject.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h subject.o: ../../winix/core/config.h ../../winix/core/system.h subject.o: ../../winix/core/job.h ../../winix/core/basethread.h subject.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -2247,10 +2249,10 @@ template.o: ../../winix/core/cur.h ../../winix/core/request.h template.o: ../../winix/core/error.h ../../winix/core/config.h template.o: ../../winix/core/htmlfilter.h template.o: ../../winix/templates/htmltextstream.h -template.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -template.o: ../../winix/core/user.h ../../winix/core/plugindata.h -template.o: ../../winix/core/rebus.h ipban.h mount.h -template.o: ../../winix/templates/locale.h ../../winix/core/request.h +template.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +template.o: ../../winix/core/session.h ../../winix/core/user.h +template.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +template.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h template.o: ../../winix/core/config.h ../../winix/core/system.h template.o: ../../winix/core/job.h ../../winix/core/basethread.h template.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -2299,10 +2301,10 @@ timezone.o: ../../winix/core/cur.h ../../winix/core/request.h timezone.o: ../../winix/core/error.h ../../winix/core/config.h timezone.o: ../../winix/core/htmlfilter.h timezone.o: ../../winix/templates/htmltextstream.h -timezone.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -timezone.o: ../../winix/core/user.h ../../winix/core/plugindata.h -timezone.o: ../../winix/core/rebus.h ipban.h mount.h -timezone.o: ../../winix/templates/locale.h ../../winix/core/request.h +timezone.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +timezone.o: ../../winix/core/session.h ../../winix/core/user.h +timezone.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +timezone.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h timezone.o: ../../winix/core/config.h ../../winix/core/system.h timezone.o: ../../winix/core/job.h ../../winix/core/basethread.h timezone.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -2351,10 +2353,10 @@ tinymce.o: ../../winix/core/cur.h ../../winix/core/request.h tinymce.o: ../../winix/core/error.h ../../winix/core/config.h tinymce.o: ../../winix/core/htmlfilter.h tinymce.o: ../../winix/templates/htmltextstream.h -tinymce.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -tinymce.o: ../../winix/core/user.h ../../winix/core/plugindata.h -tinymce.o: ../../winix/core/rebus.h ipban.h mount.h -tinymce.o: ../../winix/templates/locale.h ../../winix/core/request.h +tinymce.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +tinymce.o: ../../winix/core/session.h ../../winix/core/user.h +tinymce.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +tinymce.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h tinymce.o: ../../winix/core/config.h ../../winix/core/system.h tinymce.o: ../../winix/core/job.h ../../winix/core/basethread.h tinymce.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -2401,10 +2403,10 @@ uname.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h uname.o: ../../winix/core/cur.h ../../winix/core/request.h uname.o: ../../winix/core/error.h ../../winix/core/config.h uname.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -uname.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -uname.o: ../../winix/core/user.h ../../winix/core/plugindata.h -uname.o: ../../winix/core/rebus.h ipban.h mount.h -uname.o: ../../winix/templates/locale.h ../../winix/core/request.h +uname.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +uname.o: ../../winix/core/session.h ../../winix/core/user.h +uname.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +uname.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h uname.o: ../../winix/core/config.h ../../winix/core/system.h uname.o: ../../winix/core/job.h ../../winix/core/basethread.h uname.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -2453,10 +2455,10 @@ upload.o: ../../winix/core/cur.h ../../winix/core/request.h upload.o: ../../winix/core/error.h ../../winix/core/config.h upload.o: ../../winix/core/htmlfilter.h upload.o: ../../winix/templates/htmltextstream.h -upload.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -upload.o: ../../winix/core/user.h ../../winix/core/plugindata.h -upload.o: ../../winix/core/rebus.h ipban.h mount.h -upload.o: ../../winix/templates/locale.h ../../winix/core/request.h +upload.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +upload.o: ../../winix/core/session.h ../../winix/core/user.h +upload.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +upload.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h upload.o: ../../winix/core/config.h ../../winix/core/system.h upload.o: ../../winix/core/job.h ../../winix/core/basethread.h upload.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -2518,10 +2520,10 @@ uptime.o: ../../winix/core/cur.h ../../winix/core/request.h uptime.o: ../../winix/core/error.h ../../winix/core/config.h uptime.o: ../../winix/core/htmlfilter.h uptime.o: ../../winix/templates/htmltextstream.h -uptime.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -uptime.o: ../../winix/core/user.h ../../winix/core/plugindata.h -uptime.o: ../../winix/core/rebus.h ipban.h mount.h -uptime.o: ../../winix/templates/locale.h ../../winix/core/request.h +uptime.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +uptime.o: ../../winix/core/session.h ../../winix/core/user.h +uptime.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h +uptime.o: mount.h ../../winix/templates/locale.h ../../winix/core/request.h uptime.o: ../../winix/core/config.h ../../winix/core/system.h uptime.o: ../../winix/core/job.h ../../winix/core/basethread.h uptime.o: ../../winix/core/synchro.h ../../winix/core/dirs.h @@ -2568,9 +2570,9 @@ vim.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h vim.o: ../../winix/core/cur.h ../../winix/core/request.h vim.o: ../../winix/core/error.h ../../winix/core/config.h vim.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -vim.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -vim.o: ../../winix/core/user.h ../../winix/core/plugindata.h -vim.o: ../../winix/core/rebus.h ipban.h mount.h +vim.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +vim.o: ../../winix/core/session.h ../../winix/core/user.h +vim.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h mount.h vim.o: ../../winix/templates/locale.h ../../winix/core/request.h vim.o: ../../winix/core/config.h ../../winix/core/system.h vim.o: ../../winix/core/job.h ../../winix/core/basethread.h @@ -2617,9 +2619,9 @@ who.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h who.o: ../../winix/core/cur.h ../../winix/core/request.h who.o: ../../winix/core/error.h ../../winix/core/config.h who.o: ../../winix/core/htmlfilter.h ../../winix/templates/htmltextstream.h -who.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -who.o: ../../winix/core/user.h ../../winix/core/plugindata.h -who.o: ../../winix/core/rebus.h ipban.h mount.h +who.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +who.o: ../../winix/core/session.h ../../winix/core/user.h +who.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h ipban.h mount.h who.o: ../../winix/templates/locale.h ../../winix/core/request.h who.o: ../../winix/core/config.h ../../winix/core/system.h who.o: ../../winix/core/job.h ../../winix/core/basethread.h diff --git a/functions/rm.cpp b/functions/rm.cpp index 7cbb944..2c74422 100644 --- a/functions/rm.cpp +++ b/functions/rm.cpp @@ -490,7 +490,9 @@ void Rm::Clear() - +/* + * !! IMPROVE ME what about a Content-Type header for javascript? + */ void Rm::CreateJSON(bool status) { using TemplatesFunctions::R; @@ -498,7 +500,7 @@ PT::WTextStream buf; JSONescape(buf, cur->request->item.url); - auto & out = cur->request->out_streams[0]; + auto & out = cur->request->out_main_stream; out << R("{\"files\": [{\"") << R(buf) << R("\": "); if( status ) @@ -508,8 +510,8 @@ PT::WTextStream buf; out << R("}]}"); - cur->request->page_generated = true; - cur->request->use_html_filter[0] = false; + cur->request->page_generated = true; + cur->request->out_main_stream_use_html_filter = false; } diff --git a/main/Makefile.dep b/main/Makefile.dep index 4ccd0e9..cd92474 100644 --- a/main/Makefile.dep +++ b/main/Makefile.dep @@ -14,15 +14,16 @@ main.o: ../../winix/core/request.h ../../winix/core/error.h main.o: ../../winix/core/config.h ../../pikotools/space/spaceparser.h main.o: ../../pikotools/space/space.h ../../winix/core/htmlfilter.h main.o: ../../winix/templates/htmltextstream.h ../../winix/core/textstream.h -main.o: ../../pikotools/space/spacetojson.h ../../winix/core/session.h -main.o: ../../winix/core/user.h ../../winix/core/plugindata.h -main.o: ../../winix/core/rebus.h ../../winix/core/ipban.h -main.o: ../../winix/core/mount.h ../../winix/templates/locale.h -main.o: ../../winix/core/slog.h ../../winix/core/app.h -main.o: ../../winix/core/system.h ../../winix/core/job.h -main.o: ../../winix/core/basethread.h ../../winix/core/synchro.h -main.o: ../../winix/core/dirs.h ../../winix/core/dircontainer.h -main.o: ../../winix/db/db.h ../../winix/db/dbbase.h ../../winix/db/dbconn.h +main.o: ../../pikotools/space/spacetojson.h ../../ezc/src/outstreams.h +main.o: ../../winix/core/session.h ../../winix/core/user.h +main.o: ../../winix/core/plugindata.h ../../winix/core/rebus.h +main.o: ../../winix/core/ipban.h ../../winix/core/mount.h +main.o: ../../winix/templates/locale.h ../../winix/core/slog.h +main.o: ../../winix/core/app.h ../../winix/core/system.h +main.o: ../../winix/core/job.h ../../winix/core/basethread.h +main.o: ../../winix/core/synchro.h ../../winix/core/dirs.h +main.o: ../../winix/core/dircontainer.h ../../winix/db/db.h +main.o: ../../winix/db/dbbase.h ../../winix/db/dbconn.h main.o: ../../winix/db/dbtextstream.h ../../winix/core/error.h main.o: ../../winix/db/dbitemquery.h ../../winix/core/item.h main.o: ../../winix/db/dbitemcolumns.h ../../winix/core/user.h diff --git a/notify/Makefile.dep b/notify/Makefile.dep index 0df7eec..64fc706 100644 --- a/notify/Makefile.dep +++ b/notify/Makefile.dep @@ -14,8 +14,9 @@ notify.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h notify.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h notify.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h notify.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -notify.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h -notify.o: ../../winix/templates/misc.h ../../winix/templates/htmltextstream.h +notify.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.h +notify.o: ../../ezc/src/patternparser.h ../../winix/templates/misc.h +notify.o: ../../winix/templates/htmltextstream.h notify.o: ../../winix/core/textstream.h notifythread.h notify.o: ../../winix/core/basethread.h ../../winix/core/synchro.h notify.o: templatesnotify.h ../../winix/core/config.h @@ -97,8 +98,8 @@ notifythread.o: ../../ezc/src/blocks.h ../../ezc/src/item.h notifythread.o: ../../ezc/src/cache.h ../../ezc/src/functions.h notifythread.o: ../../pikotools/utf8/utf8.h ../../ezc/src/funinfo.h notifythread.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h -notifythread.o: ../../ezc/src/patternparser.h ../../winix/core/textstream.h -notifythread.o: ../../winix/templates/misc.h +notifythread.o: ../../ezc/src/outstreams.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 notifythread.o: ../../winix/templates/htmltextstream.h @@ -137,7 +138,8 @@ templatesnotify.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h templatesnotify.o: ../../ezc/src/item.h ../../ezc/src/cache.h templatesnotify.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h templatesnotify.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -templatesnotify.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +templatesnotify.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 diff --git a/plugins/export/Makefile.dep b/plugins/export/Makefile.dep index f083cf4..3f938f3 100644 --- a/plugins/export/Makefile.dep +++ b/plugins/export/Makefile.dep @@ -24,12 +24,13 @@ edb.o: ../../../winix/core/cur.h ../../../winix/core/request.h edb.o: ../../../winix/core/error.h ../../../winix/core/config.h edb.o: ../../../winix/core/htmlfilter.h edb.o: ../../../winix/templates/htmltextstream.h -edb.o: ../../../pikotools/space/spacetojson.h ../../../winix/core/session.h -edb.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h -edb.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h -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: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h +edb.o: ../../../winix/core/session.h ../../../winix/core/user.h +edb.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h +edb.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h +edb.o: ../../../winix/templates/locale.h ../../../winix/notify/notify.h +edb.o: ../../../winix/notify/notifypool.h ../../../winix/templates/patterns.h +edb.o: ../../../winix/templates/locale.h edb.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h edb.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h edb.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h @@ -72,10 +73,10 @@ exportinfo.o: ../../../winix/core/textstream.h ../../../winix/core/misc.h exportinfo.o: ../../../pikotools/utf8/utf8.h exportinfo.o: ../../../winix/core/winix_const.h exportinfo.o: ../../../pikotools/space/spacetojson.h -exportinfo.o: ../../../winix/core/session.h ../../../winix/core/user.h -exportinfo.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h -exportinfo.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h -exportinfo.o: ../../../winix/templates/locale.h +exportinfo.o: ../../../ezc/src/outstreams.h ../../../winix/core/session.h +exportinfo.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h +exportinfo.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h +exportinfo.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h exportinfo.o: ../../../winix/notify/notify.h exportinfo.o: ../../../winix/notify/notifypool.h exportinfo.o: ../../../winix/templates/patterns.h @@ -141,14 +142,14 @@ funexport.o: ../../../winix/templates/htmltextstream.h funexport.o: ../../../winix/core/textstream.h ../../../winix/core/misc.h funexport.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/winix_const.h funexport.o: ../../../pikotools/space/spacetojson.h -funexport.o: ../../../winix/core/session.h ../../../winix/core/user.h -funexport.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h -funexport.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h -funexport.o: ../../../winix/templates/locale.h ../../../winix/core/request.h -funexport.o: ../../../winix/core/config.h ../../../winix/core/system.h -funexport.o: ../../../winix/core/job.h ../../../winix/core/basethread.h -funexport.o: ../../../winix/core/synchro.h ../../../winix/core/dirs.h -funexport.o: ../../../winix/core/dircontainer.h +funexport.o: ../../../ezc/src/outstreams.h ../../../winix/core/session.h +funexport.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h +funexport.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h +funexport.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h +funexport.o: ../../../winix/core/request.h ../../../winix/core/config.h +funexport.o: ../../../winix/core/system.h ../../../winix/core/job.h +funexport.o: ../../../winix/core/basethread.h ../../../winix/core/synchro.h +funexport.o: ../../../winix/core/dirs.h ../../../winix/core/dircontainer.h funexport.o: ../../../winix/notify/notify.h funexport.o: ../../../winix/notify/notifypool.h funexport.o: ../../../winix/templates/patterns.h @@ -192,19 +193,19 @@ init.o: ../../../pikotools/space/space.h ../../../winix/core/htmlfilter.h init.o: ../../../winix/templates/htmltextstream.h init.o: ../../../winix/core/textstream.h ../../../winix/core/misc.h init.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/winix_const.h -init.o: ../../../pikotools/space/spacetojson.h ../../../winix/core/session.h -init.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h -init.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h -init.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h -init.o: ../../../winix/core/system.h ../../../winix/core/job.h -init.o: ../../../winix/core/basethread.h ../../../winix/core/synchro.h -init.o: ../../../winix/core/dirs.h ../../../winix/core/dircontainer.h -init.o: ../../../winix/db/db.h ../../../winix/db/dbbase.h -init.o: ../../../winix/db/dbitemquery.h ../../../winix/core/item.h -init.o: ../../../winix/db/dbitemcolumns.h ../../../winix/core/user.h -init.o: ../../../winix/core/group.h ../../../winix/core/dircontainer.h -init.o: ../../../winix/core/ugcontainer.h ../../../winix/notify/notify.h -init.o: ../../../winix/notify/notifypool.h +init.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h +init.o: ../../../winix/core/session.h ../../../winix/core/user.h +init.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h +init.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h +init.o: ../../../winix/templates/locale.h ../../../winix/core/system.h +init.o: ../../../winix/core/job.h ../../../winix/core/basethread.h +init.o: ../../../winix/core/synchro.h ../../../winix/core/dirs.h +init.o: ../../../winix/core/dircontainer.h ../../../winix/db/db.h +init.o: ../../../winix/db/dbbase.h ../../../winix/db/dbitemquery.h +init.o: ../../../winix/core/item.h ../../../winix/db/dbitemcolumns.h +init.o: ../../../winix/core/user.h ../../../winix/core/group.h +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/blocks.h diff --git a/plugins/gallery/Makefile.dep b/plugins/gallery/Makefile.dep index 6f495df..5fd07b1 100644 --- a/plugins/gallery/Makefile.dep +++ b/plugins/gallery/Makefile.dep @@ -26,15 +26,15 @@ gallery.o: ../../../winix/core/error.h ../../../winix/core/config.h gallery.o: ../../../winix/core/htmlfilter.h gallery.o: ../../../winix/templates/htmltextstream.h gallery.o: ../../../pikotools/space/spacetojson.h -gallery.o: ../../../winix/core/session.h ../../../winix/core/user.h -gallery.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h -gallery.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h -gallery.o: ../../../winix/templates/locale.h ../../../winix/core/request.h -gallery.o: ../../../winix/core/config.h ../../../winix/core/system.h -gallery.o: ../../../winix/core/job.h ../../../winix/core/basethread.h -gallery.o: ../../../winix/core/synchro.h ../../../winix/core/dirs.h -gallery.o: ../../../winix/core/dircontainer.h ../../../winix/notify/notify.h -gallery.o: ../../../winix/notify/notifypool.h +gallery.o: ../../../ezc/src/outstreams.h ../../../winix/core/session.h +gallery.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h +gallery.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h +gallery.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h +gallery.o: ../../../winix/core/request.h ../../../winix/core/config.h +gallery.o: ../../../winix/core/system.h ../../../winix/core/job.h +gallery.o: ../../../winix/core/basethread.h ../../../winix/core/synchro.h +gallery.o: ../../../winix/core/dirs.h ../../../winix/core/dircontainer.h +gallery.o: ../../../winix/notify/notify.h ../../../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 @@ -82,15 +82,16 @@ init.o: ../../../winix/core/cur.h ../../../winix/core/request.h init.o: ../../../winix/core/error.h ../../../winix/core/config.h init.o: ../../../winix/core/htmlfilter.h init.o: ../../../winix/templates/htmltextstream.h -init.o: ../../../pikotools/space/spacetojson.h ../../../winix/core/session.h -init.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h -init.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h -init.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h -init.o: ../../../winix/core/request.h ../../../winix/core/config.h -init.o: ../../../winix/core/system.h ../../../winix/core/job.h -init.o: ../../../winix/core/basethread.h ../../../winix/core/synchro.h -init.o: ../../../winix/core/dirs.h ../../../winix/core/dircontainer.h -init.o: ../../../winix/notify/notify.h ../../../winix/notify/notifypool.h +init.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h +init.o: ../../../winix/core/session.h ../../../winix/core/user.h +init.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h +init.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h +init.o: ../../../winix/templates/locale.h ../../../winix/core/request.h +init.o: ../../../winix/core/config.h ../../../winix/core/system.h +init.o: ../../../winix/core/job.h ../../../winix/core/basethread.h +init.o: ../../../winix/core/synchro.h ../../../winix/core/dirs.h +init.o: ../../../winix/core/dircontainer.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/blocks.h @@ -171,14 +172,14 @@ templates.o: ../../../winix/core/error.h ../../../winix/core/config.h templates.o: ../../../winix/core/htmlfilter.h templates.o: ../../../winix/templates/htmltextstream.h templates.o: ../../../pikotools/space/spacetojson.h -templates.o: ../../../winix/core/session.h ../../../winix/core/user.h -templates.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h -templates.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h -templates.o: ../../../winix/templates/locale.h ../../../winix/core/request.h -templates.o: ../../../winix/core/config.h ../../../winix/core/system.h -templates.o: ../../../winix/core/job.h ../../../winix/core/basethread.h -templates.o: ../../../winix/core/synchro.h ../../../winix/core/dirs.h -templates.o: ../../../winix/core/dircontainer.h +templates.o: ../../../ezc/src/outstreams.h ../../../winix/core/session.h +templates.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h +templates.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h +templates.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h +templates.o: ../../../winix/core/request.h ../../../winix/core/config.h +templates.o: ../../../winix/core/system.h ../../../winix/core/job.h +templates.o: ../../../winix/core/basethread.h ../../../winix/core/synchro.h +templates.o: ../../../winix/core/dirs.h ../../../winix/core/dircontainer.h templates.o: ../../../winix/notify/notify.h templates.o: ../../../winix/notify/notifypool.h templates.o: ../../../winix/templates/patterns.h diff --git a/plugins/group/Makefile.dep b/plugins/group/Makefile.dep index 13c4186..e5d6dea 100644 --- a/plugins/group/Makefile.dep +++ b/plugins/group/Makefile.dep @@ -29,10 +29,11 @@ groupinfo.o: ../../../winix/core/error.h ../../../winix/core/config.h groupinfo.o: ../../../winix/core/htmlfilter.h groupinfo.o: ../../../winix/templates/htmltextstream.h groupinfo.o: ../../../pikotools/space/spacetojson.h -groupinfo.o: ../../../winix/core/session.h ../../../winix/core/user.h -groupinfo.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h -groupinfo.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h -groupinfo.o: ../../../winix/templates/locale.h ../../../winix/notify/notify.h +groupinfo.o: ../../../ezc/src/outstreams.h ../../../winix/core/session.h +groupinfo.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h +groupinfo.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h +groupinfo.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h +groupinfo.o: ../../../winix/notify/notify.h groupinfo.o: ../../../winix/notify/notifypool.h groupinfo.o: ../../../winix/templates/patterns.h groupinfo.o: ../../../winix/templates/locale.h @@ -76,20 +77,21 @@ init.o: ../../../winix/core/htmlfilter.h init.o: ../../../winix/templates/htmltextstream.h init.o: ../../../winix/core/textstream.h ../../../winix/core/misc.h init.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/winix_const.h -init.o: ../../../pikotools/space/spacetojson.h ../../../winix/core/session.h -init.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h -init.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h -init.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h -init.o: ../../../winix/core/system.h ../../../winix/core/job.h -init.o: ../../../winix/core/basethread.h ../../../winix/core/synchro.h -init.o: ../../../winix/core/dirs.h ../../../winix/core/dircontainer.h -init.o: ../../../winix/db/db.h ../../../winix/db/dbbase.h -init.o: ../../../winix/db/dbconn.h ../../../winix/db/dbtextstream.h -init.o: ../../../winix/core/error.h ../../../winix/db/dbitemquery.h -init.o: ../../../winix/core/item.h ../../../winix/db/dbitemcolumns.h -init.o: ../../../winix/core/user.h ../../../winix/core/group.h -init.o: ../../../winix/core/dircontainer.h ../../../winix/core/ugcontainer.h -init.o: ../../../winix/notify/notify.h ../../../winix/notify/notifypool.h +init.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h +init.o: ../../../winix/core/session.h ../../../winix/core/user.h +init.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h +init.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h +init.o: ../../../winix/templates/locale.h ../../../winix/core/system.h +init.o: ../../../winix/core/job.h ../../../winix/core/basethread.h +init.o: ../../../winix/core/synchro.h ../../../winix/core/dirs.h +init.o: ../../../winix/core/dircontainer.h ../../../winix/db/db.h +init.o: ../../../winix/db/dbbase.h ../../../winix/db/dbconn.h +init.o: ../../../winix/db/dbtextstream.h ../../../winix/core/error.h +init.o: ../../../winix/db/dbitemquery.h ../../../winix/core/item.h +init.o: ../../../winix/db/dbitemcolumns.h ../../../winix/core/user.h +init.o: ../../../winix/core/group.h ../../../winix/core/dircontainer.h +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/blocks.h @@ -146,8 +148,9 @@ templates.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h templates.o: ../../../winix/core/item.h ../../../ezc/src/cache.h templates.o: ../../../ezc/src/functions.h ../../../pikotools/utf8/utf8.h templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h -templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h -templates.o: ../../../winix/core/misc.h ../../../winix/core/requesttypes.h +templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.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 templates.o: ../../../pikotools/convert/convert.h diff --git a/plugins/menu/Makefile.dep b/plugins/menu/Makefile.dep index 9bffa13..c92df2c 100644 --- a/plugins/menu/Makefile.dep +++ b/plugins/menu/Makefile.dep @@ -24,11 +24,12 @@ cache.o: ../../../winix/core/cur.h ../../../winix/core/request.h cache.o: ../../../winix/core/error.h ../../../winix/core/config.h cache.o: ../../../winix/core/htmlfilter.h cache.o: ../../../winix/templates/htmltextstream.h -cache.o: ../../../pikotools/space/spacetojson.h ../../../winix/core/session.h -cache.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h -cache.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h -cache.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h -cache.o: ../../../winix/notify/notify.h ../../../winix/notify/notifypool.h +cache.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h +cache.o: ../../../winix/core/session.h ../../../winix/core/user.h +cache.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h +cache.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h +cache.o: ../../../winix/templates/locale.h ../../../winix/notify/notify.h +cache.o: ../../../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 @@ -58,22 +59,22 @@ init.o: ../../../pikotools/space/space.h ../../../winix/core/htmlfilter.h init.o: ../../../winix/templates/htmltextstream.h init.o: ../../../winix/core/textstream.h ../../../winix/core/misc.h init.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/winix_const.h -init.o: ../../../pikotools/space/spacetojson.h ../../../winix/core/session.h -init.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h -init.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h -init.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h -init.o: ../../../winix/core/plugin.h ../../../winix/core/pluginmsg.h -init.o: ../../../winix/core/log.h ../../../winix/core/system.h -init.o: ../../../winix/core/job.h ../../../winix/core/basethread.h -init.o: ../../../winix/core/synchro.h ../../../winix/core/dirs.h -init.o: ../../../winix/core/dircontainer.h ../../../winix/db/db.h -init.o: ../../../winix/db/dbbase.h ../../../winix/db/dbconn.h -init.o: ../../../winix/db/dbtextstream.h ../../../winix/core/error.h -init.o: ../../../winix/db/dbitemquery.h ../../../winix/core/item.h -init.o: ../../../winix/db/dbitemcolumns.h ../../../winix/core/user.h -init.o: ../../../winix/core/group.h ../../../winix/core/dircontainer.h -init.o: ../../../winix/core/ugcontainer.h ../../../winix/notify/notify.h -init.o: ../../../winix/notify/notifypool.h +init.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h +init.o: ../../../winix/core/session.h ../../../winix/core/user.h +init.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h +init.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h +init.o: ../../../winix/templates/locale.h ../../../winix/core/plugin.h +init.o: ../../../winix/core/pluginmsg.h ../../../winix/core/log.h +init.o: ../../../winix/core/system.h ../../../winix/core/job.h +init.o: ../../../winix/core/basethread.h ../../../winix/core/synchro.h +init.o: ../../../winix/core/dirs.h ../../../winix/core/dircontainer.h +init.o: ../../../winix/db/db.h ../../../winix/db/dbbase.h +init.o: ../../../winix/db/dbconn.h ../../../winix/db/dbtextstream.h +init.o: ../../../winix/core/error.h ../../../winix/db/dbitemquery.h +init.o: ../../../winix/core/item.h ../../../winix/db/dbitemcolumns.h +init.o: ../../../winix/core/user.h ../../../winix/core/group.h +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/blocks.h cache.h @@ -156,10 +157,11 @@ templates.o: ../../../winix/core/error.h ../../../winix/core/config.h templates.o: ../../../winix/core/htmlfilter.h templates.o: ../../../winix/templates/htmltextstream.h templates.o: ../../../pikotools/space/spacetojson.h -templates.o: ../../../winix/core/session.h ../../../winix/core/user.h -templates.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h -templates.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h -templates.o: ../../../winix/templates/locale.h ../../../winix/notify/notify.h +templates.o: ../../../ezc/src/outstreams.h ../../../winix/core/session.h +templates.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h +templates.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h +templates.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h +templates.o: ../../../winix/notify/notify.h templates.o: ../../../winix/notify/notifypool.h templates.o: ../../../winix/templates/patterns.h templates.o: ../../../winix/templates/locale.h diff --git a/plugins/stats/Makefile.dep b/plugins/stats/Makefile.dep index 6fd2294..7eb16ca 100644 --- a/plugins/stats/Makefile.dep +++ b/plugins/stats/Makefile.dep @@ -19,23 +19,24 @@ init.o: ../../../pikotools/space/spaceparser.h init.o: ../../../pikotools/space/space.h ../../../winix/core/htmlfilter.h init.o: ../../../winix/templates/htmltextstream.h init.o: ../../../winix/core/textstream.h -init.o: ../../../pikotools/space/spacetojson.h ../../../winix/core/session.h -init.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h -init.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h -init.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h -init.o: ../../../winix/core/request.h ../../../winix/core/config.h -init.o: ../../../winix/db/db.h ../../../winix/db/dbbase.h -init.o: ../../../winix/db/dbconn.h ../../../winix/db/dbtextstream.h -init.o: ../../../winix/core/error.h ../../../winix/db/dbitemquery.h -init.o: ../../../winix/core/item.h ../../../winix/db/dbitemcolumns.h -init.o: ../../../winix/core/user.h ../../../winix/core/group.h -init.o: ../../../winix/core/dircontainer.h ../../../winix/core/ugcontainer.h -init.o: ../../../winix/core/log.h bot.h stats.h templates.h -init.o: ../../../winix/core/plugin.h ../../../winix/core/pluginmsg.h -init.o: ../../../winix/core/system.h ../../../winix/core/job.h -init.o: ../../../winix/core/basethread.h ../../../winix/core/synchro.h -init.o: ../../../winix/core/dirs.h ../../../winix/core/dircontainer.h -init.o: ../../../winix/notify/notify.h ../../../winix/notify/notifypool.h +init.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h +init.o: ../../../winix/core/session.h ../../../winix/core/user.h +init.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h +init.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h +init.o: ../../../winix/templates/locale.h ../../../winix/core/request.h +init.o: ../../../winix/core/config.h ../../../winix/db/db.h +init.o: ../../../winix/db/dbbase.h ../../../winix/db/dbconn.h +init.o: ../../../winix/db/dbtextstream.h ../../../winix/core/error.h +init.o: ../../../winix/db/dbitemquery.h ../../../winix/core/item.h +init.o: ../../../winix/db/dbitemcolumns.h ../../../winix/core/user.h +init.o: ../../../winix/core/group.h ../../../winix/core/dircontainer.h +init.o: ../../../winix/core/ugcontainer.h ../../../winix/core/log.h bot.h +init.o: stats.h templates.h ../../../winix/core/plugin.h +init.o: ../../../winix/core/pluginmsg.h ../../../winix/core/system.h +init.o: ../../../winix/core/job.h ../../../winix/core/basethread.h +init.o: ../../../winix/core/synchro.h ../../../winix/core/dirs.h +init.o: ../../../winix/core/dircontainer.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/blocks.h @@ -107,10 +108,11 @@ stats.o: ../../../pikotools/space/spaceparser.h stats.o: ../../../pikotools/space/space.h ../../../winix/core/htmlfilter.h stats.o: ../../../winix/templates/htmltextstream.h stats.o: ../../../winix/core/textstream.h -stats.o: ../../../pikotools/space/spacetojson.h ../../../winix/core/session.h -stats.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h -stats.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h -stats.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h +stats.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h +stats.o: ../../../winix/core/session.h ../../../winix/core/user.h +stats.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h +stats.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h +stats.o: ../../../winix/templates/locale.h templates.o: templates.h ../../../winix/core/plugin.h templates.o: ../../../winix/core/pluginmsg.h ../../../winix/core/log.h templates.o: ../../../winix/core/plugindata.h ../../../winix/core/config.h @@ -132,15 +134,15 @@ templates.o: ../../../winix/core/winix_const.h templates.o: ../../../winix/templates/htmltextstream.h templates.o: ../../../winix/core/textstream.h templates.o: ../../../pikotools/space/spacetojson.h -templates.o: ../../../winix/core/system.h ../../../winix/core/job.h -templates.o: ../../../winix/core/basethread.h ../../../winix/core/synchro.h -templates.o: ../../../winix/core/dirs.h ../../../winix/core/dircontainer.h -templates.o: ../../../winix/db/db.h ../../../winix/db/dbbase.h -templates.o: ../../../winix/db/dbconn.h ../../../winix/db/dbtextstream.h -templates.o: ../../../winix/core/error.h ../../../winix/db/dbitemquery.h -templates.o: ../../../winix/core/item.h ../../../winix/db/dbitemcolumns.h -templates.o: ../../../winix/core/user.h ../../../winix/core/group.h -templates.o: ../../../winix/core/dircontainer.h +templates.o: ../../../ezc/src/outstreams.h ../../../winix/core/system.h +templates.o: ../../../winix/core/job.h ../../../winix/core/basethread.h +templates.o: ../../../winix/core/synchro.h ../../../winix/core/dirs.h +templates.o: ../../../winix/core/dircontainer.h ../../../winix/db/db.h +templates.o: ../../../winix/db/dbbase.h ../../../winix/db/dbconn.h +templates.o: ../../../winix/db/dbtextstream.h ../../../winix/core/error.h +templates.o: ../../../winix/db/dbitemquery.h ../../../winix/core/item.h +templates.o: ../../../winix/db/dbitemcolumns.h ../../../winix/core/user.h +templates.o: ../../../winix/core/group.h ../../../winix/core/dircontainer.h templates.o: ../../../winix/core/ugcontainer.h ../../../winix/notify/notify.h templates.o: ../../../winix/notify/notifypool.h templates.o: ../../../winix/templates/locale.h diff --git a/plugins/thread/Makefile.dep b/plugins/thread/Makefile.dep index ecb7fa8..0060d24 100644 --- a/plugins/thread/Makefile.dep +++ b/plugins/thread/Makefile.dep @@ -29,10 +29,10 @@ createthread.o: ../../../winix/core/request.h ../../../winix/core/error.h createthread.o: ../../../winix/core/config.h ../../../winix/core/htmlfilter.h createthread.o: ../../../winix/templates/htmltextstream.h createthread.o: ../../../pikotools/space/spacetojson.h -createthread.o: ../../../winix/core/session.h ../../../winix/core/user.h -createthread.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h -createthread.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h -createthread.o: ../../../winix/templates/locale.h +createthread.o: ../../../ezc/src/outstreams.h ../../../winix/core/session.h +createthread.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h +createthread.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h +createthread.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h createthread.o: ../../../winix/core/request.h ../../../winix/core/config.h createthread.o: ../../../winix/core/system.h ../../../winix/core/job.h createthread.o: ../../../winix/core/basethread.h @@ -133,14 +133,14 @@ funthread.o: ../../../winix/core/error.h ../../../winix/core/config.h funthread.o: ../../../winix/core/htmlfilter.h funthread.o: ../../../winix/templates/htmltextstream.h funthread.o: ../../../pikotools/space/spacetojson.h -funthread.o: ../../../winix/core/session.h ../../../winix/core/user.h -funthread.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h -funthread.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h -funthread.o: ../../../winix/templates/locale.h ../../../winix/core/request.h -funthread.o: ../../../winix/core/config.h ../../../winix/core/system.h -funthread.o: ../../../winix/core/job.h ../../../winix/core/basethread.h -funthread.o: ../../../winix/core/synchro.h ../../../winix/core/dirs.h -funthread.o: ../../../winix/core/dircontainer.h +funthread.o: ../../../ezc/src/outstreams.h ../../../winix/core/session.h +funthread.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h +funthread.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h +funthread.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h +funthread.o: ../../../winix/core/request.h ../../../winix/core/config.h +funthread.o: ../../../winix/core/system.h ../../../winix/core/job.h +funthread.o: ../../../winix/core/basethread.h ../../../winix/core/synchro.h +funthread.o: ../../../winix/core/dirs.h ../../../winix/core/dircontainer.h funthread.o: ../../../winix/notify/notify.h funthread.o: ../../../winix/notify/notifypool.h funthread.o: ../../../winix/templates/patterns.h @@ -189,15 +189,16 @@ init.o: ../../../winix/core/cur.h ../../../winix/core/request.h init.o: ../../../winix/core/error.h ../../../winix/core/config.h init.o: ../../../winix/core/htmlfilter.h init.o: ../../../winix/templates/htmltextstream.h -init.o: ../../../pikotools/space/spacetojson.h ../../../winix/core/session.h -init.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h -init.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h -init.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h -init.o: ../../../winix/core/request.h ../../../winix/core/config.h -init.o: ../../../winix/core/system.h ../../../winix/core/job.h -init.o: ../../../winix/core/basethread.h ../../../winix/core/synchro.h -init.o: ../../../winix/core/dirs.h ../../../winix/core/dircontainer.h -init.o: ../../../winix/notify/notify.h ../../../winix/notify/notifypool.h +init.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h +init.o: ../../../winix/core/session.h ../../../winix/core/user.h +init.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h +init.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h +init.o: ../../../winix/templates/locale.h ../../../winix/core/request.h +init.o: ../../../winix/core/config.h ../../../winix/core/system.h +init.o: ../../../winix/core/job.h ../../../winix/core/basethread.h +init.o: ../../../winix/core/synchro.h ../../../winix/core/dirs.h +init.o: ../../../winix/core/dircontainer.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/blocks.h @@ -270,11 +271,12 @@ reply.o: ../../../pikotools/space/space.h ../../../winix/core/htmlfilter.h reply.o: ../../../winix/templates/htmltextstream.h reply.o: ../../../winix/core/textstream.h ../../../winix/core/misc.h reply.o: ../../../pikotools/utf8/utf8.h ../../../winix/core/winix_const.h -reply.o: ../../../pikotools/space/spacetojson.h ../../../winix/core/session.h -reply.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h -reply.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h -reply.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h -reply.o: ../../../winix/core/system.h ../../../winix/core/sessionmanager.h +reply.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h +reply.o: ../../../winix/core/session.h ../../../winix/core/user.h +reply.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h +reply.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h +reply.o: ../../../winix/templates/locale.h ../../../winix/core/system.h +reply.o: ../../../winix/core/sessionmanager.h reply.o: ../../../winix/core/sessioncontainer.h reply.o: ../../../winix/core/ipbancontainer.h reply.o: ../../../winix/core/lastcontainer.h ../../../winix/core/synchro.h @@ -371,10 +373,10 @@ showthreads.o: ../../../winix/core/request.h ../../../winix/core/error.h showthreads.o: ../../../winix/core/config.h ../../../winix/core/htmlfilter.h showthreads.o: ../../../winix/templates/htmltextstream.h showthreads.o: ../../../pikotools/space/spacetojson.h -showthreads.o: ../../../winix/core/session.h ../../../winix/core/user.h -showthreads.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h -showthreads.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h -showthreads.o: ../../../winix/templates/locale.h +showthreads.o: ../../../ezc/src/outstreams.h ../../../winix/core/session.h +showthreads.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h +showthreads.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h +showthreads.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h showthreads.o: ../../../winix/core/request.h ../../../winix/core/config.h showthreads.o: ../../../winix/core/system.h ../../../winix/core/job.h showthreads.o: ../../../winix/core/basethread.h ../../../winix/core/synchro.h @@ -435,10 +437,11 @@ templates.o: ../../../winix/core/error.h ../../../winix/core/config.h templates.o: ../../../winix/core/htmlfilter.h templates.o: ../../../winix/templates/htmltextstream.h templates.o: ../../../pikotools/space/spacetojson.h -templates.o: ../../../winix/core/session.h ../../../winix/core/user.h -templates.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h -templates.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h -templates.o: ../../../winix/templates/locale.h ../../../winix/notify/notify.h +templates.o: ../../../ezc/src/outstreams.h ../../../winix/core/session.h +templates.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h +templates.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h +templates.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h +templates.o: ../../../winix/notify/notify.h templates.o: ../../../winix/notify/notifypool.h templates.o: ../../../winix/templates/patterns.h templates.o: ../../../winix/templates/locale.h @@ -541,10 +544,10 @@ threadinfo.o: ../../../winix/core/request.h ../../../winix/core/error.h threadinfo.o: ../../../winix/core/config.h ../../../winix/core/htmlfilter.h threadinfo.o: ../../../winix/templates/htmltextstream.h threadinfo.o: ../../../pikotools/space/spacetojson.h -threadinfo.o: ../../../winix/core/session.h ../../../winix/core/user.h -threadinfo.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h -threadinfo.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h -threadinfo.o: ../../../winix/templates/locale.h +threadinfo.o: ../../../ezc/src/outstreams.h ../../../winix/core/session.h +threadinfo.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h +threadinfo.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h +threadinfo.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h threadinfo.o: ../../../winix/notify/notify.h threadinfo.o: ../../../winix/notify/notifypool.h threadinfo.o: ../../../winix/templates/patterns.h diff --git a/plugins/ticket/Makefile.dep b/plugins/ticket/Makefile.dep index 0818893..6f36f8f 100644 --- a/plugins/ticket/Makefile.dep +++ b/plugins/ticket/Makefile.dep @@ -24,10 +24,10 @@ createticket.o: ../../../winix/core/htmlfilter.h createticket.o: ../../../winix/templates/htmltextstream.h createticket.o: ../../../winix/core/textstream.h createticket.o: ../../../pikotools/space/spacetojson.h -createticket.o: ../../../winix/core/session.h ../../../winix/core/user.h -createticket.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h -createticket.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h -createticket.o: ../../../winix/templates/locale.h +createticket.o: ../../../ezc/src/outstreams.h ../../../winix/core/session.h +createticket.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h +createticket.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h +createticket.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h createticket.o: ../../../winix/core/system.h ../../../winix/core/job.h createticket.o: ../../../winix/core/basethread.h createticket.o: ../../../winix/core/synchro.h ../../../winix/core/dirs.h @@ -155,12 +155,12 @@ editticket.o: ../../../winix/core/request.h ../../../winix/core/error.h editticket.o: ../../../winix/core/config.h ../../../winix/core/htmlfilter.h editticket.o: ../../../winix/templates/htmltextstream.h editticket.o: ../../../pikotools/space/spacetojson.h -editticket.o: ../../../winix/core/session.h ../../../winix/core/user.h -editticket.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h -editticket.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h -editticket.o: ../../../winix/templates/locale.h ../../../winix/core/request.h -editticket.o: ../../../winix/core/config.h ../../../winix/core/synchro.h -editticket.o: ../../../winix/notify/notify.h +editticket.o: ../../../ezc/src/outstreams.h ../../../winix/core/session.h +editticket.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h +editticket.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h +editticket.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h +editticket.o: ../../../winix/core/request.h ../../../winix/core/config.h +editticket.o: ../../../winix/core/synchro.h ../../../winix/notify/notify.h editticket.o: ../../../winix/notify/notifypool.h editticket.o: ../../../winix/templates/patterns.h editticket.o: ../../../winix/templates/locale.h @@ -264,12 +264,12 @@ funticket.o: ../../../winix/core/error.h ../../../winix/core/config.h funticket.o: ../../../winix/core/htmlfilter.h funticket.o: ../../../winix/templates/htmltextstream.h funticket.o: ../../../pikotools/space/spacetojson.h -funticket.o: ../../../winix/core/session.h ../../../winix/core/user.h -funticket.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h -funticket.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h -funticket.o: ../../../winix/templates/locale.h ../../../winix/core/request.h -funticket.o: ../../../winix/core/config.h ../../../winix/core/synchro.h -funticket.o: ../../../winix/notify/notify.h +funticket.o: ../../../ezc/src/outstreams.h ../../../winix/core/session.h +funticket.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h +funticket.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h +funticket.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h +funticket.o: ../../../winix/core/request.h ../../../winix/core/config.h +funticket.o: ../../../winix/core/synchro.h ../../../winix/notify/notify.h funticket.o: ../../../winix/notify/notifypool.h funticket.o: ../../../winix/templates/patterns.h funticket.o: ../../../winix/templates/locale.h @@ -365,13 +365,13 @@ init.o: ../../../winix/core/cur.h ../../../winix/core/request.h init.o: ../../../winix/core/error.h ../../../winix/core/config.h init.o: ../../../winix/core/htmlfilter.h init.o: ../../../winix/templates/htmltextstream.h -init.o: ../../../pikotools/space/spacetojson.h ../../../winix/core/session.h -init.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h -init.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h -init.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h -init.o: ../../../winix/core/request.h ../../../winix/core/config.h -init.o: ../../../winix/core/synchro.h ../../../winix/notify/notify.h -init.o: ../../../winix/notify/notifypool.h +init.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h +init.o: ../../../winix/core/session.h ../../../winix/core/user.h +init.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h +init.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h +init.o: ../../../winix/templates/locale.h ../../../winix/core/request.h +init.o: ../../../winix/core/config.h ../../../winix/core/synchro.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/blocks.h @@ -467,10 +467,10 @@ showtickets.o: ../../../winix/core/request.h ../../../winix/core/error.h showtickets.o: ../../../winix/core/config.h ../../../winix/core/htmlfilter.h showtickets.o: ../../../winix/templates/htmltextstream.h showtickets.o: ../../../pikotools/space/spacetojson.h -showtickets.o: ../../../winix/core/session.h ../../../winix/core/user.h -showtickets.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h -showtickets.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h -showtickets.o: ../../../winix/templates/locale.h +showtickets.o: ../../../ezc/src/outstreams.h ../../../winix/core/session.h +showtickets.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h +showtickets.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h +showtickets.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h showtickets.o: ../../../winix/core/request.h ../../../winix/core/config.h showtickets.o: ../../../winix/core/synchro.h ../../../winix/notify/notify.h showtickets.o: ../../../winix/notify/notifypool.h @@ -558,9 +558,9 @@ templates.o: ../../../pikotools/textstream/types.h templates.o: ../../../pikotools/date/date.h ../../../ezc/src/cache.h templates.o: ../../../ezc/src/functions.h ../../../pikotools/utf8/utf8.h templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h -templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h -templates.o: ticketinfo.h ticket.h ../../../winix/core/item.h -templates.o: ../../../winix/core/system.h +templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h +templates.o: ../../../ezc/src/patternparser.h ticketinfo.h ticket.h +templates.o: ../../../winix/core/item.h ../../../winix/core/system.h templates.o: ../../../winix/functions/functions.h templates.o: ../../../winix/functions/functionbase.h ../../../winix/db/db.h templates.o: ../../../winix/db/dbbase.h ../../../winix/db/dbconn.h @@ -693,12 +693,12 @@ ticketinfo.o: ../../../winix/core/request.h ../../../winix/core/error.h ticketinfo.o: ../../../winix/core/config.h ../../../winix/core/htmlfilter.h ticketinfo.o: ../../../winix/templates/htmltextstream.h ticketinfo.o: ../../../pikotools/space/spacetojson.h -ticketinfo.o: ../../../winix/core/session.h ../../../winix/core/user.h -ticketinfo.o: ../../../winix/core/plugindata.h ../../../winix/core/rebus.h -ticketinfo.o: ../../../winix/core/ipban.h ../../../winix/core/mount.h -ticketinfo.o: ../../../winix/templates/locale.h ../../../winix/core/request.h -ticketinfo.o: ../../../winix/core/config.h ../../../winix/core/synchro.h -ticketinfo.o: ../../../winix/notify/notify.h +ticketinfo.o: ../../../ezc/src/outstreams.h ../../../winix/core/session.h +ticketinfo.o: ../../../winix/core/user.h ../../../winix/core/plugindata.h +ticketinfo.o: ../../../winix/core/rebus.h ../../../winix/core/ipban.h +ticketinfo.o: ../../../winix/core/mount.h ../../../winix/templates/locale.h +ticketinfo.o: ../../../winix/core/request.h ../../../winix/core/config.h +ticketinfo.o: ../../../winix/core/synchro.h ../../../winix/notify/notify.h ticketinfo.o: ../../../winix/notify/notifypool.h ticketinfo.o: ../../../winix/templates/patterns.h ticketinfo.o: ../../../winix/templates/locale.h diff --git a/templates/Makefile.dep b/templates/Makefile.dep index ed501b7..825c488 100644 --- a/templates/Makefile.dep +++ b/templates/Makefile.dep @@ -4,9 +4,10 @@ adduser.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h adduser.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h adduser.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h adduser.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -adduser.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -adduser.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -adduser.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +adduser.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 @@ -67,15 +68,19 @@ changepatterns.o: ../../ezc/src/blocks.h ../../ezc/src/item.h changepatterns.o: ../../ezc/src/cache.h ../../ezc/src/functions.h changepatterns.o: ../../pikotools/utf8/utf8.h ../../ezc/src/funinfo.h changepatterns.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h -changepatterns.o: ../../ezc/src/patternparser.h misc.h htmltextstream.h -changepatterns.o: ../../winix/core/textstream.h +changepatterns.o: ../../ezc/src/outstreams.h ../../ezc/src/patternparser.h +changepatterns.o: misc.h htmltextstream.h ../../winix/core/textstream.h +changepatterns.o: ../../winix/core/log.h ../../winix/core/textstream.h +changepatterns.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h +changepatterns.o: ../../winix/core/cur.h ../../winix/templates/locale.h config.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h config.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h config.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h config.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -config.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -config.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -config.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +config.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 @@ -124,7 +129,8 @@ currentdate.o: ../../ezc/src/blocks.h ../../ezc/src/item.h currentdate.o: ../../ezc/src/cache.h ../../ezc/src/functions.h currentdate.o: ../../pikotools/utf8/utf8.h ../../ezc/src/funinfo.h currentdate.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h -currentdate.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h +currentdate.o: ../../ezc/src/outstreams.h ../../ezc/src/patternparser.h +currentdate.o: misc.h localefilter.h locale.h currentdate.o: ../../pikotools/space/spaceparser.h currentdate.o: ../../pikotools/space/space.h currentdate.o: ../../pikotools/textstream/types.h @@ -207,9 +213,10 @@ dir.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h dir.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h dir.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h dir.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -dir.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -dir.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -dir.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +dir.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 dir.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h dir.o: ../../pikotools/convert/inttostr.h @@ -278,9 +285,10 @@ doc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h doc.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h doc.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h doc.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -doc.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -doc.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -doc.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +doc.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 doc.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h doc.o: ../../pikotools/convert/inttostr.h @@ -327,9 +335,10 @@ env.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h env.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h env.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h env.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -env.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -env.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -env.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +env.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 env.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h env.o: ../../pikotools/convert/inttostr.h @@ -393,14 +402,15 @@ env.o: ../../winix/functions/specialdefault.h ../../winix/functions/stat.h env.o: ../../winix/functions/subject.h ../../winix/functions/template.h env.o: ../../winix/functions/tinymce.h ../../winix/functions/uname.h env.o: ../../winix/functions/upload.h ../../winix/functions/uptime.h -env.o: ../../winix/functions/who.h ../../winix/functions/vim.h +env.o: ../../winix/functions/who.h ../../winix/functions/vim.h miscspace.h filters.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h filters.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h filters.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h filters.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -filters.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -filters.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -filters.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +filters.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 @@ -450,9 +460,10 @@ generic.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h generic.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h generic.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h generic.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -generic.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -generic.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -generic.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +generic.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.h +generic.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h +generic.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h +generic.o: ../../pikotools/textstream/types.h generic.o: ../../pikotools/textstream/textstream.h generic.o: ../../pikotools/space/space.h ../../pikotools/date/date.h generic.o: ../../pikotools/convert/convert.h @@ -513,14 +524,16 @@ htmltextstream.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h htmltextstream.o: ../../ezc/src/item.h ../../ezc/src/cache.h htmltextstream.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h htmltextstream.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -htmltextstream.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h +htmltextstream.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.h +htmltextstream.o: ../../ezc/src/patternparser.h indexpatterns.o: indexpatterns.h ../../ezc/src/ezc.h indexpatterns.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h indexpatterns.o: ../../ezc/src/item.h ../../ezc/src/cache.h indexpatterns.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h indexpatterns.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -indexpatterns.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h -indexpatterns.o: patterns.h locale.h ../../pikotools/space/spaceparser.h +indexpatterns.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 indexpatterns.o: ../../pikotools/textstream/textstream.h @@ -537,9 +550,10 @@ insert.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h insert.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h insert.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h insert.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -insert.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -insert.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -insert.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +insert.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 @@ -589,9 +603,10 @@ ipban.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h ipban.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h ipban.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h ipban.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -ipban.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -ipban.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -ipban.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +ipban.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 ipban.o: ../../pikotools/space/space.h ../../pikotools/date/date.h ipban.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h @@ -663,9 +678,10 @@ item.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h item.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h item.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h item.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -item.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -item.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -item.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +item.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 item.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h item.o: ../../pikotools/convert/inttostr.h @@ -713,9 +729,10 @@ last.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h last.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h last.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h last.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -last.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -last.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -last.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +last.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 last.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h last.o: ../../pikotools/convert/inttostr.h @@ -784,16 +801,18 @@ localefilter.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h localefilter.o: ../../ezc/src/item.h ../../ezc/src/cache.h localefilter.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h localefilter.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -localefilter.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h -localefilter.o: ../core/misc.h ../../winix/core/requesttypes.h +localefilter.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h login.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h login.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -login.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -login.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -login.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +login.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 login.o: ../../pikotools/space/space.h ../../pikotools/date/date.h login.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h @@ -864,9 +883,9 @@ ls.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h ls.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h ls.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h ls.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.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: ../../ezc/src/outstreams.h ../../ezc/src/patternparser.h misc.h +ls.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h +ls.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h ls.o: ../../pikotools/textstream/textstream.h ../../pikotools/space/space.h ls.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h ls.o: ../../pikotools/convert/inttostr.h @@ -912,9 +931,10 @@ man.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h man.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h man.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h man.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -man.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -man.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -man.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +man.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 man.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h man.o: ../../pikotools/convert/inttostr.h @@ -983,9 +1003,10 @@ misc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h misc.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h misc.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h misc.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -misc.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -misc.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -misc.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +misc.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 misc.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h misc.o: ../../pikotools/convert/inttostr.h @@ -1033,8 +1054,8 @@ miscspace.o: ../../ezc/src/blocks.h ../../ezc/src/item.h miscspace.o: ../../ezc/src/cache.h ../../ezc/src/functions.h miscspace.o: ../../pikotools/utf8/utf8.h ../../ezc/src/funinfo.h miscspace.o: ../../ezc/src/objects.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: ../../ezc/src/outstreams.h ../../ezc/src/patternparser.h misc.h +miscspace.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h miscspace.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h miscspace.o: ../../pikotools/textstream/textstream.h miscspace.o: ../../pikotools/space/space.h ../../pikotools/date/date.h @@ -1084,9 +1105,10 @@ mount.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h mount.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h mount.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h mount.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -mount.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -mount.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -mount.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +mount.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 mount.o: ../../pikotools/space/space.h ../../pikotools/date/date.h mount.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h @@ -1136,9 +1158,10 @@ passwd.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h passwd.o: ../../ezc/src/item.h ../../ezc/src/cache.h passwd.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h passwd.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -passwd.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -passwd.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -passwd.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +passwd.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.h +passwd.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h +passwd.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h +passwd.o: ../../pikotools/textstream/types.h passwd.o: ../../pikotools/textstream/textstream.h passwd.o: ../../pikotools/space/space.h ../../pikotools/date/date.h passwd.o: ../../pikotools/convert/convert.h @@ -1197,9 +1220,10 @@ patterncacher.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h patterncacher.o: ../../ezc/src/item.h ../../ezc/src/cache.h patterncacher.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h patterncacher.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -patterncacher.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h -patterncacher.o: htmltextstream.h ../../winix/core/textstream.h -patterncacher.o: ../../winix/core/log.h ../../winix/core/textstream.h +patterncacher.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 patterncacher.o: ../../winix/core/cur.h ../../winix/templates/locale.h patterns.o: patterns.h locale.h ../../pikotools/space/spaceparser.h @@ -1214,18 +1238,20 @@ patterns.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h patterns.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h patterns.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h patterns.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -patterns.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -patterns.o: htmltextstream.h ../../winix/core/textstream.h -patterns.o: ../../winix/core/log.h ../../winix/core/textstream.h -patterns.o: ../../winix/core/logmanipulators.h ../../winix/core/slog.h -patterns.o: ../../winix/core/cur.h ../../winix/templates/locale.h +patterns.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h priv.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h priv.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -priv.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -priv.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -priv.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +priv.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 priv.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h priv.o: ../../pikotools/convert/inttostr.h @@ -1296,9 +1322,9 @@ rebus.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h rebus.o: ../../ezc/src/item.h ../../ezc/src/cache.h ../../ezc/src/functions.h rebus.o: ../../pikotools/utf8/utf8.h ../../ezc/src/funinfo.h rebus.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h -rebus.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -rebus.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -rebus.o: ../../pikotools/textstream/types.h +rebus.o: ../../ezc/src/outstreams.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 @@ -1345,9 +1371,10 @@ server.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h server.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h server.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h server.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -server.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -server.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -server.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +server.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.h +server.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h +server.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h +server.o: ../../pikotools/textstream/types.h server.o: ../../pikotools/textstream/textstream.h server.o: ../../pikotools/space/space.h ../../pikotools/date/date.h server.o: ../../pikotools/convert/convert.h @@ -1426,15 +1453,16 @@ slog.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h ../../ezc/src/item.h slog.o: ../../ezc/src/cache.h ../../ezc/src/functions.h slog.o: ../../pikotools/utf8/utf8.h ../../ezc/src/funinfo.h slog.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h -slog.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h -slog.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -slog.o: ../../pikotools/textstream/types.h htmltextstream.h -slog.o: ../../winix/core/textstream.h patterncacher.h ../../winix/core/item.h -slog.o: indexpatterns.h patterns.h changepatterns.h ../../winix/core/config.h -slog.o: ../../winix/core/htmlfilter.h ../../winix/core/cur.h -slog.o: ../../winix/core/request.h ../../winix/core/requesttypes.h -slog.o: ../../winix/core/error.h ../../winix/core/config.h -slog.o: ../../winix/core/textstream.h ../../winix/templates/htmltextstream.h +slog.o: ../../ezc/src/outstreams.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 @@ -1467,9 +1495,10 @@ stat.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h stat.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h stat.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h stat.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -stat.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -stat.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -stat.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +stat.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 stat.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h stat.o: ../../pikotools/convert/inttostr.h @@ -1516,9 +1545,10 @@ sys.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h sys.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h sys.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h sys.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -sys.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -sys.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -sys.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +sys.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 sys.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h sys.o: ../../pikotools/convert/inttostr.h @@ -1589,9 +1619,10 @@ template.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h template.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h template.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h template.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -template.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -template.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -template.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +template.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 @@ -1642,8 +1673,8 @@ templates.o: ../../ezc/src/blocks.h ../../ezc/src/item.h templates.o: ../../ezc/src/cache.h ../../ezc/src/functions.h templates.o: ../../pikotools/utf8/utf8.h ../../ezc/src/funinfo.h templates.o: ../../ezc/src/objects.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: ../../ezc/src/outstreams.h ../../ezc/src/patternparser.h misc.h +templates.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h templates.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h templates.o: ../../pikotools/textstream/textstream.h templates.o: ../../pikotools/space/space.h ../../pikotools/date/date.h @@ -1732,16 +1763,17 @@ textextstream.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h textextstream.o: ../../ezc/src/item.h ../../ezc/src/cache.h textextstream.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h textextstream.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -textextstream.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h -textextstream.o: htmltextstream.h +textextstream.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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/blocks.h upload.o: ../../ezc/src/item.h ../../ezc/src/cache.h upload.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h upload.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -upload.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -upload.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -upload.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +upload.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.h +upload.o: ../../ezc/src/patternparser.h misc.h localefilter.h locale.h +upload.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h +upload.o: ../../pikotools/textstream/types.h upload.o: ../../pikotools/textstream/textstream.h upload.o: ../../pikotools/space/space.h ../../pikotools/date/date.h upload.o: ../../pikotools/convert/convert.h @@ -1789,9 +1821,10 @@ uptime.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h uptime.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h uptime.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h uptime.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -uptime.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -uptime.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -uptime.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +uptime.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 @@ -1839,9 +1872,10 @@ user.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h user.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h user.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h user.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -user.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -user.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -user.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +user.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 user.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h user.o: ../../pikotools/convert/inttostr.h @@ -1888,9 +1922,10 @@ who.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h who.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h who.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h who.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -who.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -who.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -who.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +who.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 who.o: ../../pikotools/date/date.h ../../pikotools/convert/convert.h who.o: ../../pikotools/convert/inttostr.h @@ -1937,9 +1972,10 @@ winix.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h winix.o: ../../ezc/src/blocks.h ../../ezc/src/item.h ../../ezc/src/cache.h winix.o: ../../ezc/src/functions.h ../../pikotools/utf8/utf8.h winix.o: ../../ezc/src/funinfo.h ../../ezc/src/objects.h -winix.o: ../../ezc/src/pattern.h ../../ezc/src/patternparser.h misc.h -winix.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h -winix.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h +winix.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.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 winix.o: ../../pikotools/space/space.h ../../pikotools/date/date.h winix.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h diff --git a/templates/changepatterns.cpp b/templates/changepatterns.cpp index 715e790..17ffcc1 100644 --- a/templates/changepatterns.cpp +++ b/templates/changepatterns.cpp @@ -33,6 +33,7 @@ */ #include "changepatterns.h" +#include "core/log.h" namespace Winix { diff --git a/templates/env.cpp b/templates/env.cpp index c566287..1e135f8 100644 --- a/templates/env.cpp +++ b/templates/env.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2012-2014, Tomasz Sowa + * Copyright (c) 2012-2015, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,6 +35,8 @@ #include "templates.h" #include "core/misc.h" #include "functions/functions.h" +#include "miscspace.h" + namespace Winix { @@ -44,6 +46,110 @@ namespace TemplatesFunctions { + +void env_str(Info & i) +{ + User * puser = cur->session->puser; + + if( puser ) + puser->env.Serialize(i.out, true, false); +} + + +void env(Info & i) +{ + User * puser = cur->session->puser; + + if( puser ) + space(i, puser->env); +} + + +void env_tab(Info & i) +{ + User * puser = cur->session->puser; + + if( puser ) + spaces_tab(i, puser->env); +} + + +void env_tab_value(Info & i) +{ + User * puser = cur->session->puser; + + if( puser ) + spaces_tab_value(i, puser->env); +} + + + +void env_tab_has_next(Info & i) +{ + User * puser = cur->session->puser; + + if( puser ) + spaces_tab_has_next(i, puser->env); +} + + + + + + + + + +void env_admin_str(Info & i) +{ + User * puser = cur->session->puser; + + if( puser ) + puser->aenv.Serialize(i.out, true, false); +} + + +void env_admin(Info & i) +{ + User * puser = cur->session->puser; + + if( puser ) + space(i, puser->aenv); +} + + +void env_admin_tab(Info & i) +{ + User * puser = cur->session->puser; + + if( puser ) + spaces_tab(i, puser->aenv); +} + + +void env_admin_tab_value(Info & i) +{ + User * puser = cur->session->puser; + + if( puser ) + spaces_tab_value(i, puser->aenv); +} + + + +void env_admin_tab_has_next(Info & i) +{ + User * puser = cur->session->puser; + + if( puser ) + spaces_tab_has_next(i, puser->aenv); +} + + + + + + void env_user_admin_env_str(Info & i) { // only an admin is able to see this variables diff --git a/templates/htmltextstream.cpp b/templates/htmltextstream.cpp index 895ccd1..f7207d9 100644 --- a/templates/htmltextstream.cpp +++ b/templates/htmltextstream.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2014, Tomasz Sowa + * Copyright (c) 2010-2015, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -45,6 +45,12 @@ HtmlTextStream::HtmlTextStream() } +void HtmlTextStream::Clear() +{ + escape = true; + TextStream::Clear(); +} + /* diff --git a/templates/htmltextstream.h b/templates/htmltextstream.h index 9de428e..d92291e 100644 --- a/templates/htmltextstream.h +++ b/templates/htmltextstream.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2014, Tomasz Sowa + * Copyright (c) 2010-2015, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -81,6 +81,12 @@ public: HtmlTextStream(); + /* + * clearing the buffer and setting 'escape' flag to true + */ + void Clear(); + + /* a helper struct to select a proper operator<< (for non-escaping versions of these operators) diff --git a/templates/item.cpp b/templates/item.cpp index cb21427..73c9575 100644 --- a/templates/item.cpp +++ b/templates/item.cpp @@ -334,7 +334,11 @@ void item_run(Info & i) item_run_content.Clear(); InitGenerator(ezc_generator); ezc_generator.SetPattern(*p); - ezc_generator.Generate(item_run_content); + + if( config->allow_ezc_out_in_executable_items ) + ezc_generator.Generate(item_run_content, cur->request->out_streams); + else + ezc_generator.Generate(item_run_content); item_print_content(i.out, item_run_content.Str(), cur->request->item.content_type); } @@ -729,7 +733,12 @@ void item_tab_run(Info & i) item_run_content.Clear(); InitGenerator(ezc_generator); ezc_generator.SetPattern(*p); - ezc_generator.Generate(item_run_content); + + if( config->allow_ezc_out_in_executable_items ) + ezc_generator.Generate(item_run_content, cur->request->out_streams); + else + 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/templates.cpp b/templates/templates.cpp index 852916b..9da0e21 100644 --- a/templates/templates.cpp +++ b/templates/templates.cpp @@ -161,7 +161,7 @@ Ezc::Pattern * p = 0; { InitGenerator(content_gen); content_gen.SetPattern(*p); - content_gen.Generate(i.out); + content_gen.Generate(i.out, cur->request->out_streams); } else { @@ -299,17 +299,28 @@ void Templates::CreateFunctions() ezc_functions.Insert("doc_css_is_one", doc_css_is_one); ezc_functions.Insert("doc_css_more_than_one", doc_css_more_than_one); + /* env */ - ezc_functions.Insert("env_user_admin_env_str", env_user_admin_env_str); - ezc_functions.Insert("env_user_env_str", env_user_env_str); - ezc_functions.Insert("env_user_id", env_user_id); - ezc_functions.Insert("env_user_name", env_user_name); - ezc_functions.Insert("env_user_tab", env_user_tab); - ezc_functions.Insert("env_user_tab_id", env_user_tab_id); - ezc_functions.Insert("env_user_tab_name", env_user_tab_name); - ezc_functions.Insert("env_user_tab_is_current", env_user_tab_is_current); + ezc_functions.Insert("env_str", env_str); + ezc_functions.Insert("env", env); + ezc_functions.Insert("env_tab", env_tab); + ezc_functions.Insert("env_tab_value", env_tab_value); + ezc_functions.Insert("env_tab_has_next", env_tab_has_next); + ezc_functions.Insert("env_admin_str", env_admin_str); + ezc_functions.Insert("env_admin", env_admin); + ezc_functions.Insert("env_admin_tab", env_admin_tab); + ezc_functions.Insert("env_admin_tab_value", env_admin_tab_value); + ezc_functions.Insert("env_admin_tab_has_next", env_admin_tab_has_next); + ezc_functions.Insert("env_user_admin_env_str", env_user_admin_env_str); + ezc_functions.Insert("env_user_env_str", env_user_env_str); + ezc_functions.Insert("env_user_id", env_user_id); + ezc_functions.Insert("env_user_name", env_user_name); + ezc_functions.Insert("env_user_tab", env_user_tab); + ezc_functions.Insert("env_user_tab_id", env_user_tab_id); + ezc_functions.Insert("env_user_tab_name", env_user_tab_name); + ezc_functions.Insert("env_user_tab_is_current", env_user_tab_is_current); /* @@ -1049,7 +1060,7 @@ using namespace TemplatesFunctions; { InitGenerator(generator); generator.SetPattern(*index); - generator.Generate(cur->request->out_streams); + generator.Generate(cur->request->out_main_stream, cur->request->out_streams); } else { @@ -1067,11 +1078,7 @@ using namespace TemplatesFunctions; 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, s); + Info info(cur->request->out_main_stream, empty_pars, empty_string, empty_stream, s); info.iter = s.iter; info.res = false; @@ -1086,7 +1093,7 @@ using namespace TemplatesFunctions; InitGenerator(generator); generator.SetPattern(pattern); - generator.Generate(cur->request->out_streams); + generator.Generate(cur->request->out_main_stream, cur->request->out_streams); } diff --git a/templates/templates.h b/templates/templates.h index 6087dab..6be781e 100644 --- a/templates/templates.h +++ b/templates/templates.h @@ -214,6 +214,16 @@ namespace TemplatesFunctions /* env */ + void env_str(Info & i); + void env(Info & i); + void env_tab(Info & i); + void env_tab_value(Info & i); + void env_tab_has_next(Info & i); + void env_admin_str(Info & i); + void env_admin(Info & i); + void env_admin_tab(Info & i); + void env_admin_tab_value(Info & i); + void env_admin_tab_has_next(Info & i); void env_user_admin_env_str(Info & i); void env_user_env_str(Info & i); void env_user_id(Info & i);