tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

updated to the new Ezc API

Browse Source 
[ezc stream] has gone, now we have [ezc out] and [out]
the output streams have names now: it's a std::map, before we have a std::vector
and the streams are serialized to "out" space in json
Request::out_streams[] are split into Request::out_main_stream and Request::out_streams class



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1017 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2015-11-15 22:23:36 +00:00
parent 632b49ab90
commit c433b3fd41
27 changed files with 1123 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/Makefile.dep
+204 -192
View File
@@ -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
core/app.cpp
+37 -19
View File
@@ -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 ; i<req.out_streams.size() ; ++i)
auto i = req.out_streams.streams_map.begin();
bool is_first = true;
for( ; i != req.out_streams.streams_map.end() ; ++i)
{
json_out_stream << L"\"stream_" << i << L"\": \"";
JSONescape(json_out_stream, req.out_streams[i].Str());
json_out_stream << L"\",\n";
if( !is_first )
{
json_out_stream << L",\n";
}
json_out_stream << L"\"";
JSONescape(json_out_stream, i->first);
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 ; i<end ; ++i)
if( filter_main_stream )
{
if( req.use_html_filter[i] )
// !! IMPROVE ME may some kind of html_filtered.reserve() here? (optimization)
TemplatesFunctions::html_filter.Filter(req.out_main_stream.Str(), html_filtered);
req.out_main_stream.Str(std::move(html_filtered)); // !! IMPROVE ME we do not have Str(&&) method
}
if( filter_json )
{
for(auto i = req.out_streams.streams_map.begin() ; i != req.out_streams.streams_map.end() ; ++i)
{
HtmlTextStream & stream = *i->second;
// !! 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);
core/config.cpp
+2 -2
View File
@@ -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"<!-- ");
ezc_error_postfix = Text(L"ezc_error_postfix", 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);
}
core/config.h
+7 -1
View File
@@ -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();
core/request.cpp
+12 -17
View File
@@ -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.size() ; ++i)
{
out_streams[i].Clear();
out_streams[i].Escape(true);
use_html_filter[i] = true;
}
/*
* clearing buffers and setting 'escape' flag to true
* for all streams which were used in the map
*/
out_streams.ClearMap();
out_streams.ResizeTab(len);
out_main_stream_use_html_filter = true;
out_streams_use_html_filter = true;
}
core/request.h
+30 -28
View File
@@ -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
@@ -48,6 +48,7 @@
#include "space/space.h"
#include "space/spacetojson.h"
#include "textstream/textstream.h"
#include "outstreams.h"
namespace Winix
@@ -234,21 +235,21 @@ struct Request
// | |
// normal request ajax request
// | |
// sending out_streams[0] |
// sending out_main_stream |
// |
// |
// depending on return_info_only
// (if false) ------------------------------------------------------ (if true)
// | |
// generating JSON object from: generating JSON object only from info
// out_streams and info, e.g.: e.g.:
// { { info object serialized here }
// "stream_1": "some html content",
// "stream_2": "some other html content",
// "info": { info object serialized here }
// }
// note that out_streams[0] is not sent
// in JSON answers
// (if false) ------------------------------------------------------------- (if true)
// | |
// generating JSON object from: generating JSON object only from info
// out_streams and info, e.g.: e.g.:
// { { info object serialized here }
// "out": { out_streams serialized here e.g.:
// "stream_name_1": "some html content",
// "stream_name_2": "some other html content"
// },
// "info": { info object serialized here }
// }
//
//
bool send_bin_stream;
@@ -258,9 +259,9 @@ struct Request
// when returning the text answer we can either return the whole html page (normal requests)
// or a JSON object (for requests generated from AJAX)
// if return_json is false then we return the whole html page (which is in out_streams[0])
// if return_json is false then we return the whole html page (which is in out_main_stream)
// if return_json is true we are creating an JSON object from out_streams
// (zero stream is ignored) and from info space (see above picture)
// and from info space (see above picture)
// (or just only from info if return_info_only is true)
// default: false
// return_json is set to true by App at the beginning of a request
@@ -268,13 +269,14 @@ struct Request
// note: return_json is only valid if send_bin_stream is false
bool return_json;
// main text output streams where the html otput is generated from ezc templates
// the zero stream (out_streams[0]) is used as the main stream
// to which the whole html page (with doctype, head, body) is generated
// the rest streams can be only used in ajax requests (send in JSON format to the client)
// in ezc templates you can use [ezc stream ...] keyword
// to switch between streams e.g. [ezc stream "0" "2"]
std::vector<HtmlTextStream> 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<HtmlTextStream> 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<bool> 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