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

268
templates/Makefile.dep
View File

@@ -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

1
templates/changepatterns.cpp
View File

@@ -33,6 +33,7 @@
*/
#include "changepatterns.h"
#include "core/log.h"
namespace Winix
{

108
templates/env.cpp
View File

@@ -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

8
templates/htmltextstream.cpp
View File

@@ -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<std::wstring>::Clear();
}
/*

8
templates/htmltextstream.h
View File

@@ -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)

13
templates/item.cpp
View File

@@ -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

39
templates/templates.cpp
View File

@@ -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);
}

10
templates/templates.h
View File

@@ -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);