updated to the new Pikotools API

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1071 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa 2018-01-06 18:12:53 +00:00
parent 3eff400d88
commit ccf78dcb02
48 changed files with 766 additions and 390 deletions

View File

@ -72,7 +72,7 @@ winix.so: $(winix.src.files)
@cd $(GLOBAL_WORKING_DIR)/ezc/src ; $(MAKE) -e
@cd $(GLOBAL_WORKING_DIR)/tito/src ; $(MAKE) -e
@cd $(GLOBAL_WORKING_DIR)/pikotools ; $(MAKE) -e
$(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) $(winix_include_paths) core/*.o db/*.o functions/*.o templates/*.o notify/*.o $(GLOBAL_WORKING_DIR)/ezc/src/ezc.a $(GLOBAL_WORKING_DIR)/tito/src/tito.a $(GLOBAL_WORKING_DIR)/pikotools/utf8/utf8.a $(GLOBAL_WORKING_DIR)/pikotools/space/space.a $(GLOBAL_WORKING_DIR)/pikotools/mainparser/mainparser.a $(GLOBAL_WORKING_DIR)/pikotools/date/date.a $(LDFLAGS) -lfcgi -lpq -lz -lpthread -lcurl -Wl,-no-whole-archive
$(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) $(winix_include_paths) core/*.o db/*.o functions/*.o templates/*.o notify/*.o $(GLOBAL_WORKING_DIR)/ezc/src/ezc.a $(GLOBAL_WORKING_DIR)/tito/src/tito.a $(GLOBAL_WORKING_DIR)/pikotools/convert/convert.a $(GLOBAL_WORKING_DIR)/pikotools/utf8/utf8.a $(GLOBAL_WORKING_DIR)/pikotools/space/space.a $(GLOBAL_WORKING_DIR)/pikotools/mainparser/mainparser.a $(GLOBAL_WORKING_DIR)/pikotools/date/date.a $(LDFLAGS) -lfcgi -lpq -lz -lpthread -lcurl -Wl,-no-whole-archive
winix: winix.so $(winix.src.files)

File diff suppressed because one or more lines are too long

View File

@ -7,6 +7,8 @@ acceptbaseparser.o: ../../../pikotools/date/date.h requesttypes.h
acceptbaseparser.o: ../../../pikotools/textstream/textstream.h
acceptbaseparser.o: ../../../pikotools/convert/convert.h
acceptbaseparser.o: ../../../pikotools/convert/inttostr.h
acceptbaseparser.o: ../../../pikotools/convert/strtoint.h
acceptbaseparser.o: ../../../pikotools/convert/text.h
acceptbaseparser.o: ../../../pikotools/membuffer/membuffer.h
acceptbaseparser.o: ../../../pikotools/textstream/types.h
acceptbaseparser.o: ../../../pikotools/utf8/utf8.h winix_const.h
@ -22,6 +24,8 @@ app.o: ../../../winix/winixd/core/textstream.h misc.h requesttypes.h
app.o: ../../../pikotools/textstream/textstream.h
app.o: ../../../pikotools/convert/convert.h
app.o: ../../../pikotools/convert/inttostr.h
app.o: ../../../pikotools/convert/strtoint.h
app.o: ../../../pikotools/convert/text.h
app.o: ../../../pikotools/membuffer/membuffer.h
app.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
app.o: winix_const.h ../../../winix/winixd/core/error.h
@ -120,14 +124,16 @@ compress.o: ../../../pikotools/textstream/types.h
compress.o: ../../../pikotools/date/date.h
compress.o: ../../../pikotools/convert/convert.h
compress.o: ../../../pikotools/convert/inttostr.h
compress.o: ../../../pikotools/convert/strtoint.h
compress.o: ../../../pikotools/convert/text.h misc.h item.h
compress.o: ../../../pikotools/utf8/utf8.h winix_const.h
compress.o: ../../../pikotools/membuffer/membuffer.h
compress.o: ../../../pikotools/textstream/types.h log.h textstream.h
compress.o: logmanipulators.h slog.h cur.h request.h item.h error.h config.h
compress.o: logmanipulators.h slog.h cur.h request.h error.h config.h
compress.o: ../../../pikotools/space/spaceparser.h
compress.o: ../../../pikotools/space/space.h htmlfilter.h
compress.o: ../../../winix/winixd/templates/htmltextstream.h
compress.o: ../../../winix/winixd/core/textstream.h misc.h
compress.o: ../../../pikotools/utf8/utf8.h winix_const.h
compress.o: ../../../winix/winixd/core/textstream.h
compress.o: ../../../pikotools/space/spacetojson.h
compress.o: ../../../ezc/src/outstreams.h session.h user.h plugindata.h
compress.o: rebus.h ipban.h mount.h ../../../winix/winixd/templates/locale.h
@ -139,12 +145,13 @@ config.o: ../../../pikotools/textstream/textstream.h
config.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
config.o: ../../../pikotools/convert/convert.h
config.o: ../../../pikotools/convert/inttostr.h
config.o: ../../../pikotools/convert/strtoint.h
config.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
config.o: ../../../pikotools/utf8/utf8.h winix_const.h
config.o: ../../../pikotools/membuffer/membuffer.h
config.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
config.o: requesttypes.h item.h error.h
config.o: ../../../winix/winixd/templates/htmltextstream.h
config.o: ../../../winix/winixd/core/textstream.h misc.h
config.o: ../../../pikotools/utf8/utf8.h winix_const.h
config.o: error.h ../../../winix/winixd/templates/htmltextstream.h
config.o: ../../../winix/winixd/core/textstream.h
config.o: ../../../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/winixd/templates/locale.h plugin.h
@ -243,11 +250,12 @@ crypt.o: ../../../pikotools/textstream/textstream.h
crypt.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
crypt.o: ../../../pikotools/convert/convert.h
crypt.o: ../../../pikotools/convert/inttostr.h
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
crypt.o: ../../../pikotools/convert/strtoint.h
crypt.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
crypt.o: winix_const.h ../../../pikotools/membuffer/membuffer.h
crypt.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h error.h
crypt.o: ../../../winix/winixd/templates/htmltextstream.h
crypt.o: ../../../winix/winixd/core/textstream.h misc.h winix_const.h
crypt.o: ../../../winix/winixd/core/textstream.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/winixd/templates/locale.h
@ -257,14 +265,15 @@ dircontainer.o: ../../../pikotools/date/date.h log.h textstream.h
dircontainer.o: logmanipulators.h ../../../pikotools/textstream/textstream.h
dircontainer.o: ../../../pikotools/convert/convert.h
dircontainer.o: ../../../pikotools/convert/inttostr.h
dircontainer.o: ../../../pikotools/convert/strtoint.h
dircontainer.o: ../../../pikotools/convert/text.h misc.h requesttypes.h
dircontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h
dircontainer.o: ../../../pikotools/membuffer/membuffer.h
dircontainer.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
dircontainer.o: requesttypes.h error.h config.h
dircontainer.o: ../../../pikotools/space/spaceparser.h
dircontainer.o: error.h config.h ../../../pikotools/space/spaceparser.h
dircontainer.o: ../../../pikotools/space/space.h htmlfilter.h
dircontainer.o: ../../../winix/winixd/templates/htmltextstream.h
dircontainer.o: ../../../winix/winixd/core/textstream.h misc.h
dircontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h
dircontainer.o: ../../../winix/winixd/core/textstream.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
@ -278,6 +287,8 @@ dirs.o: ../../../winix/winixd/core/textstream.h misc.h requesttypes.h
dirs.o: ../../../pikotools/textstream/textstream.h
dirs.o: ../../../pikotools/convert/convert.h
dirs.o: ../../../pikotools/convert/inttostr.h
dirs.o: ../../../pikotools/convert/strtoint.h
dirs.o: ../../../pikotools/convert/text.h
dirs.o: ../../../pikotools/membuffer/membuffer.h
dirs.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
dirs.o: winix_const.h ../../../winix/winixd/core/error.h
@ -318,6 +329,8 @@ groups.o: ../../../pikotools/date/date.h requesttypes.h
groups.o: ../../../pikotools/textstream/textstream.h
groups.o: ../../../pikotools/convert/convert.h
groups.o: ../../../pikotools/convert/inttostr.h
groups.o: ../../../pikotools/convert/strtoint.h
groups.o: ../../../pikotools/convert/text.h
groups.o: ../../../pikotools/membuffer/membuffer.h
groups.o: ../../../pikotools/textstream/types.h
groups.o: ../../../pikotools/utf8/utf8.h winix_const.h
@ -344,6 +357,8 @@ httpsimpleparser.o: ../../../pikotools/date/date.h requesttypes.h
httpsimpleparser.o: ../../../pikotools/textstream/textstream.h
httpsimpleparser.o: ../../../pikotools/convert/convert.h
httpsimpleparser.o: ../../../pikotools/convert/inttostr.h
httpsimpleparser.o: ../../../pikotools/convert/strtoint.h
httpsimpleparser.o: ../../../pikotools/convert/text.h
httpsimpleparser.o: ../../../pikotools/membuffer/membuffer.h
httpsimpleparser.o: ../../../pikotools/textstream/types.h
httpsimpleparser.o: ../../../pikotools/utf8/utf8.h winix_const.h
@ -357,6 +372,8 @@ image.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h
image.o: requesttypes.h ../../../pikotools/textstream/textstream.h
image.o: ../../../pikotools/convert/convert.h
image.o: ../../../pikotools/convert/inttostr.h
image.o: ../../../pikotools/convert/strtoint.h
image.o: ../../../pikotools/convert/text.h
image.o: ../../../pikotools/membuffer/membuffer.h
image.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
image.o: winix_const.h ../../../winix/winixd/core/error.h
@ -456,14 +473,16 @@ ipbancontainer.o: ../../../pikotools/textstream/types.h
ipbancontainer.o: ../../../pikotools/date/date.h
ipbancontainer.o: ../../../pikotools/convert/convert.h
ipbancontainer.o: ../../../pikotools/convert/inttostr.h
ipbancontainer.o: ../../../pikotools/convert/strtoint.h
ipbancontainer.o: ../../../pikotools/convert/text.h misc.h item.h
ipbancontainer.o: requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h
ipbancontainer.o: ../../../pikotools/membuffer/membuffer.h
ipbancontainer.o: ../../../pikotools/textstream/types.h slog.h cur.h
ipbancontainer.o: request.h requesttypes.h item.h error.h config.h
ipbancontainer.o: request.h error.h config.h
ipbancontainer.o: ../../../pikotools/space/spaceparser.h
ipbancontainer.o: ../../../pikotools/space/space.h htmlfilter.h
ipbancontainer.o: ../../../winix/winixd/templates/htmltextstream.h
ipbancontainer.o: ../../../winix/winixd/core/textstream.h misc.h
ipbancontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h
ipbancontainer.o: ../../../winix/winixd/core/textstream.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/winixd/templates/locale.h
@ -472,6 +491,8 @@ item.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h
item.o: misc.h requesttypes.h ../../../pikotools/textstream/textstream.h
item.o: ../../../pikotools/convert/convert.h
item.o: ../../../pikotools/convert/inttostr.h
item.o: ../../../pikotools/convert/strtoint.h
item.o: ../../../pikotools/convert/text.h
item.o: ../../../pikotools/membuffer/membuffer.h
item.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
item.o: winix_const.h crypt.h run.h config.h
@ -483,14 +504,15 @@ job.o: textstream.h logmanipulators.h
job.o: ../../../pikotools/textstream/textstream.h
job.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
job.o: ../../../pikotools/convert/inttostr.h
job.o: ../../../pikotools/convert/strtoint.h
job.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
job.o: ../../../pikotools/utf8/utf8.h winix_const.h
job.o: ../../../pikotools/membuffer/membuffer.h
job.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
job.o: requesttypes.h item.h error.h config.h
job.o: ../../../pikotools/space/spaceparser.h
job.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h error.h
job.o: config.h ../../../pikotools/space/spaceparser.h
job.o: ../../../pikotools/space/space.h htmlfilter.h
job.o: ../../../winix/winixd/templates/htmltextstream.h
job.o: ../../../winix/winixd/core/textstream.h misc.h
job.o: ../../../pikotools/utf8/utf8.h winix_const.h
job.o: ../../../winix/winixd/core/textstream.h
job.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
job.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
job.o: ../../../winix/winixd/templates/locale.h system.h dirs.h
@ -584,14 +606,15 @@ lastcontainer.o: ../../../pikotools/space/space.h
lastcontainer.o: ../../../pikotools/textstream/types.h
lastcontainer.o: ../../../pikotools/convert/convert.h
lastcontainer.o: ../../../pikotools/convert/inttostr.h
lastcontainer.o: ../../../pikotools/convert/strtoint.h
lastcontainer.o: ../../../pikotools/convert/text.h misc.h item.h
lastcontainer.o: requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h
lastcontainer.o: ../../../pikotools/membuffer/membuffer.h
lastcontainer.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
lastcontainer.o: requesttypes.h item.h error.h config.h
lastcontainer.o: ../../../pikotools/space/spaceparser.h
lastcontainer.o: error.h config.h ../../../pikotools/space/spaceparser.h
lastcontainer.o: ../../../pikotools/space/space.h htmlfilter.h
lastcontainer.o: ../../../winix/winixd/templates/htmltextstream.h
lastcontainer.o: ../../../winix/winixd/core/textstream.h misc.h
lastcontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h
lastcontainer.o: ../../../winix/winixd/core/textstream.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
@ -603,14 +626,15 @@ loadavg.o: ../../../pikotools/textstream/types.h
loadavg.o: ../../../pikotools/date/date.h
loadavg.o: ../../../pikotools/convert/convert.h
loadavg.o: ../../../pikotools/convert/inttostr.h
loadavg.o: ../../../pikotools/convert/strtoint.h
loadavg.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
loadavg.o: ../../../pikotools/utf8/utf8.h winix_const.h
loadavg.o: ../../../pikotools/membuffer/membuffer.h
loadavg.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
loadavg.o: requesttypes.h item.h error.h config.h
loadavg.o: ../../../pikotools/space/spaceparser.h
loadavg.o: error.h config.h ../../../pikotools/space/spaceparser.h
loadavg.o: ../../../pikotools/space/space.h htmlfilter.h
loadavg.o: ../../../winix/winixd/templates/htmltextstream.h
loadavg.o: ../../../winix/winixd/core/textstream.h misc.h
loadavg.o: ../../../pikotools/utf8/utf8.h winix_const.h
loadavg.o: ../../../winix/winixd/core/textstream.h
loadavg.o: ../../../pikotools/space/spacetojson.h
loadavg.o: ../../../ezc/src/outstreams.h session.h user.h plugindata.h
loadavg.o: rebus.h ipban.h mount.h ../../../winix/winixd/templates/locale.h
@ -620,14 +644,15 @@ log.o: ../../../pikotools/textstream/textstream.h
log.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h
log.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
log.o: ../../../pikotools/convert/inttostr.h
log.o: ../../../pikotools/convert/strtoint.h
log.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
log.o: ../../../pikotools/utf8/utf8.h winix_const.h
log.o: ../../../pikotools/membuffer/membuffer.h
log.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
log.o: requesttypes.h item.h error.h config.h
log.o: ../../../pikotools/space/spaceparser.h
log.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h error.h
log.o: config.h ../../../pikotools/space/spaceparser.h
log.o: ../../../pikotools/space/space.h htmlfilter.h
log.o: ../../../winix/winixd/templates/htmltextstream.h
log.o: ../../../winix/winixd/core/textstream.h misc.h
log.o: ../../../pikotools/utf8/utf8.h winix_const.h
log.o: ../../../winix/winixd/core/textstream.h
log.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
log.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
log.o: ../../../winix/winixd/templates/locale.h timezones.h timezone.h
@ -636,6 +661,8 @@ misc.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h
misc.o: requesttypes.h ../../../pikotools/textstream/textstream.h
misc.o: ../../../pikotools/convert/convert.h
misc.o: ../../../pikotools/convert/inttostr.h
misc.o: ../../../pikotools/convert/strtoint.h
misc.o: ../../../pikotools/convert/text.h
misc.o: ../../../pikotools/membuffer/membuffer.h
misc.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
misc.o: winix_const.h log.h textstream.h logmanipulators.h slog.h cur.h
@ -676,6 +703,8 @@ mount.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h
mount.o: requesttypes.h ../../../pikotools/textstream/textstream.h
mount.o: ../../../pikotools/convert/convert.h
mount.o: ../../../pikotools/convert/inttostr.h
mount.o: ../../../pikotools/convert/strtoint.h
mount.o: ../../../pikotools/convert/text.h
mount.o: ../../../pikotools/membuffer/membuffer.h
mount.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
mount.o: winix_const.h
@ -690,6 +719,8 @@ mountparser.o: ../../../winix/winixd/core/textstream.h misc.h requesttypes.h
mountparser.o: ../../../pikotools/textstream/textstream.h
mountparser.o: ../../../pikotools/convert/convert.h
mountparser.o: ../../../pikotools/convert/inttostr.h
mountparser.o: ../../../pikotools/convert/strtoint.h
mountparser.o: ../../../pikotools/convert/text.h
mountparser.o: ../../../pikotools/membuffer/membuffer.h
mountparser.o: ../../../pikotools/textstream/types.h
mountparser.o: ../../../pikotools/utf8/utf8.h winix_const.h
@ -735,6 +766,8 @@ mounts.o: ../../../winix/winixd/core/textstream.h misc.h requesttypes.h
mounts.o: ../../../pikotools/textstream/textstream.h
mounts.o: ../../../pikotools/convert/convert.h
mounts.o: ../../../pikotools/convert/inttostr.h
mounts.o: ../../../pikotools/convert/strtoint.h
mounts.o: ../../../pikotools/convert/text.h
mounts.o: ../../../pikotools/membuffer/membuffer.h
mounts.o: ../../../pikotools/textstream/types.h
mounts.o: ../../../pikotools/utf8/utf8.h winix_const.h
@ -835,14 +868,15 @@ plugin.o: ../../../pikotools/space/space.h
plugin.o: ../../../pikotools/textstream/types.h
plugin.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
plugin.o: ../../../pikotools/convert/inttostr.h
plugin.o: ../../../pikotools/convert/strtoint.h
plugin.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
plugin.o: ../../../pikotools/utf8/utf8.h winix_const.h
plugin.o: ../../../pikotools/membuffer/membuffer.h
plugin.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
plugin.o: requesttypes.h item.h error.h config.h
plugin.o: ../../../pikotools/space/spaceparser.h
plugin.o: error.h config.h ../../../pikotools/space/spaceparser.h
plugin.o: ../../../pikotools/space/space.h htmlfilter.h
plugin.o: ../../../winix/winixd/templates/htmltextstream.h
plugin.o: ../../../winix/winixd/core/textstream.h misc.h
plugin.o: ../../../pikotools/utf8/utf8.h winix_const.h
plugin.o: ../../../winix/winixd/core/textstream.h
plugin.o: ../../../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/winixd/templates/locale.h system.h
@ -940,14 +974,15 @@ plugindata.o: ../../../pikotools/textstream/types.h
plugindata.o: ../../../pikotools/date/date.h
plugindata.o: ../../../pikotools/convert/convert.h
plugindata.o: ../../../pikotools/convert/inttostr.h
plugindata.o: ../../../pikotools/convert/strtoint.h
plugindata.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
plugindata.o: ../../../pikotools/utf8/utf8.h winix_const.h
plugindata.o: ../../../pikotools/membuffer/membuffer.h
plugindata.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
plugindata.o: requesttypes.h item.h error.h config.h
plugindata.o: ../../../pikotools/space/spaceparser.h
plugindata.o: error.h config.h ../../../pikotools/space/spaceparser.h
plugindata.o: ../../../pikotools/space/space.h htmlfilter.h
plugindata.o: ../../../winix/winixd/templates/htmltextstream.h
plugindata.o: ../../../winix/winixd/core/textstream.h misc.h
plugindata.o: ../../../pikotools/utf8/utf8.h winix_const.h
plugindata.o: ../../../winix/winixd/core/textstream.h
plugindata.o: ../../../pikotools/space/spacetojson.h
plugindata.o: ../../../ezc/src/outstreams.h session.h user.h rebus.h ipban.h
plugindata.o: mount.h ../../../winix/winixd/templates/locale.h system.h job.h
@ -1046,11 +1081,13 @@ postmultiparser.o: ../../../pikotools/textstream/types.h
postmultiparser.o: ../../../pikotools/date/date.h
postmultiparser.o: ../../../pikotools/convert/convert.h
postmultiparser.o: ../../../pikotools/convert/inttostr.h
postmultiparser.o: ../../../pikotools/convert/strtoint.h
postmultiparser.o: ../../../pikotools/convert/text.h misc.h item.h
postmultiparser.o: ../../../pikotools/utf8/utf8.h winix_const.h
postmultiparser.o: ../../../pikotools/membuffer/membuffer.h
postmultiparser.o: ../../../pikotools/textstream/types.h config.h
postmultiparser.o: ../../../pikotools/space/spaceparser.h
postmultiparser.o: ../../../pikotools/space/space.h htmlfilter.h misc.h
postmultiparser.o: item.h ../../../pikotools/utf8/utf8.h winix_const.h log.h
postmultiparser.o: ../../../pikotools/space/space.h htmlfilter.h log.h
postmultiparser.o: textstream.h logmanipulators.h slog.h cur.h request.h
postmultiparser.o: ../../../winix/winixd/templates/htmltextstream.h
postmultiparser.o: ../../../winix/winixd/core/textstream.h
@ -1064,14 +1101,15 @@ rebus.o: ../../../pikotools/space/space.h
rebus.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h
rebus.o: ../../../pikotools/convert/convert.h
rebus.o: ../../../pikotools/convert/inttostr.h
rebus.o: ../../../pikotools/convert/strtoint.h
rebus.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
rebus.o: ../../../pikotools/utf8/utf8.h winix_const.h
rebus.o: ../../../pikotools/membuffer/membuffer.h
rebus.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
rebus.o: requesttypes.h item.h error.h config.h
rebus.o: ../../../pikotools/space/spaceparser.h
rebus.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h error.h
rebus.o: config.h ../../../pikotools/space/spaceparser.h
rebus.o: ../../../pikotools/space/space.h htmlfilter.h
rebus.o: ../../../winix/winixd/templates/htmltextstream.h
rebus.o: ../../../winix/winixd/core/textstream.h misc.h
rebus.o: ../../../pikotools/utf8/utf8.h winix_const.h
rebus.o: ../../../winix/winixd/core/textstream.h
rebus.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
rebus.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
rebus.o: ../../../winix/winixd/templates/locale.h
@ -1082,13 +1120,15 @@ request.o: ../../../pikotools/textstream/types.h
request.o: ../../../pikotools/date/date.h
request.o: ../../../pikotools/convert/convert.h
request.o: ../../../pikotools/convert/inttostr.h
request.o: ../../../pikotools/convert/strtoint.h
request.o: ../../../pikotools/convert/text.h misc.h item.h
request.o: ../../../pikotools/utf8/utf8.h winix_const.h
request.o: ../../../pikotools/membuffer/membuffer.h
request.o: ../../../pikotools/textstream/types.h item.h error.h config.h
request.o: ../../../pikotools/textstream/types.h error.h config.h
request.o: ../../../pikotools/space/spaceparser.h
request.o: ../../../pikotools/space/space.h htmlfilter.h textstream.h
request.o: ../../../winix/winixd/templates/htmltextstream.h
request.o: ../../../winix/winixd/core/textstream.h misc.h
request.o: ../../../pikotools/utf8/utf8.h winix_const.h
request.o: ../../../winix/winixd/core/textstream.h
request.o: ../../../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
@ -1186,14 +1226,15 @@ run.o: ../../../pikotools/textstream/textstream.h
run.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h
run.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
run.o: ../../../pikotools/convert/inttostr.h
run.o: ../../../pikotools/convert/strtoint.h
run.o: ../../../pikotools/convert/text.h misc.h item.h requesttypes.h
run.o: ../../../pikotools/utf8/utf8.h winix_const.h
run.o: ../../../pikotools/membuffer/membuffer.h
run.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
run.o: requesttypes.h item.h error.h config.h
run.o: ../../../pikotools/space/spaceparser.h
run.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h error.h
run.o: config.h ../../../pikotools/space/spaceparser.h
run.o: ../../../pikotools/space/space.h htmlfilter.h
run.o: ../../../winix/winixd/templates/htmltextstream.h
run.o: ../../../winix/winixd/core/textstream.h misc.h
run.o: ../../../pikotools/utf8/utf8.h winix_const.h
run.o: ../../../winix/winixd/core/textstream.h
run.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
run.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
run.o: ../../../winix/winixd/templates/locale.h
@ -1204,6 +1245,8 @@ session.o: textstream.h ipban.h misc.h requesttypes.h
session.o: ../../../pikotools/textstream/textstream.h
session.o: ../../../pikotools/convert/convert.h
session.o: ../../../pikotools/convert/inttostr.h
session.o: ../../../pikotools/convert/strtoint.h
session.o: ../../../pikotools/convert/text.h
session.o: ../../../pikotools/membuffer/membuffer.h
session.o: ../../../pikotools/textstream/types.h
session.o: ../../../pikotools/utf8/utf8.h winix_const.h
@ -1215,13 +1258,15 @@ sessioncontainer.o: plugindata.h rebus.h textstream.h ipban.h cur.h request.h
sessioncontainer.o: requesttypes.h ../../../pikotools/textstream/textstream.h
sessioncontainer.o: ../../../pikotools/convert/convert.h
sessioncontainer.o: ../../../pikotools/convert/inttostr.h
sessioncontainer.o: ../../../pikotools/convert/strtoint.h
sessioncontainer.o: ../../../pikotools/convert/text.h misc.h
sessioncontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h
sessioncontainer.o: ../../../pikotools/membuffer/membuffer.h
sessioncontainer.o: ../../../pikotools/textstream/types.h config.h
sessioncontainer.o: ../../../pikotools/space/spaceparser.h
sessioncontainer.o: ../../../pikotools/space/space.h htmlfilter.h
sessioncontainer.o: ../../../winix/winixd/templates/htmltextstream.h
sessioncontainer.o: ../../../winix/winixd/core/textstream.h misc.h
sessioncontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h
sessioncontainer.o: ../../../winix/winixd/core/textstream.h
sessioncontainer.o: ../../../pikotools/space/spacetojson.h
sessioncontainer.o: ../../../ezc/src/outstreams.h mount.h log.h
sessioncontainer.o: logmanipulators.h slog.h
@ -1238,13 +1283,15 @@ sessionidmanager.o: logmanipulators.h
sessionidmanager.o: ../../../pikotools/textstream/textstream.h
sessionidmanager.o: ../../../pikotools/convert/convert.h
sessionidmanager.o: ../../../pikotools/convert/inttostr.h
sessionidmanager.o: ../../../pikotools/convert/strtoint.h
sessionidmanager.o: ../../../pikotools/convert/text.h misc.h item.h
sessionidmanager.o: requesttypes.h winix_const.h
sessionidmanager.o: ../../../pikotools/membuffer/membuffer.h
sessionidmanager.o: ../../../pikotools/textstream/types.h slog.h cur.h
sessionidmanager.o: request.h requesttypes.h item.h error.h config.h
sessionidmanager.o: htmlfilter.h
sessionidmanager.o: request.h error.h config.h htmlfilter.h
sessionidmanager.o: ../../../winix/winixd/templates/htmltextstream.h
sessionidmanager.o: ../../../winix/winixd/core/textstream.h misc.h
sessionidmanager.o: winix_const.h ../../../pikotools/space/spacetojson.h
sessionidmanager.o: ../../../winix/winixd/core/textstream.h
sessionidmanager.o: ../../../pikotools/space/spacetojson.h
sessionidmanager.o: ../../../ezc/src/outstreams.h session.h user.h
sessionidmanager.o: plugindata.h rebus.h ipban.h mount.h
sessionidmanager.o: ../../../winix/winixd/templates/locale.h
@ -1256,13 +1303,15 @@ sessionmanager.o: rebus.h textstream.h ipban.h cur.h request.h requesttypes.h
sessionmanager.o: ../../../pikotools/textstream/textstream.h
sessionmanager.o: ../../../pikotools/convert/convert.h
sessionmanager.o: ../../../pikotools/convert/inttostr.h
sessionmanager.o: ../../../pikotools/convert/strtoint.h
sessionmanager.o: ../../../pikotools/convert/text.h misc.h
sessionmanager.o: ../../../pikotools/utf8/utf8.h winix_const.h
sessionmanager.o: ../../../pikotools/membuffer/membuffer.h
sessionmanager.o: ../../../pikotools/textstream/types.h config.h
sessionmanager.o: ../../../pikotools/space/spaceparser.h
sessionmanager.o: ../../../pikotools/space/space.h htmlfilter.h
sessionmanager.o: ../../../winix/winixd/templates/htmltextstream.h
sessionmanager.o: ../../../winix/winixd/core/textstream.h misc.h
sessionmanager.o: ../../../pikotools/utf8/utf8.h winix_const.h
sessionmanager.o: ../../../winix/winixd/core/textstream.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
@ -1364,13 +1413,15 @@ sessionparser.o: request.h requesttypes.h
sessionparser.o: ../../../pikotools/textstream/textstream.h
sessionparser.o: ../../../pikotools/convert/convert.h
sessionparser.o: ../../../pikotools/convert/inttostr.h
sessionparser.o: ../../../pikotools/convert/strtoint.h
sessionparser.o: ../../../pikotools/convert/text.h misc.h
sessionparser.o: ../../../pikotools/utf8/utf8.h winix_const.h
sessionparser.o: ../../../pikotools/membuffer/membuffer.h
sessionparser.o: ../../../pikotools/textstream/types.h config.h
sessionparser.o: ../../../pikotools/space/spaceparser.h
sessionparser.o: ../../../pikotools/space/space.h htmlfilter.h
sessionparser.o: ../../../winix/winixd/templates/htmltextstream.h
sessionparser.o: ../../../winix/winixd/core/textstream.h misc.h
sessionparser.o: ../../../pikotools/utf8/utf8.h winix_const.h
sessionparser.o: ../../../winix/winixd/core/textstream.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
@ -1381,13 +1432,15 @@ slog.o: ../../../pikotools/space/space.h
slog.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h
slog.o: ../../../pikotools/convert/convert.h
slog.o: ../../../pikotools/convert/inttostr.h
slog.o: ../../../pikotools/convert/strtoint.h
slog.o: ../../../pikotools/convert/text.h misc.h item.h
slog.o: ../../../pikotools/utf8/utf8.h winix_const.h
slog.o: ../../../pikotools/membuffer/membuffer.h
slog.o: ../../../pikotools/textstream/types.h item.h error.h config.h
slog.o: ../../../pikotools/textstream/types.h error.h config.h
slog.o: ../../../pikotools/space/spaceparser.h
slog.o: ../../../pikotools/space/space.h htmlfilter.h textstream.h
slog.o: ../../../winix/winixd/templates/htmltextstream.h
slog.o: ../../../winix/winixd/core/textstream.h misc.h
slog.o: ../../../pikotools/utf8/utf8.h winix_const.h
slog.o: ../../../winix/winixd/core/textstream.h
slog.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
slog.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
slog.o: logmanipulators.h ../../../winix/winixd/templates/locale.h
@ -1403,6 +1456,8 @@ system.o: ../../../winix/winixd/core/textstream.h misc.h requesttypes.h
system.o: ../../../pikotools/textstream/textstream.h
system.o: ../../../pikotools/convert/convert.h
system.o: ../../../pikotools/convert/inttostr.h
system.o: ../../../pikotools/convert/strtoint.h
system.o: ../../../pikotools/convert/text.h
system.o: ../../../pikotools/membuffer/membuffer.h
system.o: ../../../pikotools/textstream/types.h
system.o: ../../../pikotools/utf8/utf8.h winix_const.h
@ -1504,14 +1559,15 @@ threadmanager.o: ../../../pikotools/textstream/types.h
threadmanager.o: ../../../pikotools/date/date.h
threadmanager.o: ../../../pikotools/convert/convert.h
threadmanager.o: ../../../pikotools/convert/inttostr.h
threadmanager.o: ../../../pikotools/convert/strtoint.h
threadmanager.o: ../../../pikotools/convert/text.h misc.h item.h
threadmanager.o: requesttypes.h ../../../pikotools/utf8/utf8.h winix_const.h
threadmanager.o: ../../../pikotools/membuffer/membuffer.h
threadmanager.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
threadmanager.o: requesttypes.h item.h error.h config.h
threadmanager.o: ../../../pikotools/space/spaceparser.h
threadmanager.o: error.h config.h ../../../pikotools/space/spaceparser.h
threadmanager.o: ../../../pikotools/space/space.h htmlfilter.h
threadmanager.o: ../../../winix/winixd/templates/htmltextstream.h
threadmanager.o: ../../../winix/winixd/core/textstream.h misc.h
threadmanager.o: ../../../pikotools/utf8/utf8.h winix_const.h
threadmanager.o: ../../../winix/winixd/core/textstream.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
@ -1522,6 +1578,8 @@ timezone.o: ../../../pikotools/textstream/types.h misc.h item.h
timezone.o: requesttypes.h ../../../pikotools/textstream/textstream.h
timezone.o: ../../../pikotools/convert/convert.h
timezone.o: ../../../pikotools/convert/inttostr.h
timezone.o: ../../../pikotools/convert/strtoint.h
timezone.o: ../../../pikotools/convert/text.h
timezone.o: ../../../pikotools/membuffer/membuffer.h
timezone.o: ../../../pikotools/textstream/types.h
timezone.o: ../../../pikotools/utf8/utf8.h winix_const.h
@ -1533,6 +1591,8 @@ timezones.o: ../../../pikotools/space/space.h misc.h item.h requesttypes.h
timezones.o: ../../../pikotools/textstream/textstream.h
timezones.o: ../../../pikotools/convert/convert.h
timezones.o: ../../../pikotools/convert/inttostr.h
timezones.o: ../../../pikotools/convert/strtoint.h
timezones.o: ../../../pikotools/convert/text.h
timezones.o: ../../../pikotools/membuffer/membuffer.h
timezones.o: ../../../pikotools/textstream/types.h
timezones.o: ../../../pikotools/utf8/utf8.h winix_const.h log.h textstream.h
@ -1550,13 +1610,15 @@ users.o: error.h user.h plugindata.h rebus.h textstream.h ipban.h cur.h
users.o: request.h requesttypes.h ../../../pikotools/textstream/textstream.h
users.o: ../../../pikotools/convert/convert.h
users.o: ../../../pikotools/convert/inttostr.h
users.o: ../../../pikotools/convert/strtoint.h
users.o: ../../../pikotools/convert/text.h misc.h
users.o: ../../../pikotools/utf8/utf8.h winix_const.h
users.o: ../../../pikotools/membuffer/membuffer.h
users.o: ../../../pikotools/textstream/types.h config.h
users.o: ../../../pikotools/space/spaceparser.h
users.o: ../../../pikotools/space/space.h htmlfilter.h
users.o: ../../../winix/winixd/templates/htmltextstream.h
users.o: ../../../winix/winixd/core/textstream.h misc.h
users.o: ../../../pikotools/utf8/utf8.h winix_const.h
users.o: ../../../winix/winixd/core/textstream.h
users.o: ../../../pikotools/space/spacetojson.h ../../../ezc/src/outstreams.h
users.o: mount.h ipbancontainer.h lastcontainer.h system.h job.h basethread.h
users.o: synchro.h dirs.h dircontainer.h ../../../winix/winixd/db/db.h

View File

@ -1 +1 @@
o = acceptbaseparser.o app.o basethread.o bbcodeparser.o compress.o config.o crypt.o dircontainer.o dirs.o groups.o htmlfilter.o httpsimpleparser.o image.o ipbancontainer.o item.o job.o lastcontainer.o loadavg.o lock.o log.o misc.o mount.o mountparser.o mounts.o plugin.o plugindata.o postmultiparser.o rebus.o request.o run.o session.o sessioncontainer.o sessionidmanager.o sessionmanager.o sessionparser.o slog.o synchro.o system.o threadmanager.o timezone.o timezones.o user.o users.o
o = acceptbaseparser.o app.o basethread.o bbcodeparser.o compress.o config.o crypt.o dircontainer.o dirs.o groups.o htmlfilter.o httpsimpleparser.o image.o ipbancontainer.o item.o job.o lastcontainer.o loadavg.o lock.o log.o misc.o mount.o mountparser.o mounts.o plugin.o plugindata.o postmultiparser.o rebus.o request.o run.o session.o sessioncontainer.o sessionidmanager.o sessionmanager.o sessionparser.o slog.o synchro.o system.o threadmanager.o timezone.o timezones.o user.o users.o

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2015, Tomasz Sowa
* Copyright (c) 2010-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -1141,23 +1141,26 @@ void App::PrepareHeadersNormal(Header header, size_t output_size)
// and if compression is enabled the client's browser will not be able to decompress the stream
void App::SendHeaders()
{
PT::Space::TableSingle::iterator i;
PT::Space::Table::iterator i;
PT::Space & headers = cur.request->out_headers;
plugin.Call(WINIX_PREPARE_TO_SEND_HTTP_HEADERS, &headers);
for(i=headers.table_single.begin() ; i != headers.table_single.end() ; ++i)
for(i=headers.table.begin() ; i != headers.table.end() ; ++i)
{
PT::WideToUTF8(i->first, aheader_name);
PT::WideToUTF8(i->second, aheader_value);
if( i->second.size() == 1 )
{
PT::WideToUTF8(i->first, aheader_name);
PT::WideToUTF8(i->second[0], aheader_value);
FCGX_PutS(aheader_name.c_str(), fcgi_request.out);
FCGX_PutS(": ", fcgi_request.out);
FCGX_PutS(aheader_value.c_str(), fcgi_request.out);
FCGX_PutS("\r\n", fcgi_request.out);
FCGX_PutS(aheader_name.c_str(), fcgi_request.out);
FCGX_PutS(": ", fcgi_request.out);
FCGX_PutS(aheader_value.c_str(), fcgi_request.out);
FCGX_PutS("\r\n", fcgi_request.out);
if( config.log_http_answer_headers )
log << log1 << "HTTP Header: " << aheader_name << ": " << aheader_value << logend;
if( config.log_http_answer_headers )
log << log1 << "HTTP Header: " << aheader_name << ": " << aheader_value << logend;
}
}
}
@ -1165,24 +1168,27 @@ void App::SendHeaders()
void App::SendCookies()
{
PT::Space::TableSingle::iterator i;
PT::Space::Table::iterator i;
PT::Space & cookies = cur.request->out_cookies;
plugin.Call(WINIX_PREPARE_TO_SEND_HTTP_COOKIES, &cookies);
for(i=cookies.table_single.begin() ; i != cookies.table_single.end() ; ++i)
for(i=cookies.table.begin() ; i != cookies.table.end() ; ++i)
{
PT::WideToUTF8(i->first, aheader_name);
PT::WideToUTF8(i->second, aheader_value);
if( i->second.size() == 1 )
{
PT::WideToUTF8(i->first, aheader_name);
PT::WideToUTF8(i->second[0], aheader_value);
FCGX_PutS("Set-Cookie: ", fcgi_request.out);
FCGX_PutS(aheader_name.c_str(), fcgi_request.out);
FCGX_PutS("=", fcgi_request.out);
FCGX_PutS(aheader_value.c_str(), fcgi_request.out);
FCGX_PutS("\r\n", fcgi_request.out);
FCGX_PutS("Set-Cookie: ", fcgi_request.out);
FCGX_PutS(aheader_name.c_str(), fcgi_request.out);
FCGX_PutS("=", fcgi_request.out);
FCGX_PutS(aheader_value.c_str(), fcgi_request.out);
FCGX_PutS("\r\n", fcgi_request.out);
if( config.log_http_answer_headers )
log << log1 << "HTTP Header: Set-Cookie: " << aheader_name << "=" << aheader_value << logend;
if( config.log_http_answer_headers )
log << log1 << "HTTP Header: Set-Cookie: " << aheader_name << "=" << aheader_value << logend;
}
}
}

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2017, Tomasz Sowa
* Copyright (c) 2008-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -101,9 +101,7 @@ bool Config::ReadConfig(bool errors_to_stdout_, bool stdout_is_closed)
log << log2 << "Config: reading a config file" << logend;
parser.SplitSingle(true);
parser.SetSpace(space);
PT::SpaceParser::Status status = parser.Parse(config_file);
if( status == PT::SpaceParser::ok )
@ -373,24 +371,42 @@ void Config::CheckPasswd()
std::wstring & Config::Text(const wchar_t * name)
std::wstring Config::Text(const wchar_t * name)
{
return space.Text(name);
}
std::wstring & Config::Text(const wchar_t * name, const wchar_t * def)
std::wstring Config::Text(const wchar_t * name, const wchar_t * def)
{
return space.Text(name, def);
}
std::wstring & Config::Text(const std::wstring & name, const wchar_t * def)
std::wstring Config::Text(const std::wstring & name, const wchar_t * def)
{
return space.Text(name, def);
}
std::wstring & Config::TextRef(const wchar_t * name)
{
return space.TextRef(name);
}
std::wstring & Config::TextRef(const wchar_t * name, const wchar_t * def)
{
return space.TextRef(name, def);
}
std::wstring & Config::TextRef(const std::wstring & name, const wchar_t * def)
{
return space.TextRef(name, def);
}
int Config::Int(const wchar_t * name)
{
return space.Int(name);

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2017, Tomasz Sowa
* Copyright (c) 2008-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -751,9 +751,20 @@ public:
Config();
bool ReadConfig(bool errors_to_stdout_, bool stdout_is_closed = true);
std::wstring & Text(const wchar_t * name);
std::wstring & Text(const wchar_t * name, const wchar_t * def);
std::wstring & Text(const std::wstring & name, const wchar_t * def);
/*
*
* CHECK ME
* there was a change in Pikotools
* before Text() returns a reference to the std::wstring
*
*/
std::wstring Text(const wchar_t * name);
std::wstring Text(const wchar_t * name, const wchar_t * def);
std::wstring Text(const std::wstring & name, const wchar_t * def);
std::wstring & TextRef(const wchar_t * name);
std::wstring & TextRef(const wchar_t * name, const wchar_t * def);
std::wstring & TextRef(const std::wstring & name, const wchar_t * def);
int Int(const wchar_t *);
int Int(const wchar_t * name, int def);

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2012-2014, Tomasz Sowa
* Copyright (c) 2012-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -242,7 +242,7 @@ return offset;
time_t TimeZone::GetOffset(PT::Space & space)
{
std::wstring * offset_str = space.GetValue(L"offset_str");
std::wstring * offset_str = space.GetFirstValue(L"offset_str");
if( offset_str )
return ParseStrOffset(offset_str->c_str());

View File

@ -9,6 +9,7 @@ db.o: ../../../winix/winixd/core/requesttypes.h
db.o: ../../../pikotools/textstream/textstream.h
db.o: ../../../pikotools/convert/convert.h
db.o: ../../../pikotools/convert/inttostr.h
db.o: ../../../pikotools/convert/strtoint.h ../../../pikotools/convert/text.h
db.o: ../../../pikotools/membuffer/membuffer.h
db.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
db.o: ../../../winix/winixd/core/winix_const.h
@ -43,6 +44,8 @@ dbbase.o: ../../../winix/winixd/core/requesttypes.h
dbbase.o: ../../../pikotools/textstream/textstream.h
dbbase.o: ../../../pikotools/convert/convert.h
dbbase.o: ../../../pikotools/convert/inttostr.h
dbbase.o: ../../../pikotools/convert/strtoint.h
dbbase.o: ../../../pikotools/convert/text.h
dbbase.o: ../../../pikotools/membuffer/membuffer.h
dbbase.o: ../../../pikotools/textstream/types.h
dbbase.o: ../../../pikotools/utf8/utf8.h
@ -60,6 +63,8 @@ dbconn.o: ../../../winix/winixd/core/requesttypes.h
dbconn.o: ../../../pikotools/textstream/textstream.h
dbconn.o: ../../../pikotools/convert/convert.h
dbconn.o: ../../../pikotools/convert/inttostr.h
dbconn.o: ../../../pikotools/convert/strtoint.h
dbconn.o: ../../../pikotools/convert/text.h
dbconn.o: ../../../pikotools/membuffer/membuffer.h
dbconn.o: ../../../pikotools/textstream/types.h
dbconn.o: ../../../pikotools/utf8/utf8.h
@ -77,6 +82,8 @@ dbitemcolumns.o: ../../../winix/winixd/core/requesttypes.h
dbitemcolumns.o: ../../../pikotools/textstream/textstream.h
dbitemcolumns.o: ../../../pikotools/convert/convert.h
dbitemcolumns.o: ../../../pikotools/convert/inttostr.h
dbitemcolumns.o: ../../../pikotools/convert/strtoint.h
dbitemcolumns.o: ../../../pikotools/convert/text.h
dbitemcolumns.o: ../../../pikotools/membuffer/membuffer.h
dbitemcolumns.o: ../../../pikotools/textstream/types.h
dbitemcolumns.o: ../../../pikotools/utf8/utf8.h
@ -96,6 +103,8 @@ dbtextstream.o: ../../../winix/winixd/core/requesttypes.h
dbtextstream.o: ../../../pikotools/textstream/textstream.h
dbtextstream.o: ../../../pikotools/convert/convert.h
dbtextstream.o: ../../../pikotools/convert/inttostr.h
dbtextstream.o: ../../../pikotools/convert/strtoint.h
dbtextstream.o: ../../../pikotools/convert/text.h
dbtextstream.o: ../../../pikotools/membuffer/membuffer.h
dbtextstream.o: ../../../pikotools/textstream/types.h
dbtextstream.o: ../../../pikotools/utf8/utf8.h

View File

@ -1 +1 @@
o = db.o dbbase.o dbconn.o dbitemcolumns.o dbitemquery.o dbtextstream.o
o = db.o dbbase.o dbconn.o dbitemcolumns.o dbitemquery.o dbtextstream.o

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2014, Tomasz Sowa
* Copyright (c) 2010-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -255,11 +255,10 @@ return date;
}
bool DbBase::AssertValueSpace(PGresult * r, int row, int col, PT::Space & space, bool split_single)
bool DbBase::AssertValueSpace(PGresult * r, int row, int col, PT::Space & space)
{
const char * res = AssertValue(r, row, col);
conf_parser.SplitSingle(split_single);
conf_parser.SetSpace(space);
space.Clear();

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2014, Tomasz Sowa
* Copyright (c) 2010-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -82,7 +82,7 @@ public:
static PT::Date AssertValueDate(PGresult * r, int row, int col);
// non static assignments
bool AssertValueSpace(PGresult * r, int row, int col, PT::Space & space, bool split_single = true);
bool AssertValueSpace(PGresult * r, int row, int col, PT::Space & space);
void ClearResult(PGresult * r);
long AssertCurrval(const char * table);

View File

@ -14,6 +14,8 @@ account.o: ../../../winix/winixd/core/requesttypes.h
account.o: ../../../pikotools/textstream/textstream.h
account.o: ../../../pikotools/convert/convert.h
account.o: ../../../pikotools/convert/inttostr.h
account.o: ../../../pikotools/convert/strtoint.h
account.o: ../../../pikotools/convert/text.h
account.o: ../../../pikotools/membuffer/membuffer.h
account.o: ../../../pikotools/textstream/types.h
account.o: ../../../pikotools/utf8/utf8.h
@ -98,6 +100,8 @@ adduser.o: ../../../winix/winixd/core/requesttypes.h
adduser.o: ../../../pikotools/textstream/textstream.h
adduser.o: ../../../pikotools/convert/convert.h
adduser.o: ../../../pikotools/convert/inttostr.h
adduser.o: ../../../pikotools/convert/strtoint.h
adduser.o: ../../../pikotools/convert/text.h
adduser.o: ../../../pikotools/membuffer/membuffer.h
adduser.o: ../../../pikotools/textstream/types.h
adduser.o: ../../../pikotools/utf8/utf8.h
@ -195,6 +199,8 @@ cat.o: ../../../winix/winixd/core/requesttypes.h
cat.o: ../../../pikotools/textstream/textstream.h
cat.o: ../../../pikotools/convert/convert.h
cat.o: ../../../pikotools/convert/inttostr.h
cat.o: ../../../pikotools/convert/strtoint.h
cat.o: ../../../pikotools/convert/text.h
cat.o: ../../../pikotools/membuffer/membuffer.h
cat.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
cat.o: ../../../winix/winixd/core/winix_const.h
@ -266,6 +272,8 @@ chmod.o: ../../../winix/winixd/core/requesttypes.h
chmod.o: ../../../pikotools/textstream/textstream.h
chmod.o: ../../../pikotools/convert/convert.h
chmod.o: ../../../pikotools/convert/inttostr.h
chmod.o: ../../../pikotools/convert/strtoint.h
chmod.o: ../../../pikotools/convert/text.h
chmod.o: ../../../pikotools/membuffer/membuffer.h
chmod.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
chmod.o: ../../../winix/winixd/core/winix_const.h
@ -343,6 +351,8 @@ chown.o: ../../../winix/winixd/core/requesttypes.h
chown.o: ../../../pikotools/textstream/textstream.h
chown.o: ../../../pikotools/convert/convert.h
chown.o: ../../../pikotools/convert/inttostr.h
chown.o: ../../../pikotools/convert/strtoint.h
chown.o: ../../../pikotools/convert/text.h
chown.o: ../../../pikotools/membuffer/membuffer.h
chown.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
chown.o: ../../../winix/winixd/core/winix_const.h
@ -422,6 +432,8 @@ ckeditor.o: ../../../winix/winixd/core/requesttypes.h
ckeditor.o: ../../../pikotools/textstream/textstream.h
ckeditor.o: ../../../pikotools/convert/convert.h
ckeditor.o: ../../../pikotools/convert/inttostr.h
ckeditor.o: ../../../pikotools/convert/strtoint.h
ckeditor.o: ../../../pikotools/convert/text.h
ckeditor.o: ../../../pikotools/membuffer/membuffer.h
ckeditor.o: ../../../pikotools/textstream/types.h
ckeditor.o: ../../../pikotools/utf8/utf8.h
@ -503,6 +515,7 @@ cp.o: ../../../winix/winixd/core/requesttypes.h
cp.o: ../../../pikotools/textstream/textstream.h
cp.o: ../../../pikotools/convert/convert.h
cp.o: ../../../pikotools/convert/inttostr.h
cp.o: ../../../pikotools/convert/strtoint.h ../../../pikotools/convert/text.h
cp.o: ../../../pikotools/membuffer/membuffer.h
cp.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
cp.o: ../../../winix/winixd/core/winix_const.h
@ -590,6 +603,8 @@ default.o: ../../../winix/winixd/core/requesttypes.h
default.o: ../../../pikotools/textstream/textstream.h
default.o: ../../../pikotools/convert/convert.h
default.o: ../../../pikotools/convert/inttostr.h
default.o: ../../../pikotools/convert/strtoint.h
default.o: ../../../pikotools/convert/text.h
default.o: ../../../pikotools/membuffer/membuffer.h
default.o: ../../../pikotools/textstream/types.h
default.o: ../../../pikotools/utf8/utf8.h
@ -672,6 +687,8 @@ download.o: ../../../winix/winixd/core/requesttypes.h
download.o: ../../../pikotools/textstream/textstream.h
download.o: ../../../pikotools/convert/convert.h
download.o: ../../../pikotools/convert/inttostr.h
download.o: ../../../pikotools/convert/strtoint.h
download.o: ../../../pikotools/convert/text.h
download.o: ../../../pikotools/membuffer/membuffer.h
download.o: ../../../pikotools/textstream/types.h
download.o: ../../../pikotools/utf8/utf8.h
@ -754,6 +771,8 @@ emacs.o: ../../../winix/winixd/core/requesttypes.h
emacs.o: ../../../pikotools/textstream/textstream.h
emacs.o: ../../../pikotools/convert/convert.h
emacs.o: ../../../pikotools/convert/inttostr.h
emacs.o: ../../../pikotools/convert/strtoint.h
emacs.o: ../../../pikotools/convert/text.h
emacs.o: ../../../pikotools/membuffer/membuffer.h
emacs.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
emacs.o: ../../../winix/winixd/core/winix_const.h
@ -837,6 +856,8 @@ env.o: ../../../winix/winixd/core/requesttypes.h
env.o: ../../../pikotools/textstream/textstream.h
env.o: ../../../pikotools/convert/convert.h
env.o: ../../../pikotools/convert/inttostr.h
env.o: ../../../pikotools/convert/strtoint.h
env.o: ../../../pikotools/convert/text.h
env.o: ../../../pikotools/membuffer/membuffer.h
env.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
env.o: ../../../winix/winixd/core/winix_const.h
@ -910,6 +931,8 @@ functionbase.o: ../../../winix/winixd/core/requesttypes.h
functionbase.o: ../../../pikotools/textstream/textstream.h
functionbase.o: ../../../pikotools/convert/convert.h
functionbase.o: ../../../pikotools/convert/inttostr.h
functionbase.o: ../../../pikotools/convert/strtoint.h
functionbase.o: ../../../pikotools/convert/text.h
functionbase.o: ../../../pikotools/membuffer/membuffer.h
functionbase.o: ../../../pikotools/textstream/types.h
functionbase.o: ../../../pikotools/utf8/utf8.h
@ -995,6 +1018,8 @@ functionparser.o: ../../../pikotools/textstream/types.h
functionparser.o: ../../../pikotools/date/date.h
functionparser.o: ../../../pikotools/convert/convert.h
functionparser.o: ../../../pikotools/convert/inttostr.h
functionparser.o: ../../../pikotools/convert/strtoint.h
functionparser.o: ../../../pikotools/convert/text.h
functionparser.o: ../../../pikotools/membuffer/membuffer.h
functionparser.o: ../../../pikotools/textstream/types.h
functionparser.o: ../../../pikotools/utf8/utf8.h
@ -1083,6 +1108,8 @@ functions.o: ../../../winix/winixd/core/requesttypes.h
functions.o: ../../../pikotools/textstream/textstream.h
functions.o: ../../../pikotools/convert/convert.h
functions.o: ../../../pikotools/convert/inttostr.h
functions.o: ../../../pikotools/convert/strtoint.h
functions.o: ../../../pikotools/convert/text.h
functions.o: ../../../pikotools/membuffer/membuffer.h
functions.o: ../../../pikotools/textstream/types.h
functions.o: ../../../pikotools/utf8/utf8.h
@ -1185,6 +1212,8 @@ imgcrop.o: ../../../winix/winixd/core/requesttypes.h
imgcrop.o: ../../../pikotools/textstream/textstream.h
imgcrop.o: ../../../pikotools/convert/convert.h
imgcrop.o: ../../../pikotools/convert/inttostr.h
imgcrop.o: ../../../pikotools/convert/strtoint.h
imgcrop.o: ../../../pikotools/convert/text.h
imgcrop.o: ../../../pikotools/membuffer/membuffer.h
imgcrop.o: ../../../pikotools/textstream/types.h
imgcrop.o: ../../../pikotools/utf8/utf8.h
@ -1265,6 +1294,8 @@ ipban.o: ../../../winix/winixd/core/requesttypes.h
ipban.o: ../../../pikotools/textstream/textstream.h
ipban.o: ../../../pikotools/convert/convert.h
ipban.o: ../../../pikotools/convert/inttostr.h
ipban.o: ../../../pikotools/convert/strtoint.h
ipban.o: ../../../pikotools/convert/text.h
ipban.o: ../../../pikotools/membuffer/membuffer.h
ipban.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
ipban.o: ../../../winix/winixd/core/winix_const.h
@ -1343,6 +1374,8 @@ last.o: ../../../winix/winixd/core/requesttypes.h
last.o: ../../../pikotools/textstream/textstream.h
last.o: ../../../pikotools/convert/convert.h
last.o: ../../../pikotools/convert/inttostr.h
last.o: ../../../pikotools/convert/strtoint.h
last.o: ../../../pikotools/convert/text.h
last.o: ../../../pikotools/membuffer/membuffer.h
last.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
last.o: ../../../winix/winixd/core/winix_const.h
@ -1417,6 +1450,7 @@ ln.o: ../../../winix/winixd/core/requesttypes.h
ln.o: ../../../pikotools/textstream/textstream.h
ln.o: ../../../pikotools/convert/convert.h
ln.o: ../../../pikotools/convert/inttostr.h
ln.o: ../../../pikotools/convert/strtoint.h ../../../pikotools/convert/text.h
ln.o: ../../../pikotools/membuffer/membuffer.h
ln.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
ln.o: ../../../winix/winixd/core/winix_const.h
@ -1487,6 +1521,8 @@ locale.o: ../../../winix/winixd/core/requesttypes.h
locale.o: ../../../pikotools/textstream/textstream.h
locale.o: ../../../pikotools/convert/convert.h
locale.o: ../../../pikotools/convert/inttostr.h
locale.o: ../../../pikotools/convert/strtoint.h
locale.o: ../../../pikotools/convert/text.h
locale.o: ../../../pikotools/membuffer/membuffer.h
locale.o: ../../../pikotools/textstream/types.h
locale.o: ../../../pikotools/utf8/utf8.h
@ -1574,6 +1610,8 @@ login.o: ../../../winix/winixd/core/requesttypes.h
login.o: ../../../pikotools/textstream/textstream.h
login.o: ../../../pikotools/convert/convert.h
login.o: ../../../pikotools/convert/inttostr.h
login.o: ../../../pikotools/convert/strtoint.h
login.o: ../../../pikotools/convert/text.h
login.o: ../../../pikotools/membuffer/membuffer.h
login.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
login.o: ../../../winix/winixd/core/winix_const.h
@ -1651,6 +1689,8 @@ logout.o: ../../../winix/winixd/core/requesttypes.h
logout.o: ../../../pikotools/textstream/textstream.h
logout.o: ../../../pikotools/convert/convert.h
logout.o: ../../../pikotools/convert/inttostr.h
logout.o: ../../../pikotools/convert/strtoint.h
logout.o: ../../../pikotools/convert/text.h
logout.o: ../../../pikotools/membuffer/membuffer.h
logout.o: ../../../pikotools/textstream/types.h
logout.o: ../../../pikotools/utf8/utf8.h
@ -1730,6 +1770,7 @@ ls.o: ../../../winix/winixd/core/requesttypes.h
ls.o: ../../../pikotools/textstream/textstream.h
ls.o: ../../../pikotools/convert/convert.h
ls.o: ../../../pikotools/convert/inttostr.h
ls.o: ../../../pikotools/convert/strtoint.h ../../../pikotools/convert/text.h
ls.o: ../../../pikotools/membuffer/membuffer.h
ls.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
ls.o: ../../../winix/winixd/core/winix_const.h
@ -1798,6 +1839,8 @@ man.o: ../../../winix/winixd/core/requesttypes.h
man.o: ../../../pikotools/textstream/textstream.h
man.o: ../../../pikotools/convert/convert.h
man.o: ../../../pikotools/convert/inttostr.h
man.o: ../../../pikotools/convert/strtoint.h
man.o: ../../../pikotools/convert/text.h
man.o: ../../../pikotools/membuffer/membuffer.h
man.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
man.o: ../../../winix/winixd/core/winix_const.h
@ -1869,6 +1912,8 @@ meta.o: ../../../winix/winixd/core/requesttypes.h
meta.o: ../../../pikotools/textstream/textstream.h
meta.o: ../../../pikotools/convert/convert.h
meta.o: ../../../pikotools/convert/inttostr.h
meta.o: ../../../pikotools/convert/strtoint.h
meta.o: ../../../pikotools/convert/text.h
meta.o: ../../../pikotools/membuffer/membuffer.h
meta.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
meta.o: ../../../winix/winixd/core/winix_const.h
@ -1944,6 +1989,8 @@ mkdir.o: ../../../winix/winixd/core/requesttypes.h
mkdir.o: ../../../pikotools/textstream/textstream.h
mkdir.o: ../../../pikotools/convert/convert.h
mkdir.o: ../../../pikotools/convert/inttostr.h
mkdir.o: ../../../pikotools/convert/strtoint.h
mkdir.o: ../../../pikotools/convert/text.h
mkdir.o: ../../../pikotools/membuffer/membuffer.h
mkdir.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
mkdir.o: ../../../winix/winixd/core/winix_const.h
@ -2037,6 +2084,8 @@ mount.o: ../../../winix/winixd/core/requesttypes.h
mount.o: ../../../pikotools/textstream/textstream.h
mount.o: ../../../pikotools/convert/convert.h
mount.o: ../../../pikotools/convert/inttostr.h
mount.o: ../../../pikotools/convert/strtoint.h
mount.o: ../../../pikotools/convert/text.h
mount.o: ../../../pikotools/membuffer/membuffer.h
mount.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
mount.o: ../../../winix/winixd/core/winix_const.h
@ -2113,6 +2162,7 @@ mv.o: ../../../winix/winixd/core/requesttypes.h
mv.o: ../../../pikotools/textstream/textstream.h
mv.o: ../../../pikotools/convert/convert.h
mv.o: ../../../pikotools/convert/inttostr.h
mv.o: ../../../pikotools/convert/strtoint.h ../../../pikotools/convert/text.h
mv.o: ../../../pikotools/membuffer/membuffer.h
mv.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
mv.o: ../../../winix/winixd/core/winix_const.h
@ -2200,6 +2250,8 @@ nicedit.o: ../../../winix/winixd/core/requesttypes.h
nicedit.o: ../../../pikotools/textstream/textstream.h
nicedit.o: ../../../pikotools/convert/convert.h
nicedit.o: ../../../pikotools/convert/inttostr.h
nicedit.o: ../../../pikotools/convert/strtoint.h
nicedit.o: ../../../pikotools/convert/text.h
nicedit.o: ../../../pikotools/membuffer/membuffer.h
nicedit.o: ../../../pikotools/textstream/types.h
nicedit.o: ../../../pikotools/utf8/utf8.h
@ -2280,6 +2332,8 @@ node.o: ../../../winix/winixd/core/requesttypes.h
node.o: ../../../pikotools/textstream/textstream.h
node.o: ../../../pikotools/convert/convert.h
node.o: ../../../pikotools/convert/inttostr.h
node.o: ../../../pikotools/convert/strtoint.h
node.o: ../../../pikotools/convert/text.h
node.o: ../../../pikotools/membuffer/membuffer.h
node.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
node.o: ../../../winix/winixd/core/winix_const.h
@ -2355,6 +2409,8 @@ passwd.o: ../../../winix/winixd/core/requesttypes.h
passwd.o: ../../../pikotools/textstream/textstream.h
passwd.o: ../../../pikotools/convert/convert.h
passwd.o: ../../../pikotools/convert/inttostr.h
passwd.o: ../../../pikotools/convert/strtoint.h
passwd.o: ../../../pikotools/convert/text.h
passwd.o: ../../../pikotools/membuffer/membuffer.h
passwd.o: ../../../pikotools/textstream/types.h
passwd.o: ../../../pikotools/utf8/utf8.h
@ -2437,6 +2493,8 @@ priv.o: ../../../winix/winixd/core/requesttypes.h
priv.o: ../../../pikotools/textstream/textstream.h
priv.o: ../../../pikotools/convert/convert.h
priv.o: ../../../pikotools/convert/inttostr.h
priv.o: ../../../pikotools/convert/strtoint.h
priv.o: ../../../pikotools/convert/text.h
priv.o: ../../../pikotools/membuffer/membuffer.h
priv.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
priv.o: ../../../winix/winixd/core/winix_const.h
@ -2521,6 +2579,8 @@ privchanger.o: ../../../pikotools/textstream/textstream.h
privchanger.o: ../../../pikotools/date/date.h
privchanger.o: ../../../pikotools/convert/convert.h
privchanger.o: ../../../pikotools/convert/inttostr.h
privchanger.o: ../../../pikotools/convert/strtoint.h
privchanger.o: ../../../pikotools/convert/text.h
privchanger.o: ../../../pikotools/membuffer/membuffer.h
privchanger.o: ../../../pikotools/textstream/types.h
privchanger.o: ../../../pikotools/utf8/utf8.h
@ -2597,6 +2657,7 @@ pw.o: ../../../winix/winixd/core/requesttypes.h
pw.o: ../../../pikotools/textstream/textstream.h
pw.o: ../../../pikotools/convert/convert.h
pw.o: ../../../pikotools/convert/inttostr.h
pw.o: ../../../pikotools/convert/strtoint.h ../../../pikotools/convert/text.h
pw.o: ../../../pikotools/membuffer/membuffer.h
pw.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
pw.o: ../../../winix/winixd/core/winix_const.h
@ -2667,6 +2728,8 @@ reload.o: ../../../winix/winixd/core/requesttypes.h
reload.o: ../../../pikotools/textstream/textstream.h
reload.o: ../../../pikotools/convert/convert.h
reload.o: ../../../pikotools/convert/inttostr.h
reload.o: ../../../pikotools/convert/strtoint.h
reload.o: ../../../pikotools/convert/text.h
reload.o: ../../../pikotools/membuffer/membuffer.h
reload.o: ../../../pikotools/textstream/types.h
reload.o: ../../../pikotools/utf8/utf8.h
@ -2753,6 +2816,7 @@ rm.o: ../../../winix/winixd/core/requesttypes.h
rm.o: ../../../pikotools/textstream/textstream.h
rm.o: ../../../pikotools/convert/convert.h
rm.o: ../../../pikotools/convert/inttostr.h
rm.o: ../../../pikotools/convert/strtoint.h ../../../pikotools/convert/text.h
rm.o: ../../../pikotools/membuffer/membuffer.h
rm.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
rm.o: ../../../winix/winixd/core/winix_const.h
@ -2839,6 +2903,8 @@ rmuser.o: ../../../winix/winixd/core/requesttypes.h
rmuser.o: ../../../pikotools/textstream/textstream.h
rmuser.o: ../../../pikotools/convert/convert.h
rmuser.o: ../../../pikotools/convert/inttostr.h
rmuser.o: ../../../pikotools/convert/strtoint.h
rmuser.o: ../../../pikotools/convert/text.h
rmuser.o: ../../../pikotools/membuffer/membuffer.h
rmuser.o: ../../../pikotools/textstream/types.h
rmuser.o: ../../../pikotools/utf8/utf8.h
@ -2935,6 +3001,8 @@ run.o: ../../../winix/winixd/core/requesttypes.h
run.o: ../../../pikotools/textstream/textstream.h
run.o: ../../../pikotools/convert/convert.h
run.o: ../../../pikotools/convert/inttostr.h
run.o: ../../../pikotools/convert/strtoint.h
run.o: ../../../pikotools/convert/text.h
run.o: ../../../pikotools/membuffer/membuffer.h
run.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
run.o: ../../../winix/winixd/core/winix_const.h
@ -3006,6 +3074,8 @@ sort.o: ../../../winix/winixd/core/requesttypes.h
sort.o: ../../../pikotools/textstream/textstream.h
sort.o: ../../../pikotools/convert/convert.h
sort.o: ../../../pikotools/convert/inttostr.h
sort.o: ../../../pikotools/convert/strtoint.h
sort.o: ../../../pikotools/convert/text.h
sort.o: ../../../pikotools/membuffer/membuffer.h
sort.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
sort.o: ../../../winix/winixd/core/winix_const.h
@ -3101,6 +3171,8 @@ specialdefault.o: ../../../winix/winixd/core/requesttypes.h
specialdefault.o: ../../../pikotools/textstream/textstream.h
specialdefault.o: ../../../pikotools/convert/convert.h
specialdefault.o: ../../../pikotools/convert/inttostr.h
specialdefault.o: ../../../pikotools/convert/strtoint.h
specialdefault.o: ../../../pikotools/convert/text.h
specialdefault.o: ../../../pikotools/membuffer/membuffer.h
specialdefault.o: ../../../pikotools/textstream/types.h
specialdefault.o: ../../../pikotools/utf8/utf8.h
@ -3185,6 +3257,8 @@ stat.o: ../../../winix/winixd/core/requesttypes.h
stat.o: ../../../pikotools/textstream/textstream.h
stat.o: ../../../pikotools/convert/convert.h
stat.o: ../../../pikotools/convert/inttostr.h
stat.o: ../../../pikotools/convert/strtoint.h
stat.o: ../../../pikotools/convert/text.h
stat.o: ../../../pikotools/membuffer/membuffer.h
stat.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
stat.o: ../../../winix/winixd/core/winix_const.h
@ -3262,6 +3336,8 @@ subject.o: ../../../winix/winixd/core/requesttypes.h
subject.o: ../../../pikotools/textstream/textstream.h
subject.o: ../../../pikotools/convert/convert.h
subject.o: ../../../pikotools/convert/inttostr.h
subject.o: ../../../pikotools/convert/strtoint.h
subject.o: ../../../pikotools/convert/text.h
subject.o: ../../../pikotools/membuffer/membuffer.h
subject.o: ../../../pikotools/textstream/types.h
subject.o: ../../../pikotools/utf8/utf8.h
@ -3360,6 +3436,8 @@ template.o: ../../../winix/winixd/core/requesttypes.h
template.o: ../../../pikotools/textstream/textstream.h
template.o: ../../../pikotools/convert/convert.h
template.o: ../../../pikotools/convert/inttostr.h
template.o: ../../../pikotools/convert/strtoint.h
template.o: ../../../pikotools/convert/text.h
template.o: ../../../pikotools/membuffer/membuffer.h
template.o: ../../../pikotools/textstream/types.h
template.o: ../../../pikotools/utf8/utf8.h
@ -3446,6 +3524,8 @@ timezone.o: ../../../winix/winixd/core/requesttypes.h
timezone.o: ../../../pikotools/textstream/textstream.h
timezone.o: ../../../pikotools/convert/convert.h
timezone.o: ../../../pikotools/convert/inttostr.h
timezone.o: ../../../pikotools/convert/strtoint.h
timezone.o: ../../../pikotools/convert/text.h
timezone.o: ../../../pikotools/membuffer/membuffer.h
timezone.o: ../../../pikotools/textstream/types.h
timezone.o: ../../../pikotools/utf8/utf8.h
@ -3531,6 +3611,8 @@ tinymce.o: ../../../winix/winixd/core/requesttypes.h
tinymce.o: ../../../pikotools/textstream/textstream.h
tinymce.o: ../../../pikotools/convert/convert.h
tinymce.o: ../../../pikotools/convert/inttostr.h
tinymce.o: ../../../pikotools/convert/strtoint.h
tinymce.o: ../../../pikotools/convert/text.h
tinymce.o: ../../../pikotools/membuffer/membuffer.h
tinymce.o: ../../../pikotools/textstream/types.h
tinymce.o: ../../../pikotools/utf8/utf8.h
@ -3611,6 +3693,8 @@ uname.o: ../../../winix/winixd/core/requesttypes.h
uname.o: ../../../pikotools/textstream/textstream.h
uname.o: ../../../pikotools/convert/convert.h
uname.o: ../../../pikotools/convert/inttostr.h
uname.o: ../../../pikotools/convert/strtoint.h
uname.o: ../../../pikotools/convert/text.h
uname.o: ../../../pikotools/membuffer/membuffer.h
uname.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
uname.o: ../../../winix/winixd/core/winix_const.h
@ -3688,6 +3772,8 @@ upload.o: ../../../winix/winixd/core/requesttypes.h
upload.o: ../../../pikotools/textstream/textstream.h
upload.o: ../../../pikotools/convert/convert.h
upload.o: ../../../pikotools/convert/inttostr.h
upload.o: ../../../pikotools/convert/strtoint.h
upload.o: ../../../pikotools/convert/text.h
upload.o: ../../../pikotools/membuffer/membuffer.h
upload.o: ../../../pikotools/textstream/types.h
upload.o: ../../../pikotools/utf8/utf8.h
@ -3785,6 +3871,8 @@ uptime.o: ../../../winix/winixd/core/requesttypes.h
uptime.o: ../../../pikotools/textstream/textstream.h
uptime.o: ../../../pikotools/convert/convert.h
uptime.o: ../../../pikotools/convert/inttostr.h
uptime.o: ../../../pikotools/convert/strtoint.h
uptime.o: ../../../pikotools/convert/text.h
uptime.o: ../../../pikotools/membuffer/membuffer.h
uptime.o: ../../../pikotools/textstream/types.h
uptime.o: ../../../pikotools/utf8/utf8.h
@ -3864,6 +3952,8 @@ vim.o: ../../../winix/winixd/core/requesttypes.h
vim.o: ../../../pikotools/textstream/textstream.h
vim.o: ../../../pikotools/convert/convert.h
vim.o: ../../../pikotools/convert/inttostr.h
vim.o: ../../../pikotools/convert/strtoint.h
vim.o: ../../../pikotools/convert/text.h
vim.o: ../../../pikotools/membuffer/membuffer.h
vim.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
vim.o: ../../../winix/winixd/core/winix_const.h
@ -3934,6 +4024,8 @@ who.o: ../../../winix/winixd/core/requesttypes.h
who.o: ../../../pikotools/textstream/textstream.h
who.o: ../../../pikotools/convert/convert.h
who.o: ../../../pikotools/convert/inttostr.h
who.o: ../../../pikotools/convert/strtoint.h
who.o: ../../../pikotools/convert/text.h
who.o: ../../../pikotools/membuffer/membuffer.h
who.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
who.o: ../../../winix/winixd/core/winix_const.h

View File

@ -1 +1 @@
o = account.o adduser.o cat.o chmod.o chown.o ckeditor.o cp.o default.o download.o emacs.o env.o functionbase.o functionparser.o functions.o imgcrop.o ipban.o last.o ln.o locale.o login.o logout.o ls.o man.o meta.o mkdir.o mount.o mv.o nicedit.o node.o passwd.o priv.o privchanger.o pw.o reload.o rm.o rmuser.o run.o sort.o specialdefault.o stat.o subject.o template.o timezone.o tinymce.o uname.o upload.o uptime.o vim.o who.o
o = account.o adduser.o cat.o chmod.o chown.o ckeditor.o cp.o default.o download.o emacs.o env.o functionbase.o functionparser.o functions.o imgcrop.o ipban.o last.o ln.o locale.o login.o logout.o ls.o man.o meta.o mkdir.o mount.o mv.o nicedit.o node.o passwd.o priv.o privchanger.o pw.o reload.o rm.o rmuser.o run.o sort.o specialdefault.o stat.o subject.o template.o timezone.o tinymce.o uname.o upload.o uptime.o vim.o who.o

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2013-2014, Tomasz Sowa
* Copyright (c) 2013-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -55,7 +55,7 @@ Account::Account()
bool Account::ActivateAccount(User * puser, long code, bool use_ses_log)
{
std::wstring * user_code_str = puser->aenv.GetValue(L"activation_code");
std::wstring * user_code_str = puser->aenv.GetFirstValue(L"activation_code");
if( user_code_str )
{

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2012-2014, Tomasz Sowa
* Copyright (c) 2012-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -76,7 +76,6 @@ bool Env::Parse(const std::wstring & env_str)
{
space.Clear();
conf_parser.SetSpace(space);
conf_parser.SplitSingle(true);
return (conf_parser.ParseString(env_str) == PT::SpaceParser::ok);
}

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2015, Tomasz Sowa
* Copyright (c) 2011-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -64,7 +64,6 @@ bool Meta::Parse(const std::wstring & meta_str)
{
space.Clear();
conf_parser.SetSpace(space);
conf_parser.SplitSingle(true);
return (conf_parser.ParseString(meta_str) == PT::SpaceParser::ok);
}

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -189,7 +189,7 @@ return result;
bool Passwd::ResetPassword(User * puser, long code, bool use_ses_log, bool only_check_access)
{
std::wstring * user_code_str = puser->aenv.GetValue(L"password_change_code");
std::wstring * user_code_str = puser->aenv.GetFirstValue(L"password_change_code");
if( user_code_str )
{

View File

@ -9,6 +9,8 @@ main.o: ../../../winix/winixd/core/requesttypes.h
main.o: ../../../pikotools/textstream/textstream.h
main.o: ../../../pikotools/convert/convert.h
main.o: ../../../pikotools/convert/inttostr.h
main.o: ../../../pikotools/convert/strtoint.h
main.o: ../../../pikotools/convert/text.h
main.o: ../../../pikotools/membuffer/membuffer.h
main.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
main.o: ../../../winix/winixd/core/winix_const.h

View File

@ -1 +1 @@
o = main.o
o = main.o

View File

@ -8,6 +8,8 @@ notify.o: ../../../pikotools/textstream/textstream.h
notify.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
notify.o: ../../../pikotools/convert/convert.h
notify.o: ../../../pikotools/convert/inttostr.h
notify.o: ../../../pikotools/convert/strtoint.h
notify.o: ../../../pikotools/convert/text.h ../../../pikotools/convert/misc.h
notify.o: ../../../pikotools/membuffer/membuffer.h
notify.o: ../../../pikotools/textstream/types.h
notify.o: ../../../winix/winixd/templates/patterns.h
@ -19,11 +21,9 @@ notify.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
notify.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h
notify.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
notify.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h
notify.o: ../../../winix/winixd/templates/misc.h
notify.o: ../../../winix/winixd/templates/htmltextstream.h
notify.o: ../../../winix/winixd/core/textstream.h notifythread.h
notify.o: ../../../winix/winixd/core/basethread.h
notify.o: notifythread.h ../../../winix/winixd/core/basethread.h
notify.o: ../../../winix/winixd/core/synchro.h templatesnotify.h
notify.o: ../../../winix/winixd/core/textstream.h
notify.o: ../../../winix/winixd/core/config.h
notify.o: ../../../winix/winixd/core/htmlfilter.h
notify.o: ../../../winix/winixd/core/users.h
@ -61,6 +61,7 @@ notify.o: ../../../winix/winixd/templates/patterncacher.h
notify.o: ../../../winix/winixd/templates/indexpatterns.h
notify.o: ../../../winix/winixd/templates/patterns.h
notify.o: ../../../winix/winixd/templates/changepatterns.h
notify.o: ../../../winix/winixd/templates/htmltextstream.h
notify.o: ../../../winix/winixd/core/cur.h
notify.o: ../../../winix/winixd/core/system.h
notify.o: ../../../winix/winixd/core/job.h
@ -144,6 +145,9 @@ notifypool.o: ../../../pikotools/textstream/textstream.h
notifypool.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
notifypool.o: ../../../pikotools/convert/convert.h
notifypool.o: ../../../pikotools/convert/inttostr.h
notifypool.o: ../../../pikotools/convert/strtoint.h
notifypool.o: ../../../pikotools/convert/text.h
notifypool.o: ../../../pikotools/convert/misc.h
notifypool.o: ../../../pikotools/membuffer/membuffer.h
notifypool.o: ../../../pikotools/textstream/types.h
notifythread.o: notifythread.h ../../../winix/winixd/core/basethread.h
@ -156,15 +160,14 @@ notifythread.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
notifythread.o: ../../../ezc/src/outstreams.h
notifythread.o: ../../../ezc/src/patternparser.h
notifythread.o: ../../../winix/winixd/core/textstream.h
notifythread.o: ../../../winix/winixd/templates/misc.h
notifythread.o: ../../../winix/winixd/templates/localefilter.h
notifythread.o: ../../../winix/winixd/templates/locale.h
notifythread.o: ../../../winix/winixd/templates/htmltextstream.h
notifythread.o: ../../../pikotools/convert/misc.h
notifythread.o: ../../../pikotools/convert/text.h
notifythread.o: ../../../pikotools/space/space.h
notifythread.o: ../../../pikotools/date/date.h
notifythread.o: ../../../pikotools/textstream/textstream.h
notifythread.o: ../../../pikotools/convert/convert.h
notifythread.o: ../../../pikotools/convert/inttostr.h
notifythread.o: ../../../pikotools/convert/strtoint.h
notifythread.o: ../../../pikotools/membuffer/membuffer.h
notifythread.o: ../../../pikotools/textstream/types.h notifypool.h
notifythread.o: ../../../winix/winixd/templates/locale.h
@ -206,6 +209,8 @@ notifythread.o: ../../../winix/winixd/core/group.h
notifythread.o: ../../../winix/winixd/core/dircontainer.h
notifythread.o: ../../../winix/winixd/core/ugcontainer.h
notifythread.o: ../../../winix/winixd/templates/patterns.h
notifythread.o: ../../../winix/winixd/templates/locale.h
notifythread.o: ../../../winix/winixd/templates/localefilter.h
templatesnotify.o: templatesnotify.h ../../../ezc/src/ezc.h
templatesnotify.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
templatesnotify.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h
@ -215,15 +220,14 @@ templatesnotify.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
templatesnotify.o: ../../../ezc/src/outstreams.h
templatesnotify.o: ../../../ezc/src/patternparser.h
templatesnotify.o: ../../../winix/winixd/core/textstream.h
templatesnotify.o: ../../../winix/winixd/templates/misc.h
templatesnotify.o: ../../../winix/winixd/templates/localefilter.h
templatesnotify.o: ../../../winix/winixd/templates/locale.h
templatesnotify.o: ../../../winix/winixd/templates/htmltextstream.h
templatesnotify.o: ../../../pikotools/convert/misc.h
templatesnotify.o: ../../../pikotools/convert/text.h
templatesnotify.o: ../../../pikotools/space/space.h
templatesnotify.o: ../../../pikotools/date/date.h
templatesnotify.o: ../../../pikotools/textstream/textstream.h
templatesnotify.o: ../../../pikotools/convert/convert.h
templatesnotify.o: ../../../pikotools/convert/inttostr.h
templatesnotify.o: ../../../pikotools/convert/strtoint.h
templatesnotify.o: ../../../pikotools/membuffer/membuffer.h
templatesnotify.o: ../../../pikotools/textstream/types.h notifypool.h
templatesnotify.o: ../../../winix/winixd/templates/locale.h
@ -305,6 +309,7 @@ templatesnotify.o: ../../../winix/winixd/functions/emacs.h
templatesnotify.o: ../../../winix/winixd/functions/env.h
templatesnotify.o: ../../../winix/winixd/functions/imgcrop.h
templatesnotify.o: ../../../winix/winixd/functions/last.h
templatesnotify.o: ../../../winix/winixd/templates/locale.h
templatesnotify.o: ../../../winix/winixd/functions/login.h
templatesnotify.o: ../../../winix/winixd/functions/logout.h
templatesnotify.o: ../../../winix/winixd/functions/ln.h
@ -338,6 +343,8 @@ templatesnotify.o: ../../../winix/winixd/templates/patterncacher.h
templatesnotify.o: ../../../winix/winixd/templates/indexpatterns.h
templatesnotify.o: ../../../winix/winixd/templates/patterns.h
templatesnotify.o: ../../../winix/winixd/templates/changepatterns.h
templatesnotify.o: ../../../winix/winixd/templates/htmltextstream.h
templatesnotify.o: ../../../winix/winixd/templates/localefilter.h
templatesnotify.o: ../../../winix/winixd/core/sessionmanager.h
templatesnotify.o: ../../../winix/winixd/core/sessioncontainer.h
templatesnotify.o: ../../../winix/winixd/core/ipbancontainer.h

View File

@ -1 +1 @@
o = notify.o notifypool.o notifythread.o templatesnotify.o
o = notify.o notifypool.o notifythread.o templatesnotify.o

View File

@ -13,6 +13,8 @@ edb.o: ../../../../winix/winixd/core/requesttypes.h
edb.o: ../../../../pikotools/textstream/textstream.h
edb.o: ../../../../pikotools/convert/convert.h
edb.o: ../../../../pikotools/convert/inttostr.h
edb.o: ../../../../pikotools/convert/strtoint.h
edb.o: ../../../../pikotools/convert/text.h
edb.o: ../../../../pikotools/membuffer/membuffer.h
edb.o: ../../../../pikotools/textstream/types.h
edb.o: ../../../../pikotools/utf8/utf8.h
@ -94,12 +96,17 @@ exportinfo.o: ../../../../winix/winixd/core/logmanipulators.h
exportinfo.o: ../../../../pikotools/textstream/textstream.h
exportinfo.o: ../../../../pikotools/convert/convert.h
exportinfo.o: ../../../../pikotools/convert/inttostr.h
exportinfo.o: ../../../../pikotools/convert/strtoint.h
exportinfo.o: ../../../../pikotools/convert/text.h
exportinfo.o: ../../../../winix/winixd/core/misc.h
exportinfo.o: ../../../../winix/winixd/core/requesttypes.h
exportinfo.o: ../../../../pikotools/utf8/utf8.h
exportinfo.o: ../../../../winix/winixd/core/winix_const.h
exportinfo.o: ../../../../pikotools/membuffer/membuffer.h
exportinfo.o: ../../../../pikotools/textstream/types.h
exportinfo.o: ../../../../winix/winixd/core/slog.h
exportinfo.o: ../../../../winix/winixd/core/cur.h
exportinfo.o: ../../../../winix/winixd/core/request.h
exportinfo.o: ../../../../winix/winixd/core/requesttypes.h
exportinfo.o: ../../../../winix/winixd/core/error.h
exportinfo.o: ../../../../winix/winixd/core/config.h
exportinfo.o: ../../../../pikotools/space/spaceparser.h
@ -107,9 +114,6 @@ exportinfo.o: ../../../../pikotools/space/space.h
exportinfo.o: ../../../../winix/winixd/core/htmlfilter.h
exportinfo.o: ../../../../winix/winixd/templates/htmltextstream.h
exportinfo.o: ../../../../winix/winixd/core/textstream.h
exportinfo.o: ../../../../winix/winixd/core/misc.h
exportinfo.o: ../../../../pikotools/utf8/utf8.h
exportinfo.o: ../../../../winix/winixd/core/winix_const.h
exportinfo.o: ../../../../pikotools/space/spacetojson.h
exportinfo.o: ../../../../ezc/src/outstreams.h
exportinfo.o: ../../../../winix/winixd/core/session.h
@ -165,10 +169,13 @@ exportthread.o: ../../../../winix/winixd/core/requesttypes.h
exportthread.o: ../../../../pikotools/textstream/textstream.h
exportthread.o: ../../../../pikotools/convert/convert.h
exportthread.o: ../../../../pikotools/convert/inttostr.h
exportthread.o: ../../../../pikotools/membuffer/membuffer.h
exportthread.o: ../../../../pikotools/textstream/types.h
exportthread.o: ../../../../pikotools/convert/strtoint.h
exportthread.o: ../../../../pikotools/convert/text.h
exportthread.o: ../../../../winix/winixd/core/misc.h
exportthread.o: ../../../../pikotools/utf8/utf8.h
exportthread.o: ../../../../winix/winixd/core/winix_const.h
exportthread.o: ../../../../pikotools/membuffer/membuffer.h
exportthread.o: ../../../../pikotools/textstream/types.h
funexport.o: funexport.h ../../../../winix/winixd/functions/functionbase.h
funexport.o: ../../../../winix/winixd/core/item.h
funexport.o: ../../../../winix/winixd/db/db.h
@ -188,13 +195,18 @@ funexport.o: ../../../../winix/winixd/core/logmanipulators.h
funexport.o: ../../../../pikotools/textstream/textstream.h
funexport.o: ../../../../pikotools/convert/convert.h
funexport.o: ../../../../pikotools/convert/inttostr.h
funexport.o: ../../../../pikotools/convert/strtoint.h
funexport.o: ../../../../pikotools/convert/text.h
funexport.o: ../../../../winix/winixd/core/misc.h
funexport.o: ../../../../winix/winixd/core/item.h
funexport.o: ../../../../winix/winixd/core/requesttypes.h
funexport.o: ../../../../pikotools/utf8/utf8.h
funexport.o: ../../../../winix/winixd/core/winix_const.h
funexport.o: ../../../../pikotools/membuffer/membuffer.h
funexport.o: ../../../../pikotools/textstream/types.h
funexport.o: ../../../../winix/winixd/core/slog.h
funexport.o: ../../../../winix/winixd/core/cur.h
funexport.o: ../../../../winix/winixd/core/request.h
funexport.o: ../../../../winix/winixd/core/requesttypes.h
funexport.o: ../../../../winix/winixd/core/item.h
funexport.o: ../../../../winix/winixd/core/error.h
funexport.o: ../../../../winix/winixd/core/config.h
funexport.o: ../../../../pikotools/space/spaceparser.h
@ -202,9 +214,6 @@ funexport.o: ../../../../pikotools/space/space.h
funexport.o: ../../../../winix/winixd/core/htmlfilter.h
funexport.o: ../../../../winix/winixd/templates/htmltextstream.h
funexport.o: ../../../../winix/winixd/core/textstream.h
funexport.o: ../../../../winix/winixd/core/misc.h
funexport.o: ../../../../pikotools/utf8/utf8.h
funexport.o: ../../../../winix/winixd/core/winix_const.h
funexport.o: ../../../../pikotools/space/spacetojson.h
funexport.o: ../../../../ezc/src/outstreams.h
funexport.o: ../../../../winix/winixd/core/session.h
@ -268,13 +277,18 @@ init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/date/date.h
init.o: ../../../../pikotools/convert/convert.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../pikotools/convert/strtoint.h
init.o: ../../../../pikotools/convert/text.h
init.o: ../../../../winix/winixd/core/misc.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../pikotools/utf8/utf8.h
init.o: ../../../../winix/winixd/core/winix_const.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../winix/winixd/core/slog.h
init.o: ../../../../winix/winixd/core/cur.h
init.o: ../../../../winix/winixd/core/request.h
init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/error.h
init.o: ../../../../winix/winixd/core/config.h
init.o: ../../../../pikotools/space/spaceparser.h
@ -282,9 +296,6 @@ init.o: ../../../../pikotools/space/space.h
init.o: ../../../../winix/winixd/core/htmlfilter.h
init.o: ../../../../winix/winixd/templates/htmltextstream.h
init.o: ../../../../winix/winixd/core/textstream.h
init.o: ../../../../winix/winixd/core/misc.h
init.o: ../../../../pikotools/utf8/utf8.h
init.o: ../../../../winix/winixd/core/winix_const.h
init.o: ../../../../pikotools/space/spacetojson.h
init.o: ../../../../ezc/src/outstreams.h
init.o: ../../../../winix/winixd/core/session.h

View File

@ -1 +1 @@
o = edb.o exportinfo.o exportthread.o funexport.o init.o
o = edb.o exportinfo.o exportthread.o funexport.o init.o

View File

@ -15,6 +15,8 @@ gallery.o: ../../../../winix/winixd/core/requesttypes.h
gallery.o: ../../../../pikotools/textstream/textstream.h
gallery.o: ../../../../pikotools/convert/convert.h
gallery.o: ../../../../pikotools/convert/inttostr.h
gallery.o: ../../../../pikotools/convert/strtoint.h
gallery.o: ../../../../pikotools/convert/text.h
gallery.o: ../../../../pikotools/membuffer/membuffer.h
gallery.o: ../../../../pikotools/textstream/types.h
gallery.o: ../../../../pikotools/utf8/utf8.h
@ -103,6 +105,8 @@ init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../pikotools/textstream/textstream.h
init.o: ../../../../pikotools/convert/convert.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../pikotools/convert/strtoint.h
init.o: ../../../../pikotools/convert/text.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/utf8/utf8.h
@ -250,6 +254,8 @@ templates.o: ../../../../winix/winixd/core/requesttypes.h
templates.o: ../../../../pikotools/textstream/textstream.h
templates.o: ../../../../pikotools/convert/convert.h
templates.o: ../../../../pikotools/convert/inttostr.h
templates.o: ../../../../pikotools/convert/strtoint.h
templates.o: ../../../../pikotools/convert/text.h
templates.o: ../../../../pikotools/membuffer/membuffer.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../pikotools/utf8/utf8.h

View File

@ -1 +1 @@
o = gallery.o galleryinfo.o init.o templates.o
o = gallery.o galleryinfo.o init.o templates.o

View File

@ -23,6 +23,8 @@ groupinfo.o: ../../../../winix/winixd/core/requesttypes.h
groupinfo.o: ../../../../pikotools/textstream/textstream.h
groupinfo.o: ../../../../pikotools/convert/convert.h
groupinfo.o: ../../../../pikotools/convert/inttostr.h
groupinfo.o: ../../../../pikotools/convert/strtoint.h
groupinfo.o: ../../../../pikotools/convert/text.h
groupinfo.o: ../../../../pikotools/membuffer/membuffer.h
groupinfo.o: ../../../../pikotools/textstream/types.h
groupinfo.o: ../../../../pikotools/utf8/utf8.h
@ -95,13 +97,18 @@ init.o: ../../../../pikotools/textstream/textstream.h
init.o: ../../../../pikotools/space/space.h ../../../../pikotools/date/date.h
init.o: ../../../../pikotools/convert/convert.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../pikotools/convert/strtoint.h
init.o: ../../../../pikotools/convert/text.h
init.o: ../../../../winix/winixd/core/misc.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../pikotools/utf8/utf8.h
init.o: ../../../../winix/winixd/core/winix_const.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../winix/winixd/core/slog.h
init.o: ../../../../winix/winixd/core/cur.h
init.o: ../../../../winix/winixd/core/request.h
init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/error.h
init.o: ../../../../winix/winixd/core/config.h
init.o: ../../../../pikotools/space/spaceparser.h
@ -110,9 +117,6 @@ init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../winix/winixd/core/htmlfilter.h
init.o: ../../../../winix/winixd/templates/htmltextstream.h
init.o: ../../../../winix/winixd/core/textstream.h
init.o: ../../../../winix/winixd/core/misc.h
init.o: ../../../../pikotools/utf8/utf8.h
init.o: ../../../../winix/winixd/core/winix_const.h
init.o: ../../../../pikotools/space/spacetojson.h
init.o: ../../../../ezc/src/outstreams.h
init.o: ../../../../winix/winixd/core/session.h
@ -243,6 +247,8 @@ templates.o: ../../../../pikotools/space/space.h
templates.o: ../../../../pikotools/date/date.h
templates.o: ../../../../pikotools/convert/convert.h
templates.o: ../../../../pikotools/convert/inttostr.h
templates.o: ../../../../pikotools/convert/strtoint.h
templates.o: ../../../../pikotools/convert/text.h
templates.o: ../../../../pikotools/membuffer/membuffer.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../winix/winixd/core/winix_const.h

View File

@ -1 +1 @@
o = groupinfo.o groups.o init.o templates.o
o = groupinfo.o groups.o init.o templates.o

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -94,7 +94,7 @@ size_t i, v;
// loop through all values in the group
for(v=0 ; v<group.spaces.size() ; )
{
std::wstring * vali = group.spaces[v]->GetValue(key);
std::wstring * vali = group.spaces[v]->GetFirstValue(key);
if( vali )
{
@ -199,7 +199,7 @@ const std::wstring & Groups::GetOption(size_t seti, size_t groupi, size_t valuei
PT::Space & value = *groups.spaces[groupi];
if( valuei < value.spaces.size() )
return value.spaces[valuei]->Text(option);
return value.spaces[valuei]->TextRef(option);
}
}

View File

@ -1,96 +1,5 @@
# DO NOT DELETE
funregistermail.o: funregistermail.h
funregistermail.o: ../../../../winix/winixd/functions/functionbase.h
funregistermail.o: ../../../../winix/winixd/core/item.h
funregistermail.o: ../../../../pikotools/space/space.h
funregistermail.o: ../../../../pikotools/textstream/types.h
funregistermail.o: ../../../../pikotools/date/date.h
funregistermail.o: ../../../../winix/winixd/db/db.h
funregistermail.o: ../../../../winix/winixd/db/dbbase.h
funregistermail.o: ../../../../winix/winixd/db/dbconn.h
funregistermail.o: ../../../../winix/winixd/db/dbtextstream.h
funregistermail.o: ../../../../winix/winixd/core/textstream.h
funregistermail.o: ../../../../winix/winixd/core/misc.h
funregistermail.o: ../../../../winix/winixd/core/item.h
funregistermail.o: ../../../../winix/winixd/core/requesttypes.h
funregistermail.o: ../../../../pikotools/textstream/textstream.h
funregistermail.o: ../../../../pikotools/convert/convert.h
funregistermail.o: ../../../../pikotools/convert/inttostr.h
funregistermail.o: ../../../../pikotools/membuffer/membuffer.h
funregistermail.o: ../../../../pikotools/textstream/types.h
funregistermail.o: ../../../../pikotools/utf8/utf8.h
funregistermail.o: ../../../../winix/winixd/core/winix_const.h
funregistermail.o: ../../../../winix/winixd/core/error.h
funregistermail.o: ../../../../pikotools/space/spaceparser.h
funregistermail.o: ../../../../pikotools/space/space.h
funregistermail.o: ../../../../winix/winixd/db/dbitemquery.h
funregistermail.o: ../../../../winix/winixd/db/dbitemcolumns.h
funregistermail.o: ../../../../winix/winixd/core/user.h
funregistermail.o: ../../../../winix/winixd/core/group.h
funregistermail.o: ../../../../winix/winixd/core/dircontainer.h
funregistermail.o: ../../../../winix/winixd/core/ugcontainer.h
funregistermail.o: ../../../../winix/winixd/core/log.h
funregistermail.o: ../../../../winix/winixd/core/textstream.h
funregistermail.o: ../../../../winix/winixd/core/logmanipulators.h
funregistermail.o: ../../../../winix/winixd/core/slog.h
funregistermail.o: ../../../../winix/winixd/core/cur.h
funregistermail.o: ../../../../winix/winixd/core/request.h
funregistermail.o: ../../../../winix/winixd/core/error.h
funregistermail.o: ../../../../winix/winixd/core/config.h
funregistermail.o: ../../../../winix/winixd/core/htmlfilter.h
funregistermail.o: ../../../../winix/winixd/templates/htmltextstream.h
funregistermail.o: ../../../../pikotools/space/spacetojson.h
funregistermail.o: ../../../../ezc/src/outstreams.h
funregistermail.o: ../../../../winix/winixd/core/session.h
funregistermail.o: ../../../../winix/winixd/core/user.h
funregistermail.o: ../../../../winix/winixd/core/plugindata.h
funregistermail.o: ../../../../winix/winixd/core/rebus.h
funregistermail.o: ../../../../winix/winixd/core/ipban.h
funregistermail.o: ../../../../winix/winixd/core/mount.h
funregistermail.o: ../../../../winix/winixd/templates/locale.h
funregistermail.o: ../../../../winix/winixd/core/request.h
funregistermail.o: ../../../../winix/winixd/core/config.h
funregistermail.o: ../../../../winix/winixd/core/system.h
funregistermail.o: ../../../../winix/winixd/core/job.h
funregistermail.o: ../../../../winix/winixd/core/basethread.h
funregistermail.o: ../../../../winix/winixd/core/synchro.h
funregistermail.o: ../../../../winix/winixd/core/dirs.h
funregistermail.o: ../../../../winix/winixd/core/dircontainer.h
funregistermail.o: ../../../../winix/winixd/notify/notify.h
funregistermail.o: ../../../../winix/winixd/notify/notifypool.h
funregistermail.o: ../../../../winix/winixd/templates/patterns.h
funregistermail.o: ../../../../winix/winixd/templates/locale.h
funregistermail.o: ../../../../winix/winixd/templates/localefilter.h
funregistermail.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
funregistermail.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
funregistermail.o: ../../../../ezc/src/functions.h
funregistermail.o: ../../../../ezc/src/funinfo.h
funregistermail.o: ../../../../ezc/src/objects.h
funregistermail.o: ../../../../ezc/src/pattern.h
funregistermail.o: ../../../../ezc/src/patternparser.h
funregistermail.o: ../../../../winix/winixd/notify/notifythread.h
funregistermail.o: ../../../../winix/winixd/core/basethread.h
funregistermail.o: ../../../../winix/winixd/notify/templatesnotify.h
funregistermail.o: ../../../../winix/winixd/core/users.h
funregistermail.o: ../../../../winix/winixd/core/ugcontainer.h
funregistermail.o: ../../../../winix/winixd/core/lastcontainer.h
funregistermail.o: ../../../../winix/winixd/core/mounts.h
funregistermail.o: ../../../../winix/winixd/core/mountparser.h
funregistermail.o: ../../../../winix/winixd/core/crypt.h
funregistermail.o: ../../../../winix/winixd/core/run.h
funregistermail.o: ../../../../winix/winixd/core/users.h
funregistermail.o: ../../../../winix/winixd/core/groups.h
funregistermail.o: ../../../../winix/winixd/core/group.h
funregistermail.o: ../../../../winix/winixd/core/loadavg.h
funregistermail.o: ../../../../winix/winixd/core/image.h
funregistermail.o: ../../../../winix/winixd/core/threadmanager.h
funregistermail.o: ../../../../winix/winixd/core/timezones.h
funregistermail.o: ../../../../winix/winixd/core/timezone.h
funregistermail.o: ../../../../winix/winixd/core/synchro.h
funregistermail.o: registermail_info.h mdb.h
funregistermail.o: ../../../../winix/winixd/db/dbbase.h
funregistermail.o: ../../../../winix/winixd/core/dirs.h
funregistermail_showusers.o: funregistermail_showusers.h
funregistermail_showusers.o: ../../../../winix/winixd/functions/functionbase.h
funregistermail_showusers.o: ../../../../winix/winixd/core/item.h
@ -108,6 +17,8 @@ funregistermail_showusers.o: ../../../../winix/winixd/core/requesttypes.h
funregistermail_showusers.o: ../../../../pikotools/textstream/textstream.h
funregistermail_showusers.o: ../../../../pikotools/convert/convert.h
funregistermail_showusers.o: ../../../../pikotools/convert/inttostr.h
funregistermail_showusers.o: ../../../../pikotools/convert/strtoint.h
funregistermail_showusers.o: ../../../../pikotools/convert/text.h
funregistermail_showusers.o: ../../../../pikotools/membuffer/membuffer.h
funregistermail_showusers.o: ../../../../pikotools/textstream/types.h
funregistermail_showusers.o: ../../../../pikotools/utf8/utf8.h
@ -184,6 +95,99 @@ funregistermail_showusers.o: ../../../../winix/winixd/core/synchro.h
funregistermail_showusers.o: registermail_info.h mdb.h
funregistermail_showusers.o: ../../../../winix/winixd/db/dbbase.h
funregistermail_showusers.o: ../../../../winix/winixd/core/dirs.h
funregistermail.o: funregistermail.h
funregistermail.o: ../../../../winix/winixd/functions/functionbase.h
funregistermail.o: ../../../../winix/winixd/core/item.h
funregistermail.o: ../../../../pikotools/space/space.h
funregistermail.o: ../../../../pikotools/textstream/types.h
funregistermail.o: ../../../../pikotools/date/date.h
funregistermail.o: ../../../../winix/winixd/db/db.h
funregistermail.o: ../../../../winix/winixd/db/dbbase.h
funregistermail.o: ../../../../winix/winixd/db/dbconn.h
funregistermail.o: ../../../../winix/winixd/db/dbtextstream.h
funregistermail.o: ../../../../winix/winixd/core/textstream.h
funregistermail.o: ../../../../winix/winixd/core/misc.h
funregistermail.o: ../../../../winix/winixd/core/item.h
funregistermail.o: ../../../../winix/winixd/core/requesttypes.h
funregistermail.o: ../../../../pikotools/textstream/textstream.h
funregistermail.o: ../../../../pikotools/convert/convert.h
funregistermail.o: ../../../../pikotools/convert/inttostr.h
funregistermail.o: ../../../../pikotools/convert/strtoint.h
funregistermail.o: ../../../../pikotools/convert/text.h
funregistermail.o: ../../../../pikotools/membuffer/membuffer.h
funregistermail.o: ../../../../pikotools/textstream/types.h
funregistermail.o: ../../../../pikotools/utf8/utf8.h
funregistermail.o: ../../../../winix/winixd/core/winix_const.h
funregistermail.o: ../../../../winix/winixd/core/error.h
funregistermail.o: ../../../../pikotools/space/spaceparser.h
funregistermail.o: ../../../../pikotools/space/space.h
funregistermail.o: ../../../../winix/winixd/db/dbitemquery.h
funregistermail.o: ../../../../winix/winixd/db/dbitemcolumns.h
funregistermail.o: ../../../../winix/winixd/core/user.h
funregistermail.o: ../../../../winix/winixd/core/group.h
funregistermail.o: ../../../../winix/winixd/core/dircontainer.h
funregistermail.o: ../../../../winix/winixd/core/ugcontainer.h
funregistermail.o: ../../../../winix/winixd/core/log.h
funregistermail.o: ../../../../winix/winixd/core/textstream.h
funregistermail.o: ../../../../winix/winixd/core/logmanipulators.h
funregistermail.o: ../../../../winix/winixd/core/slog.h
funregistermail.o: ../../../../winix/winixd/core/cur.h
funregistermail.o: ../../../../winix/winixd/core/request.h
funregistermail.o: ../../../../winix/winixd/core/error.h
funregistermail.o: ../../../../winix/winixd/core/config.h
funregistermail.o: ../../../../winix/winixd/core/htmlfilter.h
funregistermail.o: ../../../../winix/winixd/templates/htmltextstream.h
funregistermail.o: ../../../../pikotools/space/spacetojson.h
funregistermail.o: ../../../../ezc/src/outstreams.h
funregistermail.o: ../../../../winix/winixd/core/session.h
funregistermail.o: ../../../../winix/winixd/core/user.h
funregistermail.o: ../../../../winix/winixd/core/plugindata.h
funregistermail.o: ../../../../winix/winixd/core/rebus.h
funregistermail.o: ../../../../winix/winixd/core/ipban.h
funregistermail.o: ../../../../winix/winixd/core/mount.h
funregistermail.o: ../../../../winix/winixd/templates/locale.h
funregistermail.o: ../../../../winix/winixd/core/request.h
funregistermail.o: ../../../../winix/winixd/core/config.h
funregistermail.o: ../../../../winix/winixd/core/system.h
funregistermail.o: ../../../../winix/winixd/core/job.h
funregistermail.o: ../../../../winix/winixd/core/basethread.h
funregistermail.o: ../../../../winix/winixd/core/synchro.h
funregistermail.o: ../../../../winix/winixd/core/dirs.h
funregistermail.o: ../../../../winix/winixd/core/dircontainer.h
funregistermail.o: ../../../../winix/winixd/notify/notify.h
funregistermail.o: ../../../../winix/winixd/notify/notifypool.h
funregistermail.o: ../../../../winix/winixd/templates/patterns.h
funregistermail.o: ../../../../winix/winixd/templates/locale.h
funregistermail.o: ../../../../winix/winixd/templates/localefilter.h
funregistermail.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
funregistermail.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
funregistermail.o: ../../../../ezc/src/functions.h
funregistermail.o: ../../../../ezc/src/funinfo.h
funregistermail.o: ../../../../ezc/src/objects.h
funregistermail.o: ../../../../ezc/src/pattern.h
funregistermail.o: ../../../../ezc/src/patternparser.h
funregistermail.o: ../../../../winix/winixd/notify/notifythread.h
funregistermail.o: ../../../../winix/winixd/core/basethread.h
funregistermail.o: ../../../../winix/winixd/notify/templatesnotify.h
funregistermail.o: ../../../../winix/winixd/core/users.h
funregistermail.o: ../../../../winix/winixd/core/ugcontainer.h
funregistermail.o: ../../../../winix/winixd/core/lastcontainer.h
funregistermail.o: ../../../../winix/winixd/core/mounts.h
funregistermail.o: ../../../../winix/winixd/core/mountparser.h
funregistermail.o: ../../../../winix/winixd/core/crypt.h
funregistermail.o: ../../../../winix/winixd/core/run.h
funregistermail.o: ../../../../winix/winixd/core/users.h
funregistermail.o: ../../../../winix/winixd/core/groups.h
funregistermail.o: ../../../../winix/winixd/core/group.h
funregistermail.o: ../../../../winix/winixd/core/loadavg.h
funregistermail.o: ../../../../winix/winixd/core/image.h
funregistermail.o: ../../../../winix/winixd/core/threadmanager.h
funregistermail.o: ../../../../winix/winixd/core/timezones.h
funregistermail.o: ../../../../winix/winixd/core/timezone.h
funregistermail.o: ../../../../winix/winixd/core/synchro.h
funregistermail.o: registermail_info.h mdb.h
funregistermail.o: ../../../../winix/winixd/db/dbbase.h
funregistermail.o: ../../../../winix/winixd/core/dirs.h
init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/textstream.h
init.o: ../../../../winix/winixd/core/logmanipulators.h
@ -193,13 +197,18 @@ init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/date/date.h
init.o: ../../../../pikotools/convert/convert.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../pikotools/convert/strtoint.h
init.o: ../../../../pikotools/convert/text.h
init.o: ../../../../winix/winixd/core/misc.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../pikotools/utf8/utf8.h
init.o: ../../../../winix/winixd/core/winix_const.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../winix/winixd/core/slog.h
init.o: ../../../../winix/winixd/core/cur.h
init.o: ../../../../winix/winixd/core/request.h
init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/error.h
init.o: ../../../../winix/winixd/core/config.h
init.o: ../../../../pikotools/space/spaceparser.h
@ -207,9 +216,6 @@ init.o: ../../../../pikotools/space/space.h
init.o: ../../../../winix/winixd/core/htmlfilter.h
init.o: ../../../../winix/winixd/templates/htmltextstream.h
init.o: ../../../../winix/winixd/core/textstream.h
init.o: ../../../../winix/winixd/core/misc.h
init.o: ../../../../pikotools/utf8/utf8.h
init.o: ../../../../winix/winixd/core/winix_const.h
init.o: ../../../../pikotools/space/spacetojson.h
init.o: ../../../../ezc/src/outstreams.h
init.o: ../../../../winix/winixd/core/session.h
@ -344,13 +350,18 @@ mdb.o: ../../../../pikotools/textstream/types.h
mdb.o: ../../../../pikotools/date/date.h
mdb.o: ../../../../pikotools/convert/convert.h
mdb.o: ../../../../pikotools/convert/inttostr.h
mdb.o: ../../../../pikotools/convert/strtoint.h
mdb.o: ../../../../pikotools/convert/text.h
mdb.o: ../../../../winix/winixd/core/misc.h
mdb.o: ../../../../winix/winixd/core/item.h
mdb.o: ../../../../winix/winixd/core/requesttypes.h
mdb.o: ../../../../pikotools/utf8/utf8.h
mdb.o: ../../../../winix/winixd/core/winix_const.h
mdb.o: ../../../../pikotools/membuffer/membuffer.h
mdb.o: ../../../../pikotools/textstream/types.h
mdb.o: ../../../../winix/winixd/core/slog.h
mdb.o: ../../../../winix/winixd/core/cur.h
mdb.o: ../../../../winix/winixd/core/request.h
mdb.o: ../../../../winix/winixd/core/requesttypes.h
mdb.o: ../../../../winix/winixd/core/item.h
mdb.o: ../../../../winix/winixd/core/error.h
mdb.o: ../../../../winix/winixd/core/config.h
mdb.o: ../../../../pikotools/space/spaceparser.h
@ -358,8 +369,6 @@ mdb.o: ../../../../pikotools/space/space.h
mdb.o: ../../../../winix/winixd/core/htmlfilter.h
mdb.o: ../../../../winix/winixd/templates/htmltextstream.h
mdb.o: ../../../../winix/winixd/core/textstream.h
mdb.o: ../../../../winix/winixd/core/misc.h ../../../../pikotools/utf8/utf8.h
mdb.o: ../../../../winix/winixd/core/winix_const.h
mdb.o: ../../../../pikotools/space/spacetojson.h
mdb.o: ../../../../ezc/src/outstreams.h
mdb.o: ../../../../winix/winixd/core/session.h
@ -387,6 +396,8 @@ templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../pikotools/date/date.h
templates.o: ../../../../pikotools/convert/convert.h
templates.o: ../../../../pikotools/convert/inttostr.h
templates.o: ../../../../pikotools/convert/strtoint.h
templates.o: ../../../../pikotools/convert/text.h
templates.o: ../../../../pikotools/membuffer/membuffer.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../winix/winixd/core/winix_const.h

View File

@ -1 +1 @@
o = funregistermail.o funregistermail_showusers.o init.o mdb.o registermail_info.o templates.o
o = funregistermail_showusers.o funregistermail.o init.o mdb.o registermail_info.o templates.o

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2016, Tomasz Sowa
* Copyright (c) 2016-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -85,7 +85,7 @@ void ReloadConfigFile(PluginInfo & info, Item & file)
else
if( status == PT::SpaceParser::ok )
{
std::wstring * list_id_str = space.GetValue(L"list_id");
std::wstring * list_id_str = space.GetFirstValue(L"list_id");
if( list_id_str )
{

View File

@ -17,6 +17,8 @@ cache.o: ../../../../winix/winixd/core/requesttypes.h
cache.o: ../../../../pikotools/textstream/textstream.h
cache.o: ../../../../pikotools/convert/convert.h
cache.o: ../../../../pikotools/convert/inttostr.h
cache.o: ../../../../pikotools/convert/strtoint.h
cache.o: ../../../../pikotools/convert/text.h
cache.o: ../../../../pikotools/membuffer/membuffer.h
cache.o: ../../../../pikotools/textstream/types.h
cache.o: ../../../../pikotools/utf8/utf8.h
@ -76,13 +78,18 @@ init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/date/date.h
init.o: ../../../../pikotools/convert/convert.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../pikotools/convert/strtoint.h
init.o: ../../../../pikotools/convert/text.h
init.o: ../../../../winix/winixd/core/misc.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../pikotools/utf8/utf8.h
init.o: ../../../../winix/winixd/core/winix_const.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../winix/winixd/core/slog.h
init.o: ../../../../winix/winixd/core/cur.h
init.o: ../../../../winix/winixd/core/request.h
init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/error.h
init.o: ../../../../winix/winixd/core/config.h
init.o: ../../../../pikotools/space/spaceparser.h
@ -90,9 +97,6 @@ init.o: ../../../../pikotools/space/space.h
init.o: ../../../../winix/winixd/core/htmlfilter.h
init.o: ../../../../winix/winixd/templates/htmltextstream.h
init.o: ../../../../winix/winixd/core/textstream.h
init.o: ../../../../winix/winixd/core/misc.h
init.o: ../../../../pikotools/utf8/utf8.h
init.o: ../../../../winix/winixd/core/winix_const.h
init.o: ../../../../pikotools/space/spacetojson.h
init.o: ../../../../ezc/src/outstreams.h
init.o: ../../../../winix/winixd/core/session.h
@ -232,6 +236,8 @@ templates.o: ../../../../winix/winixd/core/requesttypes.h
templates.o: ../../../../pikotools/textstream/textstream.h
templates.o: ../../../../pikotools/convert/convert.h
templates.o: ../../../../pikotools/convert/inttostr.h
templates.o: ../../../../pikotools/convert/strtoint.h
templates.o: ../../../../pikotools/convert/text.h
templates.o: ../../../../pikotools/membuffer/membuffer.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../pikotools/utf8/utf8.h

View File

@ -1 +1 @@
o = cache.o init.o templates.o
o = cache.o init.o templates.o

View File

@ -12,6 +12,8 @@ init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../pikotools/textstream/textstream.h
init.o: ../../../../pikotools/convert/convert.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../pikotools/convert/strtoint.h
init.o: ../../../../pikotools/convert/text.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/utf8/utf8.h
@ -159,6 +161,8 @@ stats.o: ../../../../winix/winixd/core/requesttypes.h
stats.o: ../../../../pikotools/textstream/textstream.h
stats.o: ../../../../pikotools/convert/convert.h
stats.o: ../../../../pikotools/convert/inttostr.h
stats.o: ../../../../pikotools/convert/strtoint.h
stats.o: ../../../../pikotools/convert/text.h
stats.o: ../../../../pikotools/membuffer/membuffer.h
stats.o: ../../../../pikotools/textstream/types.h
stats.o: ../../../../pikotools/utf8/utf8.h
@ -199,14 +203,16 @@ templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../pikotools/date/date.h
templates.o: ../../../../pikotools/convert/convert.h
templates.o: ../../../../pikotools/convert/inttostr.h
templates.o: ../../../../pikotools/membuffer/membuffer.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../winix/winixd/core/item.h
templates.o: ../../../../winix/winixd/core/error.h
templates.o: ../../../../winix/winixd/core/textstream.h
templates.o: ../../../../pikotools/convert/strtoint.h
templates.o: ../../../../pikotools/convert/text.h
templates.o: ../../../../winix/winixd/core/misc.h
templates.o: ../../../../winix/winixd/core/item.h
templates.o: ../../../../pikotools/utf8/utf8.h
templates.o: ../../../../winix/winixd/core/winix_const.h
templates.o: ../../../../pikotools/membuffer/membuffer.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../winix/winixd/core/error.h
templates.o: ../../../../winix/winixd/core/textstream.h
templates.o: ../../../../winix/winixd/templates/htmltextstream.h
templates.o: ../../../../winix/winixd/core/textstream.h
templates.o: ../../../../pikotools/space/spacetojson.h

View File

@ -1 +1 @@
o = bot.o init.o stats.o templates.o
o = bot.o init.o stats.o templates.o

View File

@ -17,6 +17,8 @@ createthread.o: ../../../../winix/winixd/core/requesttypes.h
createthread.o: ../../../../pikotools/textstream/textstream.h
createthread.o: ../../../../pikotools/convert/convert.h
createthread.o: ../../../../pikotools/convert/inttostr.h
createthread.o: ../../../../pikotools/convert/strtoint.h
createthread.o: ../../../../pikotools/convert/text.h
createthread.o: ../../../../pikotools/membuffer/membuffer.h
createthread.o: ../../../../pikotools/textstream/types.h
createthread.o: ../../../../pikotools/utf8/utf8.h
@ -142,10 +144,13 @@ funthread.o: ../../../../pikotools/textstream/types.h
funthread.o: ../../../../pikotools/date/date.h
funthread.o: ../../../../pikotools/convert/convert.h
funthread.o: ../../../../pikotools/convert/inttostr.h
funthread.o: ../../../../pikotools/membuffer/membuffer.h
funthread.o: ../../../../pikotools/textstream/types.h
funthread.o: ../../../../pikotools/convert/strtoint.h
funthread.o: ../../../../pikotools/convert/text.h
funthread.o: ../../../../winix/winixd/core/misc.h
funthread.o: ../../../../pikotools/utf8/utf8.h
funthread.o: ../../../../winix/winixd/core/winix_const.h funthread.h
funthread.o: ../../../../winix/winixd/core/winix_const.h
funthread.o: ../../../../pikotools/membuffer/membuffer.h
funthread.o: ../../../../pikotools/textstream/types.h funthread.h
funthread.o: ../../../../winix/winixd/functions/functionbase.h
funthread.o: ../../../../winix/winixd/core/item.h
funthread.o: ../../../../winix/winixd/db/db.h
@ -153,7 +158,6 @@ funthread.o: ../../../../winix/winixd/db/dbbase.h
funthread.o: ../../../../winix/winixd/db/dbconn.h
funthread.o: ../../../../winix/winixd/db/dbtextstream.h
funthread.o: ../../../../winix/winixd/core/textstream.h
funthread.o: ../../../../winix/winixd/core/misc.h
funthread.o: ../../../../winix/winixd/core/error.h
funthread.o: ../../../../pikotools/space/spaceparser.h
funthread.o: ../../../../pikotools/space/space.h
@ -237,6 +241,8 @@ init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../pikotools/textstream/textstream.h
init.o: ../../../../pikotools/convert/convert.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../pikotools/convert/strtoint.h
init.o: ../../../../pikotools/convert/text.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/utf8/utf8.h
@ -376,13 +382,18 @@ reply.o: ../../../../pikotools/textstream/types.h
reply.o: ../../../../pikotools/date/date.h
reply.o: ../../../../pikotools/convert/convert.h
reply.o: ../../../../pikotools/convert/inttostr.h
reply.o: ../../../../pikotools/convert/strtoint.h
reply.o: ../../../../pikotools/convert/text.h
reply.o: ../../../../winix/winixd/core/misc.h
reply.o: ../../../../winix/winixd/core/item.h
reply.o: ../../../../winix/winixd/core/requesttypes.h
reply.o: ../../../../pikotools/utf8/utf8.h
reply.o: ../../../../winix/winixd/core/winix_const.h
reply.o: ../../../../pikotools/membuffer/membuffer.h
reply.o: ../../../../pikotools/textstream/types.h
reply.o: ../../../../winix/winixd/core/slog.h
reply.o: ../../../../winix/winixd/core/cur.h
reply.o: ../../../../winix/winixd/core/request.h
reply.o: ../../../../winix/winixd/core/requesttypes.h
reply.o: ../../../../winix/winixd/core/item.h
reply.o: ../../../../winix/winixd/core/error.h
reply.o: ../../../../winix/winixd/core/config.h
reply.o: ../../../../pikotools/space/spaceparser.h
@ -390,9 +401,6 @@ reply.o: ../../../../pikotools/space/space.h
reply.o: ../../../../winix/winixd/core/htmlfilter.h
reply.o: ../../../../winix/winixd/templates/htmltextstream.h
reply.o: ../../../../winix/winixd/core/textstream.h
reply.o: ../../../../winix/winixd/core/misc.h
reply.o: ../../../../pikotools/utf8/utf8.h
reply.o: ../../../../winix/winixd/core/winix_const.h
reply.o: ../../../../pikotools/space/spacetojson.h
reply.o: ../../../../ezc/src/outstreams.h
reply.o: ../../../../winix/winixd/core/session.h
@ -530,6 +538,8 @@ showthreads.o: ../../../../winix/winixd/core/requesttypes.h
showthreads.o: ../../../../pikotools/textstream/textstream.h
showthreads.o: ../../../../pikotools/convert/convert.h
showthreads.o: ../../../../pikotools/convert/inttostr.h
showthreads.o: ../../../../pikotools/convert/strtoint.h
showthreads.o: ../../../../pikotools/convert/text.h
showthreads.o: ../../../../pikotools/membuffer/membuffer.h
showthreads.o: ../../../../pikotools/textstream/types.h
showthreads.o: ../../../../pikotools/utf8/utf8.h
@ -625,6 +635,8 @@ templates.o: ../../../../winix/winixd/core/requesttypes.h
templates.o: ../../../../pikotools/textstream/textstream.h
templates.o: ../../../../pikotools/convert/convert.h
templates.o: ../../../../pikotools/convert/inttostr.h
templates.o: ../../../../pikotools/convert/strtoint.h
templates.o: ../../../../pikotools/convert/text.h
templates.o: ../../../../pikotools/membuffer/membuffer.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../pikotools/utf8/utf8.h
@ -773,6 +785,8 @@ threadinfo.o: ../../../../winix/winixd/core/requesttypes.h
threadinfo.o: ../../../../pikotools/textstream/textstream.h
threadinfo.o: ../../../../pikotools/convert/convert.h
threadinfo.o: ../../../../pikotools/convert/inttostr.h
threadinfo.o: ../../../../pikotools/convert/strtoint.h
threadinfo.o: ../../../../pikotools/convert/text.h
threadinfo.o: ../../../../pikotools/membuffer/membuffer.h
threadinfo.o: ../../../../pikotools/textstream/types.h
threadinfo.o: ../../../../pikotools/utf8/utf8.h

View File

@ -1 +1 @@
o = createthread.o funthread.o init.o reply.o showthreads.o tdb.o templates.o threadinfo.o
o = createthread.o funthread.o init.o reply.o showthreads.o tdb.o templates.o threadinfo.o

View File

@ -12,6 +12,8 @@ createticket.o: ../../../../winix/winixd/core/requesttypes.h
createticket.o: ../../../../pikotools/textstream/textstream.h
createticket.o: ../../../../pikotools/convert/convert.h
createticket.o: ../../../../pikotools/convert/inttostr.h
createticket.o: ../../../../pikotools/convert/strtoint.h
createticket.o: ../../../../pikotools/convert/text.h
createticket.o: ../../../../pikotools/membuffer/membuffer.h
createticket.o: ../../../../pikotools/textstream/types.h
createticket.o: ../../../../pikotools/utf8/utf8.h
@ -167,6 +169,13 @@ editticket.o: ../../../../pikotools/textstream/types.h
editticket.o: ../../../../pikotools/date/date.h
editticket.o: ../../../../pikotools/convert/convert.h
editticket.o: ../../../../pikotools/convert/inttostr.h
editticket.o: ../../../../pikotools/convert/strtoint.h
editticket.o: ../../../../pikotools/convert/text.h
editticket.o: ../../../../winix/winixd/core/misc.h
editticket.o: ../../../../winix/winixd/core/item.h
editticket.o: ../../../../winix/winixd/core/requesttypes.h
editticket.o: ../../../../pikotools/utf8/utf8.h
editticket.o: ../../../../winix/winixd/core/winix_const.h
editticket.o: ../../../../pikotools/membuffer/membuffer.h
editticket.o: ../../../../pikotools/textstream/types.h
editticket.o: ../../../../pikotools/space/spaceparser.h
@ -179,11 +188,6 @@ editticket.o: ../../../../winix/winixd/core/dircontainer.h
editticket.o: ../../../../winix/winixd/core/ugcontainer.h
editticket.o: ../../../../winix/winixd/core/log.h
editticket.o: ../../../../winix/winixd/core/textstream.h
editticket.o: ../../../../winix/winixd/core/misc.h
editticket.o: ../../../../winix/winixd/core/item.h
editticket.o: ../../../../winix/winixd/core/requesttypes.h
editticket.o: ../../../../pikotools/utf8/utf8.h
editticket.o: ../../../../winix/winixd/core/winix_const.h
editticket.o: ../../../../winix/winixd/core/logmanipulators.h
editticket.o: ../../../../winix/winixd/core/slog.h
editticket.o: ../../../../winix/winixd/core/cur.h
@ -315,6 +319,13 @@ funticket.o: ../../../../pikotools/textstream/types.h
funticket.o: ../../../../pikotools/date/date.h
funticket.o: ../../../../pikotools/convert/convert.h
funticket.o: ../../../../pikotools/convert/inttostr.h
funticket.o: ../../../../pikotools/convert/strtoint.h
funticket.o: ../../../../pikotools/convert/text.h
funticket.o: ../../../../winix/winixd/core/misc.h
funticket.o: ../../../../winix/winixd/core/item.h
funticket.o: ../../../../winix/winixd/core/requesttypes.h
funticket.o: ../../../../pikotools/utf8/utf8.h
funticket.o: ../../../../winix/winixd/core/winix_const.h
funticket.o: ../../../../pikotools/membuffer/membuffer.h
funticket.o: ../../../../pikotools/textstream/types.h
funticket.o: ../../../../pikotools/space/spaceparser.h
@ -327,11 +338,6 @@ funticket.o: ../../../../winix/winixd/core/dircontainer.h
funticket.o: ../../../../winix/winixd/core/ugcontainer.h
funticket.o: ../../../../winix/winixd/core/log.h
funticket.o: ../../../../winix/winixd/core/textstream.h
funticket.o: ../../../../winix/winixd/core/misc.h
funticket.o: ../../../../winix/winixd/core/item.h
funticket.o: ../../../../winix/winixd/core/requesttypes.h
funticket.o: ../../../../pikotools/utf8/utf8.h
funticket.o: ../../../../winix/winixd/core/winix_const.h
funticket.o: ../../../../winix/winixd/core/logmanipulators.h
funticket.o: ../../../../winix/winixd/core/slog.h
funticket.o: ../../../../winix/winixd/core/cur.h
@ -461,6 +467,13 @@ init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/date/date.h
init.o: ../../../../pikotools/convert/convert.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../pikotools/convert/strtoint.h
init.o: ../../../../pikotools/convert/text.h
init.o: ../../../../winix/winixd/core/misc.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../pikotools/utf8/utf8.h
init.o: ../../../../winix/winixd/core/winix_const.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/space/spaceparser.h
@ -473,11 +486,6 @@ init.o: ../../../../winix/winixd/core/dircontainer.h
init.o: ../../../../winix/winixd/core/ugcontainer.h
init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/textstream.h
init.o: ../../../../winix/winixd/core/misc.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../pikotools/utf8/utf8.h
init.o: ../../../../winix/winixd/core/winix_const.h
init.o: ../../../../winix/winixd/core/logmanipulators.h
init.o: ../../../../winix/winixd/core/slog.h
init.o: ../../../../winix/winixd/core/cur.h
@ -619,6 +627,13 @@ showtickets.o: ../../../../pikotools/textstream/types.h
showtickets.o: ../../../../pikotools/date/date.h
showtickets.o: ../../../../pikotools/convert/convert.h
showtickets.o: ../../../../pikotools/convert/inttostr.h
showtickets.o: ../../../../pikotools/convert/strtoint.h
showtickets.o: ../../../../pikotools/convert/text.h
showtickets.o: ../../../../winix/winixd/core/misc.h
showtickets.o: ../../../../winix/winixd/core/item.h
showtickets.o: ../../../../winix/winixd/core/requesttypes.h
showtickets.o: ../../../../pikotools/utf8/utf8.h
showtickets.o: ../../../../winix/winixd/core/winix_const.h
showtickets.o: ../../../../pikotools/membuffer/membuffer.h
showtickets.o: ../../../../pikotools/textstream/types.h
showtickets.o: ../../../../pikotools/space/spaceparser.h
@ -631,11 +646,6 @@ showtickets.o: ../../../../winix/winixd/core/dircontainer.h
showtickets.o: ../../../../winix/winixd/core/ugcontainer.h
showtickets.o: ../../../../winix/winixd/core/log.h
showtickets.o: ../../../../winix/winixd/core/textstream.h
showtickets.o: ../../../../winix/winixd/core/misc.h
showtickets.o: ../../../../winix/winixd/core/item.h
showtickets.o: ../../../../winix/winixd/core/requesttypes.h
showtickets.o: ../../../../pikotools/utf8/utf8.h
showtickets.o: ../../../../winix/winixd/core/winix_const.h
showtickets.o: ../../../../winix/winixd/core/logmanipulators.h
showtickets.o: ../../../../winix/winixd/core/slog.h
showtickets.o: ../../../../winix/winixd/core/cur.h
@ -775,6 +785,11 @@ templates.o: ../../../../winix/winixd/core/textstream.h
templates.o: ../../../../pikotools/textstream/textstream.h
templates.o: ../../../../pikotools/convert/convert.h
templates.o: ../../../../pikotools/convert/inttostr.h
templates.o: ../../../../pikotools/convert/strtoint.h
templates.o: ../../../../pikotools/convert/text.h
templates.o: ../../../../winix/winixd/core/misc.h
templates.o: ../../../../winix/winixd/core/requesttypes.h
templates.o: ../../../../winix/winixd/core/winix_const.h
templates.o: ../../../../pikotools/membuffer/membuffer.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../winix/winixd/core/error.h
@ -788,9 +803,6 @@ templates.o: ../../../../winix/winixd/core/dircontainer.h
templates.o: ../../../../winix/winixd/core/ugcontainer.h
templates.o: ../../../../winix/winixd/core/log.h
templates.o: ../../../../winix/winixd/core/textstream.h
templates.o: ../../../../winix/winixd/core/misc.h
templates.o: ../../../../winix/winixd/core/requesttypes.h
templates.o: ../../../../winix/winixd/core/winix_const.h
templates.o: ../../../../winix/winixd/core/logmanipulators.h
templates.o: ../../../../winix/winixd/core/slog.h
templates.o: ../../../../winix/winixd/core/cur.h
@ -919,6 +931,13 @@ ticketinfo.o: ../../../../pikotools/textstream/types.h
ticketinfo.o: ../../../../pikotools/date/date.h
ticketinfo.o: ../../../../pikotools/convert/convert.h
ticketinfo.o: ../../../../pikotools/convert/inttostr.h
ticketinfo.o: ../../../../pikotools/convert/strtoint.h
ticketinfo.o: ../../../../pikotools/convert/text.h
ticketinfo.o: ../../../../winix/winixd/core/misc.h
ticketinfo.o: ../../../../winix/winixd/core/item.h
ticketinfo.o: ../../../../winix/winixd/core/requesttypes.h
ticketinfo.o: ../../../../pikotools/utf8/utf8.h
ticketinfo.o: ../../../../winix/winixd/core/winix_const.h
ticketinfo.o: ../../../../pikotools/membuffer/membuffer.h
ticketinfo.o: ../../../../pikotools/textstream/types.h
ticketinfo.o: ../../../../winix/winixd/core/error.h
@ -932,11 +951,6 @@ ticketinfo.o: ../../../../winix/winixd/core/dircontainer.h
ticketinfo.o: ../../../../winix/winixd/core/ugcontainer.h
ticketinfo.o: ../../../../winix/winixd/core/log.h
ticketinfo.o: ../../../../winix/winixd/core/textstream.h
ticketinfo.o: ../../../../winix/winixd/core/misc.h
ticketinfo.o: ../../../../winix/winixd/core/item.h
ticketinfo.o: ../../../../winix/winixd/core/requesttypes.h
ticketinfo.o: ../../../../pikotools/utf8/utf8.h
ticketinfo.o: ../../../../winix/winixd/core/winix_const.h
ticketinfo.o: ../../../../winix/winixd/core/logmanipulators.h
ticketinfo.o: ../../../../winix/winixd/core/slog.h
ticketinfo.o: ../../../../winix/winixd/core/cur.h

View File

@ -1 +1 @@
o = createticket.o editticket.o funticket.o init.o sessiondata.o showtickets.o tdb.o templates.o ticketinfo.o
o = createticket.o editticket.o funticket.o init.o sessiondata.o showtickets.o tdb.o templates.o ticketinfo.o

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2014, Tomasz Sowa
* Copyright (c) 2010-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -162,7 +162,7 @@ void SessionData::CheckFile(std::vector<long> & file_tab, PT::Space & space)
if( subsp.name == L"file" )
{
std::wstring * file_id_str = subsp.GetValue(L"itemid");
std::wstring * file_id_str = subsp.GetFirstValue(L"itemid");
if( file_id_str )
{

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2014, Tomasz Sowa
* Copyright (c) 2008-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -267,14 +267,14 @@ void ticket_print_value(Info & i, TicketValue & value)
if( !value.is_param || !value.is_value )
return;
std::wstring & type = value.config_par->Text(L"type");
std::wstring * type = value.config_par->GetFirstValue(L"type");
if( value.is_in_ticket_par )
{
if( type == L"decimal" )
if( type && *type == L"decimal" )
i.out << value.ticket_par->decv;
else
if( type == L"select" )
if( type && *type == L"select" )
ticket_print_value_select(i, value);
else
i.out << value.ticket_par->intv;
@ -751,8 +751,10 @@ void tickets_tab_conf_tab_param_name(Info & i)
if( value.is_param )
{
std::wstring & name = value.config_par->Text(L"name");
i.out << name;
std::wstring * name = value.config_par->GetFirstValue(L"name");
if( name )
i.out << *name;
}
}

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2014, Tomasz Sowa
* Copyright (c) 2010-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -166,7 +166,6 @@ bool TicketInfo::ParseTicketConf(long mount_dir_id, const std::wstring & path)
conf_tab[mount_dir_id].file_name = path;
conf_parser.SetSpace(conf_tab[mount_dir_id].conf);
conf_parser.SplitSingle(true);
conf_tab[mount_dir_id].conf.Clear();
return (conf_parser.ParseString(config_file.content) == PT::SpaceParser::ok);
@ -264,10 +263,15 @@ void TicketInfo::FindCurrentConf()
void TicketInfo::CheckMinMaxValue(PT::Space & space, Ticket::TicketParam & par)
{
if( space.Text(L"type") == L"integer" )
std::wstring * type = space.GetFirstValue(L"type");
if( !type )
return;
if( *type == L"integer" )
{
std::wstring * min_str = space.GetValue(L"min");
std::wstring * max_str = space.GetValue(L"min");
std::wstring * min_str = space.GetFirstValue(L"min");
std::wstring * max_str = space.GetFirstValue(L"min");
if( min_str )
{
@ -286,7 +290,7 @@ void TicketInfo::CheckMinMaxValue(PT::Space & space, Ticket::TicketParam & par)
}
}
else
if( space.Text(L"type") == L"progress" )
if( *type == L"progress" )
{
// !! dodac tez min/max
if( par.intv < 0 )
@ -296,7 +300,7 @@ void TicketInfo::CheckMinMaxValue(PT::Space & space, Ticket::TicketParam & par)
par.intv = 100;
}
else
if( space.Text(L"type") == L"select" )
if( *type == L"select" )
{
for(size_t a=0 ; a<space.spaces.size() ; ++a)
{
@ -306,7 +310,11 @@ void TicketInfo::CheckMinMaxValue(PT::Space & space, Ticket::TicketParam & par)
return;
}
par.intv = Tol(space.Text(L"default"));
par.intv = 0;
std::wstring * def = space.GetFirstValue(L"default");
if( def )
par.intv = Tol(*def);
}
}
@ -416,13 +424,15 @@ void TicketInfo::ReadTicketValue(PT::Space & space,
void TicketInfo::ReadTicketValue(PT::Space & space,
long param_id, const PostFile & value, PT::Space & meta)
{
if( space.Text(L"type") == L"images" || space.Text(L"type") == L"files" )
{
std::wstring & upload_path = space.Text(L"upload_dir");
std::wstring * type = space.GetFirstValue(L"type");
if( !upload_path.empty() )
if( type && (*type == L"images" || *type == L"files") )
{
std::wstring * upload_path = space.GetFirstValue(L"upload_dir");
if( upload_path && !upload_path->empty() )
{
Item * upload_dir = system->dirs.GetDir(upload_path);
Item * upload_dir = system->dirs.GetDir(*upload_path);
if( upload_dir )
ReadTicketValue(space, param_id, value, meta, *upload_dir);

View File

@ -14,6 +14,8 @@ adduser.o: ../../../pikotools/textstream/textstream.h
adduser.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
adduser.o: ../../../pikotools/convert/convert.h
adduser.o: ../../../pikotools/convert/inttostr.h
adduser.o: ../../../pikotools/convert/strtoint.h
adduser.o: ../../../pikotools/convert/text.h
adduser.o: ../../../pikotools/membuffer/membuffer.h
adduser.o: ../../../pikotools/textstream/types.h htmltextstream.h
adduser.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -92,16 +94,18 @@ changepatterns.o: ../../../pikotools/space/space.h
changepatterns.o: ../../../pikotools/date/date.h
changepatterns.o: ../../../pikotools/convert/convert.h
changepatterns.o: ../../../pikotools/convert/inttostr.h
changepatterns.o: ../../../pikotools/membuffer/membuffer.h
changepatterns.o: ../../../pikotools/textstream/types.h localefilter.h
changepatterns.o: ../../../pikotools/convert/strtoint.h
changepatterns.o: ../../../pikotools/convert/text.h misc.h localefilter.h
changepatterns.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
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/outstreams.h
changepatterns.o: ../../../ezc/src/patternparser.h misc.h htmltextstream.h
changepatterns.o: ../../../ezc/src/patternparser.h htmltextstream.h
changepatterns.o: ../../../winix/winixd/core/textstream.h
changepatterns.o: ../../../pikotools/membuffer/membuffer.h
changepatterns.o: ../../../pikotools/textstream/types.h
changepatterns.o: ../../../winix/winixd/core/log.h
changepatterns.o: ../../../winix/winixd/core/textstream.h
changepatterns.o: ../../../winix/winixd/core/logmanipulators.h
@ -122,6 +126,8 @@ config.o: ../../../pikotools/textstream/textstream.h
config.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
config.o: ../../../pikotools/convert/convert.h
config.o: ../../../pikotools/convert/inttostr.h
config.o: ../../../pikotools/convert/strtoint.h
config.o: ../../../pikotools/convert/text.h
config.o: ../../../pikotools/membuffer/membuffer.h
config.o: ../../../pikotools/textstream/types.h htmltextstream.h
config.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -204,6 +210,8 @@ currentdate.o: ../../../pikotools/space/space.h
currentdate.o: ../../../pikotools/date/date.h
currentdate.o: ../../../pikotools/convert/convert.h
currentdate.o: ../../../pikotools/convert/inttostr.h
currentdate.o: ../../../pikotools/convert/strtoint.h
currentdate.o: ../../../pikotools/convert/text.h
currentdate.o: ../../../pikotools/membuffer/membuffer.h
currentdate.o: ../../../pikotools/textstream/types.h htmltextstream.h
currentdate.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -334,6 +342,8 @@ dir.o: ../../../pikotools/textstream/textstream.h
dir.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
dir.o: ../../../pikotools/convert/convert.h
dir.o: ../../../pikotools/convert/inttostr.h
dir.o: ../../../pikotools/convert/strtoint.h
dir.o: ../../../pikotools/convert/text.h
dir.o: ../../../pikotools/membuffer/membuffer.h
dir.o: ../../../pikotools/textstream/types.h htmltextstream.h
dir.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -453,6 +463,8 @@ doc.o: ../../../pikotools/textstream/textstream.h
doc.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
doc.o: ../../../pikotools/convert/convert.h
doc.o: ../../../pikotools/convert/inttostr.h
doc.o: ../../../pikotools/convert/strtoint.h
doc.o: ../../../pikotools/convert/text.h
doc.o: ../../../pikotools/membuffer/membuffer.h
doc.o: ../../../pikotools/textstream/types.h htmltextstream.h
doc.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -526,6 +538,8 @@ env.o: ../../../pikotools/textstream/textstream.h
env.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
env.o: ../../../pikotools/convert/convert.h
env.o: ../../../pikotools/convert/inttostr.h
env.o: ../../../pikotools/convert/strtoint.h
env.o: ../../../pikotools/convert/text.h
env.o: ../../../pikotools/membuffer/membuffer.h
env.o: ../../../pikotools/textstream/types.h htmltextstream.h
env.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -647,6 +661,8 @@ filters.o: ../../../pikotools/textstream/textstream.h
filters.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
filters.o: ../../../pikotools/convert/convert.h
filters.o: ../../../pikotools/convert/inttostr.h
filters.o: ../../../pikotools/convert/strtoint.h
filters.o: ../../../pikotools/convert/text.h
filters.o: ../../../pikotools/membuffer/membuffer.h
filters.o: ../../../pikotools/textstream/types.h htmltextstream.h
filters.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -731,6 +747,8 @@ generic.o: ../../../pikotools/textstream/textstream.h
generic.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
generic.o: ../../../pikotools/convert/convert.h
generic.o: ../../../pikotools/convert/inttostr.h
generic.o: ../../../pikotools/convert/strtoint.h
generic.o: ../../../pikotools/convert/text.h
generic.o: ../../../pikotools/membuffer/membuffer.h
generic.o: ../../../pikotools/textstream/types.h htmltextstream.h
generic.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -812,6 +830,8 @@ htmltextstream.o: ../../../pikotools/space/space.h
htmltextstream.o: ../../../pikotools/date/date.h
htmltextstream.o: ../../../pikotools/convert/convert.h
htmltextstream.o: ../../../pikotools/convert/inttostr.h
htmltextstream.o: ../../../pikotools/convert/strtoint.h
htmltextstream.o: ../../../pikotools/convert/text.h
htmltextstream.o: ../../../pikotools/membuffer/membuffer.h
htmltextstream.o: ../../../pikotools/textstream/types.h
htmltextstream.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
@ -836,9 +856,11 @@ indexpatterns.o: ../../../pikotools/space/space.h
indexpatterns.o: ../../../pikotools/date/date.h
indexpatterns.o: ../../../pikotools/convert/convert.h
indexpatterns.o: ../../../pikotools/convert/inttostr.h
indexpatterns.o: ../../../pikotools/membuffer/membuffer.h
indexpatterns.o: ../../../pikotools/textstream/types.h localefilter.h misc.h
indexpatterns.o: ../../../pikotools/convert/strtoint.h
indexpatterns.o: ../../../pikotools/convert/text.h misc.h localefilter.h
indexpatterns.o: htmltextstream.h ../../../winix/winixd/core/textstream.h
indexpatterns.o: ../../../pikotools/membuffer/membuffer.h
indexpatterns.o: ../../../pikotools/textstream/types.h
indexpatterns.o: ../../../winix/winixd/core/log.h
indexpatterns.o: ../../../winix/winixd/core/textstream.h
indexpatterns.o: ../../../winix/winixd/core/logmanipulators.h
@ -859,6 +881,8 @@ insert.o: ../../../pikotools/textstream/textstream.h
insert.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
insert.o: ../../../pikotools/convert/convert.h
insert.o: ../../../pikotools/convert/inttostr.h
insert.o: ../../../pikotools/convert/strtoint.h
insert.o: ../../../pikotools/convert/text.h
insert.o: ../../../pikotools/membuffer/membuffer.h
insert.o: ../../../pikotools/textstream/types.h htmltextstream.h
insert.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -943,6 +967,8 @@ ipban.o: ../../../pikotools/textstream/textstream.h
ipban.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
ipban.o: ../../../pikotools/convert/convert.h
ipban.o: ../../../pikotools/convert/inttostr.h
ipban.o: ../../../pikotools/convert/strtoint.h
ipban.o: ../../../pikotools/convert/text.h
ipban.o: ../../../pikotools/membuffer/membuffer.h
ipban.o: ../../../pikotools/textstream/types.h htmltextstream.h
ipban.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -1069,6 +1095,8 @@ item.o: ../../../pikotools/textstream/textstream.h
item.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
item.o: ../../../pikotools/convert/convert.h
item.o: ../../../pikotools/convert/inttostr.h
item.o: ../../../pikotools/convert/strtoint.h
item.o: ../../../pikotools/convert/text.h
item.o: ../../../pikotools/membuffer/membuffer.h
item.o: ../../../pikotools/textstream/types.h htmltextstream.h
item.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -1149,6 +1177,8 @@ last.o: ../../../pikotools/textstream/textstream.h
last.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
last.o: ../../../pikotools/convert/convert.h
last.o: ../../../pikotools/convert/inttostr.h
last.o: ../../../pikotools/convert/strtoint.h
last.o: ../../../pikotools/convert/text.h
last.o: ../../../pikotools/membuffer/membuffer.h
last.o: ../../../pikotools/textstream/types.h htmltextstream.h
last.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -1221,6 +1251,15 @@ locale.o: ../../../pikotools/textstream/textstream.h
locale.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
locale.o: ../../../pikotools/convert/convert.h
locale.o: ../../../pikotools/convert/inttostr.h
locale.o: ../../../pikotools/convert/strtoint.h
locale.o: ../../../pikotools/convert/text.h misc.h localefilter.h
locale.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
locale.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
locale.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
locale.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h
locale.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
locale.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h
locale.o: htmltextstream.h ../../../winix/winixd/core/textstream.h
locale.o: ../../../pikotools/membuffer/membuffer.h
locale.o: ../../../pikotools/textstream/types.h
locale.o: ../../../winix/winixd/core/log.h
@ -1228,9 +1267,8 @@ locale.o: ../../../winix/winixd/core/textstream.h
locale.o: ../../../winix/winixd/core/logmanipulators.h
locale.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/cur.h
locale.o: ../../../winix/winixd/templates/locale.h
locale.o: ../../../winix/winixd/core/misc.h ../../../ezc/src/item.h
locale.o: ../../../winix/winixd/core/misc.h
locale.o: ../../../winix/winixd/core/requesttypes.h
locale.o: ../../../pikotools/utf8/utf8.h
locale.o: ../../../winix/winixd/core/winix_const.h
localefilter.o: localefilter.h locale.h
localefilter.o: ../../../pikotools/space/spaceparser.h
@ -1241,14 +1279,18 @@ localefilter.o: ../../../pikotools/space/space.h
localefilter.o: ../../../pikotools/date/date.h
localefilter.o: ../../../pikotools/convert/convert.h
localefilter.o: ../../../pikotools/convert/inttostr.h
localefilter.o: ../../../pikotools/convert/strtoint.h
localefilter.o: ../../../pikotools/convert/text.h misc.h
localefilter.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
localefilter.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
localefilter.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
localefilter.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h
localefilter.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
localefilter.o: ../../../ezc/src/outstreams.h
localefilter.o: ../../../ezc/src/patternparser.h htmltextstream.h
localefilter.o: ../../../winix/winixd/core/textstream.h
localefilter.o: ../../../pikotools/membuffer/membuffer.h
localefilter.o: ../../../pikotools/textstream/types.h ../../../ezc/src/ezc.h
localefilter.o: ../../../ezc/src/generator.h ../../../ezc/src/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/outstreams.h
localefilter.o: ../../../ezc/src/patternparser.h ../core/misc.h
localefilter.o: ../../../pikotools/textstream/types.h ../core/misc.h
localefilter.o: ../../../winix/winixd/core/requesttypes.h
localefilter.o: ../../../winix/winixd/core/winix_const.h
login.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
@ -1265,6 +1307,8 @@ login.o: ../../../pikotools/textstream/textstream.h
login.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
login.o: ../../../pikotools/convert/convert.h
login.o: ../../../pikotools/convert/inttostr.h
login.o: ../../../pikotools/convert/strtoint.h
login.o: ../../../pikotools/convert/text.h
login.o: ../../../pikotools/membuffer/membuffer.h
login.o: ../../../pikotools/textstream/types.h htmltextstream.h
login.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -1388,6 +1432,7 @@ ls.o: ../../../pikotools/textstream/textstream.h
ls.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
ls.o: ../../../pikotools/convert/convert.h
ls.o: ../../../pikotools/convert/inttostr.h
ls.o: ../../../pikotools/convert/strtoint.h ../../../pikotools/convert/text.h
ls.o: ../../../pikotools/membuffer/membuffer.h
ls.o: ../../../pikotools/textstream/types.h htmltextstream.h
ls.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -1458,6 +1503,8 @@ man.o: ../../../pikotools/textstream/textstream.h
man.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
man.o: ../../../pikotools/convert/convert.h
man.o: ../../../pikotools/convert/inttostr.h
man.o: ../../../pikotools/convert/strtoint.h
man.o: ../../../pikotools/convert/text.h
man.o: ../../../pikotools/membuffer/membuffer.h
man.o: ../../../pikotools/textstream/types.h htmltextstream.h
man.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -1577,6 +1624,8 @@ misc.o: ../../../pikotools/textstream/textstream.h
misc.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
misc.o: ../../../pikotools/convert/convert.h
misc.o: ../../../pikotools/convert/inttostr.h
misc.o: ../../../pikotools/convert/strtoint.h
misc.o: ../../../pikotools/convert/text.h
misc.o: ../../../pikotools/membuffer/membuffer.h
misc.o: ../../../pikotools/textstream/types.h htmltextstream.h
misc.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -1657,6 +1706,8 @@ miscspace.o: ../../../pikotools/textstream/textstream.h
miscspace.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
miscspace.o: ../../../pikotools/convert/convert.h
miscspace.o: ../../../pikotools/convert/inttostr.h
miscspace.o: ../../../pikotools/convert/strtoint.h
miscspace.o: ../../../pikotools/convert/text.h
miscspace.o: ../../../pikotools/membuffer/membuffer.h
miscspace.o: ../../../pikotools/textstream/types.h htmltextstream.h
miscspace.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -1740,6 +1791,8 @@ mount.o: ../../../pikotools/textstream/textstream.h
mount.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
mount.o: ../../../pikotools/convert/convert.h
mount.o: ../../../pikotools/convert/inttostr.h
mount.o: ../../../pikotools/convert/strtoint.h
mount.o: ../../../pikotools/convert/text.h
mount.o: ../../../pikotools/membuffer/membuffer.h
mount.o: ../../../pikotools/textstream/types.h htmltextstream.h
mount.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -1823,6 +1876,8 @@ passwd.o: ../../../pikotools/textstream/textstream.h
passwd.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
passwd.o: ../../../pikotools/convert/convert.h
passwd.o: ../../../pikotools/convert/inttostr.h
passwd.o: ../../../pikotools/convert/strtoint.h
passwd.o: ../../../pikotools/convert/text.h
passwd.o: ../../../pikotools/membuffer/membuffer.h
passwd.o: ../../../pikotools/textstream/types.h htmltextstream.h
passwd.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -1899,6 +1954,8 @@ patterncacher.o: ../../../pikotools/textstream/types.h
patterncacher.o: ../../../pikotools/textstream/textstream.h
patterncacher.o: ../../../pikotools/convert/convert.h
patterncacher.o: ../../../pikotools/convert/inttostr.h
patterncacher.o: ../../../pikotools/convert/strtoint.h
patterncacher.o: ../../../pikotools/convert/text.h
patterncacher.o: ../../../pikotools/membuffer/membuffer.h
patterncacher.o: ../../../pikotools/textstream/types.h ../../../ezc/src/ezc.h
patterncacher.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
@ -1921,15 +1978,17 @@ patterns.o: ../../../pikotools/textstream/textstream.h
patterns.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
patterns.o: ../../../pikotools/convert/convert.h
patterns.o: ../../../pikotools/convert/inttostr.h
patterns.o: ../../../pikotools/membuffer/membuffer.h
patterns.o: ../../../pikotools/textstream/types.h localefilter.h
patterns.o: ../../../pikotools/convert/strtoint.h
patterns.o: ../../../pikotools/convert/text.h misc.h localefilter.h
patterns.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
patterns.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
patterns.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
patterns.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h
patterns.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
patterns.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h
patterns.o: misc.h htmltextstream.h ../../../winix/winixd/core/textstream.h
patterns.o: htmltextstream.h ../../../winix/winixd/core/textstream.h
patterns.o: ../../../pikotools/membuffer/membuffer.h
patterns.o: ../../../pikotools/textstream/types.h
patterns.o: ../../../winix/winixd/core/log.h
patterns.o: ../../../winix/winixd/core/textstream.h
patterns.o: ../../../winix/winixd/core/logmanipulators.h
@ -1949,6 +2008,8 @@ priv.o: ../../../pikotools/textstream/textstream.h
priv.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
priv.o: ../../../pikotools/convert/convert.h
priv.o: ../../../pikotools/convert/inttostr.h
priv.o: ../../../pikotools/convert/strtoint.h
priv.o: ../../../pikotools/convert/text.h
priv.o: ../../../pikotools/membuffer/membuffer.h
priv.o: ../../../pikotools/textstream/types.h htmltextstream.h
priv.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -2075,6 +2136,8 @@ rebus.o: ../../../pikotools/textstream/textstream.h
rebus.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
rebus.o: ../../../pikotools/convert/convert.h
rebus.o: ../../../pikotools/convert/inttostr.h
rebus.o: ../../../pikotools/convert/strtoint.h
rebus.o: ../../../pikotools/convert/text.h
rebus.o: ../../../pikotools/membuffer/membuffer.h
rebus.o: ../../../pikotools/textstream/types.h htmltextstream.h
rebus.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -2154,6 +2217,8 @@ server.o: ../../../pikotools/textstream/textstream.h
server.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
server.o: ../../../pikotools/convert/convert.h
server.o: ../../../pikotools/convert/inttostr.h
server.o: ../../../pikotools/convert/strtoint.h
server.o: ../../../pikotools/convert/text.h
server.o: ../../../pikotools/membuffer/membuffer.h
server.o: ../../../pikotools/textstream/types.h htmltextstream.h
server.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -2274,18 +2339,20 @@ slog.o: ../../../pikotools/textstream/textstream.h
slog.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
slog.o: ../../../pikotools/convert/convert.h
slog.o: ../../../pikotools/convert/inttostr.h
slog.o: ../../../pikotools/membuffer/membuffer.h
slog.o: ../../../pikotools/textstream/types.h templates.h
slog.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
slog.o: ../../../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/outstreams.h ../../../ezc/src/patternparser.h misc.h
slog.o: localefilter.h locale.h ../../../pikotools/space/spaceparser.h
slog.o: ../../../pikotools/convert/strtoint.h
slog.o: ../../../pikotools/convert/text.h misc.h localefilter.h locale.h
slog.o: ../../../pikotools/space/spaceparser.h
slog.o: ../../../pikotools/space/space.h
slog.o: ../../../pikotools/textstream/types.h htmltextstream.h
slog.o: ../../../winix/winixd/core/textstream.h patterncacher.h
slog.o: ../../../pikotools/textstream/types.h ../../../ezc/src/ezc.h
slog.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
slog.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h
slog.o: ../../../ezc/src/functions.h ../../../pikotools/utf8/utf8.h
slog.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h
slog.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h
slog.o: ../../../ezc/src/patternparser.h htmltextstream.h
slog.o: ../../../winix/winixd/core/textstream.h
slog.o: ../../../pikotools/membuffer/membuffer.h
slog.o: ../../../pikotools/textstream/types.h templates.h patterncacher.h
slog.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h
slog.o: changepatterns.h ../../../winix/winixd/core/config.h
slog.o: ../../../winix/winixd/core/htmlfilter.h
@ -2356,6 +2423,8 @@ stat.o: ../../../pikotools/textstream/textstream.h
stat.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
stat.o: ../../../pikotools/convert/convert.h
stat.o: ../../../pikotools/convert/inttostr.h
stat.o: ../../../pikotools/convert/strtoint.h
stat.o: ../../../pikotools/convert/text.h
stat.o: ../../../pikotools/membuffer/membuffer.h
stat.o: ../../../pikotools/textstream/types.h htmltextstream.h
stat.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -2434,6 +2503,8 @@ sys.o: ../../../pikotools/textstream/textstream.h
sys.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
sys.o: ../../../pikotools/convert/convert.h
sys.o: ../../../pikotools/convert/inttostr.h
sys.o: ../../../pikotools/convert/strtoint.h
sys.o: ../../../pikotools/convert/text.h
sys.o: ../../../pikotools/membuffer/membuffer.h
sys.o: ../../../pikotools/textstream/types.h htmltextstream.h
sys.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -2558,6 +2629,8 @@ template.o: ../../../pikotools/textstream/textstream.h
template.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
template.o: ../../../pikotools/convert/convert.h
template.o: ../../../pikotools/convert/inttostr.h
template.o: ../../../pikotools/convert/strtoint.h
template.o: ../../../pikotools/convert/text.h
template.o: ../../../pikotools/membuffer/membuffer.h
template.o: ../../../pikotools/textstream/types.h htmltextstream.h
template.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -2643,6 +2716,8 @@ templates.o: ../../../pikotools/textstream/textstream.h
templates.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
templates.o: ../../../pikotools/convert/convert.h
templates.o: ../../../pikotools/convert/inttostr.h
templates.o: ../../../pikotools/convert/strtoint.h
templates.o: ../../../pikotools/convert/text.h
templates.o: ../../../pikotools/membuffer/membuffer.h
templates.o: ../../../pikotools/textstream/types.h htmltextstream.h
templates.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -2774,6 +2849,8 @@ textextstream.o: ../../../pikotools/space/space.h
textextstream.o: ../../../pikotools/date/date.h
textextstream.o: ../../../pikotools/convert/convert.h
textextstream.o: ../../../pikotools/convert/inttostr.h
textextstream.o: ../../../pikotools/convert/strtoint.h
textextstream.o: ../../../pikotools/convert/text.h
textextstream.o: ../../../pikotools/membuffer/membuffer.h
textextstream.o: ../../../pikotools/textstream/types.h ../../../ezc/src/ezc.h
textextstream.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
@ -2797,6 +2874,8 @@ upload.o: ../../../pikotools/textstream/textstream.h
upload.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
upload.o: ../../../pikotools/convert/convert.h
upload.o: ../../../pikotools/convert/inttostr.h
upload.o: ../../../pikotools/convert/strtoint.h
upload.o: ../../../pikotools/convert/text.h
upload.o: ../../../pikotools/membuffer/membuffer.h
upload.o: ../../../pikotools/textstream/types.h htmltextstream.h
upload.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -2878,6 +2957,8 @@ uptime.o: ../../../pikotools/textstream/textstream.h
uptime.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
uptime.o: ../../../pikotools/convert/convert.h
uptime.o: ../../../pikotools/convert/inttostr.h
uptime.o: ../../../pikotools/convert/strtoint.h
uptime.o: ../../../pikotools/convert/text.h
uptime.o: ../../../pikotools/membuffer/membuffer.h
uptime.o: ../../../pikotools/textstream/types.h htmltextstream.h
uptime.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -2958,6 +3039,8 @@ user.o: ../../../pikotools/textstream/textstream.h
user.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
user.o: ../../../pikotools/convert/convert.h
user.o: ../../../pikotools/convert/inttostr.h
user.o: ../../../pikotools/convert/strtoint.h
user.o: ../../../pikotools/convert/text.h
user.o: ../../../pikotools/membuffer/membuffer.h
user.o: ../../../pikotools/textstream/types.h htmltextstream.h
user.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -3036,6 +3119,8 @@ who.o: ../../../pikotools/textstream/textstream.h
who.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
who.o: ../../../pikotools/convert/convert.h
who.o: ../../../pikotools/convert/inttostr.h
who.o: ../../../pikotools/convert/strtoint.h
who.o: ../../../pikotools/convert/text.h
who.o: ../../../pikotools/membuffer/membuffer.h
who.o: ../../../pikotools/textstream/types.h htmltextstream.h
who.o: ../../../winix/winixd/core/textstream.h patterncacher.h
@ -3111,6 +3196,8 @@ winix.o: ../../../pikotools/textstream/textstream.h
winix.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
winix.o: ../../../pikotools/convert/convert.h
winix.o: ../../../pikotools/convert/inttostr.h
winix.o: ../../../pikotools/convert/strtoint.h
winix.o: ../../../pikotools/convert/text.h
winix.o: ../../../pikotools/membuffer/membuffer.h
winix.o: ../../../pikotools/textstream/types.h htmltextstream.h
winix.o: ../../../winix/winixd/core/textstream.h patterncacher.h

View File

@ -1 +1 @@
o = adduser.o changepatterns.o config.o currentdate.o dir.o doc.o env.o filters.o generic.o htmltextstream.o indexpatterns.o insert.o ipban.o item.o last.o locale.o localefilter.o login.o ls.o man.o misc.o miscspace.o mount.o passwd.o patterncacher.o patterns.o priv.o rebus.o server.o slog.o stat.o sys.o template.o templates.o textextstream.o upload.o uptime.o user.o who.o winix.o
o = adduser.o changepatterns.o config.o currentdate.o dir.o doc.o env.o filters.o generic.o htmltextstream.o indexpatterns.o insert.o ipban.o item.o last.o locale.o localefilter.o login.o ls.o man.o misc.o miscspace.o mount.o passwd.o patterncacher.o patterns.o priv.o rebus.o server.o slog.o stat.o sys.o template.o templates.o textextstream.o upload.o uptime.o user.o who.o winix.o

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2014, Tomasz Sowa
* Copyright (c) 2010-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -112,9 +112,7 @@ bool read = false;
file_name += '/';
file_name += file;
loc_parser.SplitSingle(true);
loc_parser.SetSpace(temp_space);
PT::SpaceParser::Status status = loc_parser.Parse(file_name);
if( status == PT::SpaceParser::ok )
@ -135,7 +133,7 @@ return read;
void Locale::AddLocale(const char * file)
{
std::wstring * id_str = temp_space.GetValue(L"winix_locale_id");
std::wstring * id_str = temp_space.GetFirstValue(L"winix_locale_id");
if( !id_str )
{
@ -186,16 +184,19 @@ bool read = false;
file_name += '/';
file_name += "substitute";
loc_parser.SplitSingle(true);
loc_parser.SetSpace(temp_space);
if( loc_parser.Parse(file_name) == PT::SpaceParser::ok )
{
read = true;
CreateSubstVector(subst_url, temp_space.table_single[L"url_original"], temp_space.table_single[L"url_changeto"]);
CreateSubstVector(subst_smalllet, temp_space.table_single[L"smallleters"], temp_space.table_single[L"capitalics"]);
CreateSubstVector(subst_capitallet, temp_space.table_single[L"capitalics"], temp_space.table_single[L"smallleters"]);
CreateSubstSortVector(subst_sort, temp_space.table[L"sort"]);
CreateSubstVector(subst_url, temp_space.Text(L"url_original"), temp_space.Text(L"url_changeto"));
CreateSubstVector(subst_smalllet, temp_space.Text(L"smallleters"), temp_space.Text(L"capitalics"));
CreateSubstVector(subst_capitallet, temp_space.Text(L"capitalics"), temp_space.Text(L"smallleters"));
std::vector<std::wstring> * sort_vec = temp_space.GetValue(L"sort");
if( sort_vec )
CreateSubstSortVector(subst_sort, *sort_vec);
log << log3 << "Locale: read characters substitution tables from: " << file_name << logend;
}
@ -360,7 +361,7 @@ const std::wstring * Locale::GetKeyInLanguage(const std::wstring & key, size_t l
size_t index = locale_indices[lang_id];
if( index < locale_tab.size() )
return locale_tab[index].GetValue(key);
return locale_tab[index].GetFirstValue(key);
}
return 0;
@ -581,7 +582,7 @@ const std::wstring & Locale::GetByIndex(const std::wstring & key, size_t index,
{
if( index < locale_tab.size() )
{
const std::wstring * value = locale_tab[index].GetValue(key);
const std::wstring * value = locale_tab[index].GetFirstValue(key);
if( value )
return *value;

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2014, Tomasz Sowa
* Copyright (c) 2010-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -143,7 +143,7 @@ void print_date_nice(Info & i, const PT::Date & date)
// cannot be a const reference at the moment (PT::Space is used)
void print_user_name(Info & i, User & user)
{
std::wstring * dname = user.aenv.GetValue(L"display_name");
std::wstring * dname = user.aenv.GetFirstValue(L"display_name");
if( dname && !IsWhite(*dname, true) )
i.out << *dname;

View File

@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2012-2016, Tomasz Sowa
* Copyright (c) 2012-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -155,7 +155,7 @@ void space_value(Info & i, PT::Space & space, bool escape)
if( space_info.last_space )
{
const std::wstring & param = i.params.back().str;
const std::wstring * value = space_info.last_space->GetValue(param);
const std::wstring * value = space_info.last_space->GetFirstValue(param);
if( value )
{