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

added: std::wstring * Request::ParamValuep(const wchar_t * param_name)

Browse Source 
for taking a pointer (can be null) to a parameter value
added: bool System::IsSSLRequired(bool try_to_use_ssl)
       returns true if we should use ssl
       try_to_use_ssl is to be meant: config->use_ssl, config->use_ssl_static, config->use_ssl_common
       



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1094 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2018-04-22 21:26:56 +00:00
parent a5dfc9974f
commit 55992b5066
20 changed files with 860 additions and 852 deletions
Download Patch File Download Diff File Expand all files Collapse all files

242
winixd/core/Makefile.dep
View File

@@ -3,12 +3,12 @@
acceptbaseparser.o: acceptbaseparser.h misc.h item.h
acceptbaseparser.o: ../../../pikotools/space/space.h
acceptbaseparser.o: ../../../pikotools/textstream/types.h
acceptbaseparser.o: ../../../pikotools/date/date.h requesttypes.h
acceptbaseparser.o: ../../../pikotools/textstream/textstream.h
acceptbaseparser.o: ../../../pikotools/date/date.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/convert/text.h requesttypes.h
acceptbaseparser.o: ../../../pikotools/textstream/textstream.h
acceptbaseparser.o: ../../../pikotools/membuffer/membuffer.h
acceptbaseparser.o: ../../../pikotools/textstream/types.h
acceptbaseparser.o: ../../../pikotools/utf8/utf8.h winix_const.h
@@ -16,19 +16,18 @@ app.o: app.h config.h ../../../pikotools/space/spaceparser.h
app.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h
app.o: htmlfilter.h system.h job.h basethread.h synchro.h
app.o: ../../../pikotools/space/space.h dirs.h item.h
app.o: ../../../pikotools/date/date.h dircontainer.h
app.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
app.o: ../../../winix/winixd/db/dbconn.h
app.o: ../../../winix/winixd/db/dbtextstream.h
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/date/date.h ../../../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/convert/text.h misc.h requesttypes.h
app.o: ../../../pikotools/textstream/textstream.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
app.o: winix_const.h dircontainer.h ../../../winix/winixd/db/db.h
app.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h
app.o: ../../../winix/winixd/db/dbtextstream.h
app.o: ../../../winix/winixd/core/textstream.h
app.o: ../../../winix/winixd/core/error.h
app.o: ../../../winix/winixd/db/dbitemquery.h
app.o: ../../../winix/winixd/core/item.h
app.o: ../../../winix/winixd/db/dbitemcolumns.h
@@ -261,16 +260,17 @@ crypt.o: session.h plugindata.h rebus.h ipban.h mount.h
crypt.o: ../../../winix/winixd/templates/locale.h
dircontainer.o: dircontainer.h item.h ../../../pikotools/space/space.h
dircontainer.o: ../../../pikotools/textstream/types.h
dircontainer.o: ../../../pikotools/date/date.h log.h textstream.h
dircontainer.o: logmanipulators.h ../../../pikotools/textstream/textstream.h
dircontainer.o: ../../../pikotools/date/date.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/textstream/textstream.h
dircontainer.o: ../../../pikotools/membuffer/membuffer.h
dircontainer.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
dircontainer.o: error.h config.h ../../../pikotools/space/spaceparser.h
dircontainer.o: ../../../pikotools/textstream/types.h
dircontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h log.h
dircontainer.o: textstream.h logmanipulators.h slog.h cur.h request.h error.h
dircontainer.o: 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
@@ -280,18 +280,18 @@ dircontainer.o: rebus.h ipban.h mount.h
dircontainer.o: ../../../winix/winixd/templates/locale.h
dirs.o: dirs.h item.h ../../../pikotools/space/space.h
dirs.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h
dirs.o: dircontainer.h ../../../winix/winixd/db/db.h
dirs.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h
dirs.o: ../../../winix/winixd/db/dbtextstream.h
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/convert/text.h misc.h requesttypes.h
dirs.o: ../../../pikotools/textstream/textstream.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
dirs.o: winix_const.h dircontainer.h ../../../winix/winixd/db/db.h
dirs.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h
dirs.o: ../../../winix/winixd/db/dbtextstream.h
dirs.o: ../../../winix/winixd/core/textstream.h
dirs.o: ../../../winix/winixd/core/error.h
dirs.o: ../../../pikotools/space/spaceparser.h
dirs.o: ../../../pikotools/space/space.h
dirs.o: ../../../winix/winixd/db/dbitemquery.h
@@ -325,12 +325,11 @@ groups.o: ../../../winix/winixd/db/dbtextstream.h
groups.o: ../../../winix/winixd/core/textstream.h misc.h item.h
groups.o: ../../../pikotools/space/space.h
groups.o: ../../../pikotools/textstream/types.h
groups.o: ../../../pikotools/date/date.h requesttypes.h
groups.o: ../../../pikotools/textstream/textstream.h
groups.o: ../../../pikotools/convert/convert.h
groups.o: ../../../pikotools/date/date.h ../../../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/convert/text.h requesttypes.h
groups.o: ../../../pikotools/textstream/textstream.h
groups.o: ../../../pikotools/membuffer/membuffer.h
groups.o: ../../../pikotools/textstream/types.h
groups.o: ../../../pikotools/utf8/utf8.h winix_const.h
@@ -353,12 +352,12 @@ htmlfilter.o: htmlfilter.h
httpsimpleparser.o: httpsimpleparser.h misc.h item.h
httpsimpleparser.o: ../../../pikotools/space/space.h
httpsimpleparser.o: ../../../pikotools/textstream/types.h
httpsimpleparser.o: ../../../pikotools/date/date.h requesttypes.h
httpsimpleparser.o: ../../../pikotools/textstream/textstream.h
httpsimpleparser.o: ../../../pikotools/date/date.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/convert/text.h requesttypes.h
httpsimpleparser.o: ../../../pikotools/textstream/textstream.h
httpsimpleparser.o: ../../../pikotools/membuffer/membuffer.h
httpsimpleparser.o: ../../../pikotools/textstream/types.h
httpsimpleparser.o: ../../../pikotools/utf8/utf8.h winix_const.h
@@ -369,11 +368,11 @@ image.o: ../../../winix/winixd/db/dbtextstream.h
image.o: ../../../winix/winixd/core/textstream.h misc.h item.h
image.o: ../../../pikotools/space/space.h
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/convert/text.h requesttypes.h
image.o: ../../../pikotools/textstream/textstream.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
@@ -488,11 +487,11 @@ ipbancontainer.o: ../../../ezc/src/outstreams.h session.h user.h plugindata.h
ipbancontainer.o: rebus.h mount.h ../../../winix/winixd/templates/locale.h
item.o: item.h ../../../pikotools/space/space.h
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/convert/text.h misc.h requesttypes.h
item.o: ../../../pikotools/textstream/textstream.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
@@ -599,18 +598,18 @@ job.o: ../../../winix/winixd/templates/patterns.h
job.o: ../../../winix/winixd/templates/changepatterns.h
job.o: ../../../winix/winixd/templates/htmltextstream.h
job.o: ../../../winix/winixd/core/sessionmanager.h
lastcontainer.o: lastcontainer.h ../../../pikotools/date/date.h log.h
lastcontainer.o: textstream.h logmanipulators.h
lastcontainer.o: ../../../pikotools/textstream/textstream.h
lastcontainer.o: ../../../pikotools/space/space.h
lastcontainer.o: ../../../pikotools/textstream/types.h
lastcontainer.o: lastcontainer.h ../../../pikotools/date/date.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/space/space.h
lastcontainer.o: ../../../pikotools/textstream/types.h requesttypes.h
lastcontainer.o: ../../../pikotools/textstream/textstream.h
lastcontainer.o: ../../../pikotools/membuffer/membuffer.h
lastcontainer.o: ../../../pikotools/textstream/types.h slog.h cur.h request.h
lastcontainer.o: ../../../pikotools/textstream/types.h
lastcontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h log.h
lastcontainer.o: textstream.h logmanipulators.h slog.h cur.h request.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
@@ -658,11 +657,11 @@ 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
misc.o: misc.h item.h ../../../pikotools/space/space.h
misc.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h
misc.o: requesttypes.h ../../../pikotools/textstream/textstream.h
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/convert/text.h requesttypes.h
misc.o: ../../../pikotools/textstream/textstream.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
@@ -700,30 +699,30 @@ misc.o: ../../../winix/winixd/core/dircontainer.h
misc.o: ../../../winix/winixd/core/ugcontainer.h
mount.o: mount.h misc.h item.h ../../../pikotools/space/space.h
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/convert/text.h requesttypes.h
mount.o: ../../../pikotools/textstream/textstream.h
mount.o: ../../../pikotools/membuffer/membuffer.h
mount.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
mount.o: winix_const.h
mountparser.o: mountparser.h mount.h item.h ../../../pikotools/space/space.h
mountparser.o: ../../../pikotools/textstream/types.h
mountparser.o: ../../../pikotools/date/date.h dirs.h dircontainer.h
mountparser.o: ../../../winix/winixd/db/db.h
mountparser.o: ../../../winix/winixd/db/dbbase.h
mountparser.o: ../../../winix/winixd/db/dbconn.h
mountparser.o: ../../../winix/winixd/db/dbtextstream.h
mountparser.o: ../../../winix/winixd/core/textstream.h misc.h requesttypes.h
mountparser.o: ../../../pikotools/textstream/textstream.h
mountparser.o: ../../../pikotools/date/date.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/convert/text.h misc.h requesttypes.h
mountparser.o: ../../../pikotools/textstream/textstream.h
mountparser.o: ../../../pikotools/membuffer/membuffer.h
mountparser.o: ../../../pikotools/textstream/types.h
mountparser.o: ../../../pikotools/utf8/utf8.h winix_const.h
mountparser.o: ../../../pikotools/utf8/utf8.h winix_const.h dirs.h
mountparser.o: dircontainer.h ../../../winix/winixd/db/db.h
mountparser.o: ../../../winix/winixd/db/dbbase.h
mountparser.o: ../../../winix/winixd/db/dbconn.h
mountparser.o: ../../../winix/winixd/db/dbtextstream.h
mountparser.o: ../../../winix/winixd/core/textstream.h
mountparser.o: ../../../winix/winixd/core/error.h
mountparser.o: ../../../pikotools/space/spaceparser.h
mountparser.o: ../../../pikotools/space/space.h
@@ -758,19 +757,18 @@ mountparser.o: lastcontainer.h
mounts.o: mounts.h mount.h error.h dirs.h item.h
mounts.o: ../../../pikotools/space/space.h
mounts.o: ../../../pikotools/textstream/types.h
mounts.o: ../../../pikotools/date/date.h dircontainer.h
mounts.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
mounts.o: ../../../pikotools/convert/inttostr.h
mounts.o: ../../../pikotools/convert/strtoint.h
mounts.o: ../../../pikotools/convert/text.h misc.h requesttypes.h
mounts.o: ../../../pikotools/textstream/textstream.h
mounts.o: ../../../pikotools/membuffer/membuffer.h
mounts.o: ../../../pikotools/textstream/types.h
mounts.o: ../../../pikotools/utf8/utf8.h winix_const.h dircontainer.h
mounts.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
mounts.o: ../../../winix/winixd/db/dbconn.h
mounts.o: ../../../winix/winixd/db/dbtextstream.h
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
mounts.o: ../../../winix/winixd/core/textstream.h
mounts.o: ../../../winix/winixd/core/error.h
mounts.o: ../../../pikotools/space/spaceparser.h
mounts.o: ../../../pikotools/space/space.h
@@ -1240,30 +1238,30 @@ run.o: session.h user.h plugindata.h rebus.h ipban.h mount.h
run.o: ../../../winix/winixd/templates/locale.h
session.o: session.h item.h ../../../pikotools/space/space.h
session.o: ../../../pikotools/textstream/types.h
session.o: ../../../pikotools/date/date.h error.h user.h plugindata.h rebus.h
session.o: textstream.h ipban.h misc.h requesttypes.h
session.o: ../../../pikotools/textstream/textstream.h
session.o: ../../../pikotools/date/date.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/convert/text.h misc.h requesttypes.h
session.o: ../../../pikotools/textstream/textstream.h
session.o: ../../../pikotools/membuffer/membuffer.h
session.o: ../../../pikotools/textstream/types.h
session.o: ../../../pikotools/utf8/utf8.h winix_const.h
session.o: ../../../pikotools/utf8/utf8.h winix_const.h error.h user.h
session.o: plugindata.h rebus.h textstream.h ipban.h
sessioncontainer.o: sessioncontainer.h session.h item.h
sessioncontainer.o: ../../../pikotools/space/space.h
sessioncontainer.o: ../../../pikotools/textstream/types.h
sessioncontainer.o: ../../../pikotools/date/date.h error.h user.h
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/date/date.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/convert/text.h misc.h requesttypes.h
sessioncontainer.o: ../../../pikotools/textstream/textstream.h
sessioncontainer.o: ../../../pikotools/membuffer/membuffer.h
sessioncontainer.o: ../../../pikotools/textstream/types.h config.h
sessioncontainer.o: ../../../pikotools/space/spaceparser.h
sessioncontainer.o: ../../../pikotools/textstream/types.h
sessioncontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h error.h
sessioncontainer.o: user.h plugindata.h rebus.h textstream.h ipban.h cur.h
sessioncontainer.o: request.h config.h ../../../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
@@ -1278,17 +1276,16 @@ sessionidmanager.o: ../../../tito/src/aes.h
sessionidmanager.o: ../../../pikotools/space/spaceparser.h
sessionidmanager.o: ../../../pikotools/space/space.h
sessionidmanager.o: ../../../pikotools/utf8/utf8.h
sessionidmanager.o: ../../../pikotools/date/date.h log.h textstream.h
sessionidmanager.o: logmanipulators.h
sessionidmanager.o: ../../../pikotools/textstream/textstream.h
sessionidmanager.o: ../../../pikotools/date/date.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: requesttypes.h ../../../pikotools/textstream/textstream.h
sessionidmanager.o: ../../../pikotools/membuffer/membuffer.h
sessionidmanager.o: ../../../pikotools/textstream/types.h slog.h cur.h
sessionidmanager.o: request.h error.h config.h htmlfilter.h
sessionidmanager.o: ../../../pikotools/textstream/types.h winix_const.h log.h
sessionidmanager.o: textstream.h logmanipulators.h slog.h cur.h request.h
sessionidmanager.o: error.h config.h htmlfilter.h
sessionidmanager.o: ../../../winix/winixd/templates/htmltextstream.h
sessionidmanager.o: ../../../winix/winixd/core/textstream.h
sessionidmanager.o: ../../../pikotools/space/spacetojson.h
@@ -1298,17 +1295,17 @@ sessionidmanager.o: ../../../winix/winixd/templates/locale.h
sessionmanager.o: sessionmanager.h sessioncontainer.h session.h item.h
sessionmanager.o: ../../../pikotools/space/space.h
sessionmanager.o: ../../../pikotools/textstream/types.h
sessionmanager.o: ../../../pikotools/date/date.h error.h user.h plugindata.h
sessionmanager.o: rebus.h textstream.h ipban.h cur.h request.h requesttypes.h
sessionmanager.o: ../../../pikotools/textstream/textstream.h
sessionmanager.o: ../../../pikotools/date/date.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/convert/text.h misc.h requesttypes.h
sessionmanager.o: ../../../pikotools/textstream/textstream.h
sessionmanager.o: ../../../pikotools/membuffer/membuffer.h
sessionmanager.o: ../../../pikotools/textstream/types.h config.h
sessionmanager.o: ../../../pikotools/space/spaceparser.h
sessionmanager.o: ../../../pikotools/textstream/types.h
sessionmanager.o: ../../../pikotools/utf8/utf8.h winix_const.h error.h user.h
sessionmanager.o: plugindata.h rebus.h textstream.h ipban.h cur.h request.h
sessionmanager.o: config.h ../../../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
@@ -1407,17 +1404,17 @@ sessionmanager.o: ../../../winix/winixd/core/sessionmanager.h
sessionparser.o: sessionparser.h session.h item.h
sessionparser.o: ../../../pikotools/space/space.h
sessionparser.o: ../../../pikotools/textstream/types.h
sessionparser.o: ../../../pikotools/date/date.h error.h user.h plugindata.h
sessionparser.o: rebus.h textstream.h ipban.h sessioncontainer.h cur.h
sessionparser.o: request.h requesttypes.h
sessionparser.o: ../../../pikotools/textstream/textstream.h
sessionparser.o: ../../../pikotools/date/date.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/convert/text.h misc.h requesttypes.h
sessionparser.o: ../../../pikotools/textstream/textstream.h
sessionparser.o: ../../../pikotools/membuffer/membuffer.h
sessionparser.o: ../../../pikotools/textstream/types.h config.h
sessionparser.o: ../../../pikotools/textstream/types.h
sessionparser.o: ../../../pikotools/utf8/utf8.h winix_const.h error.h user.h
sessionparser.o: plugindata.h rebus.h textstream.h ipban.h sessioncontainer.h
sessionparser.o: cur.h request.h config.h
sessionparser.o: ../../../pikotools/space/spaceparser.h
sessionparser.o: ../../../pikotools/space/space.h htmlfilter.h
sessionparser.o: ../../../winix/winixd/templates/htmltextstream.h
@@ -1448,19 +1445,18 @@ synchro.o: synchro.h
system.o: system.h job.h basethread.h synchro.h
system.o: ../../../pikotools/space/space.h
system.o: ../../../pikotools/textstream/types.h dirs.h item.h
system.o: ../../../pikotools/date/date.h dircontainer.h
system.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
system.o: ../../../pikotools/convert/inttostr.h
system.o: ../../../pikotools/convert/strtoint.h
system.o: ../../../pikotools/convert/text.h misc.h requesttypes.h
system.o: ../../../pikotools/textstream/textstream.h
system.o: ../../../pikotools/membuffer/membuffer.h
system.o: ../../../pikotools/textstream/types.h
system.o: ../../../pikotools/utf8/utf8.h winix_const.h dircontainer.h
system.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
system.o: ../../../winix/winixd/db/dbconn.h
system.o: ../../../winix/winixd/db/dbtextstream.h
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
system.o: ../../../winix/winixd/core/textstream.h
system.o: ../../../winix/winixd/core/error.h
system.o: ../../../pikotools/space/spaceparser.h
system.o: ../../../pikotools/space/space.h
@@ -1573,29 +1569,29 @@ threadmanager.o: ../../../ezc/src/outstreams.h session.h user.h plugindata.h
threadmanager.o: rebus.h ipban.h mount.h
threadmanager.o: ../../../winix/winixd/templates/locale.h
timezone.o: timezone.h ../../../pikotools/date/date.h
timezone.o: ../../../pikotools/space/space.h
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/convert/text.h misc.h item.h
timezone.o: ../../../pikotools/space/space.h
timezone.o: ../../../pikotools/textstream/types.h requesttypes.h
timezone.o: ../../../pikotools/textstream/textstream.h
timezone.o: ../../../pikotools/membuffer/membuffer.h
timezone.o: ../../../pikotools/textstream/types.h
timezone.o: ../../../pikotools/utf8/utf8.h winix_const.h
timezones.o: timezones.h timezone.h ../../../pikotools/date/date.h
timezones.o: ../../../pikotools/space/space.h
timezones.o: ../../../pikotools/textstream/types.h
timezones.o: ../../../pikotools/space/spaceparser.h
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/convert/text.h misc.h item.h
timezones.o: ../../../pikotools/space/space.h
timezones.o: ../../../pikotools/textstream/types.h requesttypes.h
timezones.o: ../../../pikotools/textstream/textstream.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
timezones.o: ../../../pikotools/utf8/utf8.h winix_const.h
timezones.o: ../../../pikotools/space/spaceparser.h
timezones.o: ../../../pikotools/space/space.h log.h textstream.h
timezones.o: logmanipulators.h slog.h cur.h request.h error.h config.h
timezones.o: htmlfilter.h ../../../winix/winixd/templates/htmltextstream.h
timezones.o: ../../../winix/winixd/core/textstream.h
@@ -1606,15 +1602,15 @@ user.o: user.h
users.o: users.h sessionmanager.h sessioncontainer.h session.h item.h
users.o: ../../../pikotools/space/space.h
users.o: ../../../pikotools/textstream/types.h ../../../pikotools/date/date.h
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/convert/text.h misc.h requesttypes.h
users.o: ../../../pikotools/textstream/textstream.h
users.o: ../../../pikotools/membuffer/membuffer.h
users.o: ../../../pikotools/textstream/types.h config.h
users.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
users.o: winix_const.h error.h user.h plugindata.h rebus.h textstream.h
users.o: ipban.h cur.h request.h config.h
users.o: ../../../pikotools/space/spaceparser.h
users.o: ../../../pikotools/space/space.h htmlfilter.h
users.o: ../../../winix/winixd/templates/htmltextstream.h

2
winixd/core/app.cpp
View File

@@ -253,7 +253,7 @@ void App::Close()
void App::BaseUrlRedirect(int code, bool add_subdomain)
{
system.PutUrlProto(config.use_ssl, cur.request->redirect_to);
system.PutUrlProto(cur.request->redirect_to);
if( add_subdomain && !cur.request->subdomain.empty() )
{

61
winixd/core/request.cpp
View File

@@ -283,52 +283,65 @@ return true;
}
bool Request::IsParam(const wchar_t * param_name)
std::wstring * Request::ParamValuep(const wchar_t * param_name)
{
ParamTab::iterator i;
ParamTab::iterator i;
for(i=param_tab.begin() ; i!=param_tab.end() ; ++i)
{
if( i->name == param_name )
return true;
return &i->value;
}
return false;
return nullptr;
}
std::wstring * Request::ParamValuep(const std::wstring & param_name)
{
ParamTab::iterator i;
for(i=param_tab.begin() ; i!=param_tab.end() ; ++i)
{
if( i->name == param_name )
return &i->value;
}
return nullptr;
}
bool Request::IsParam(const wchar_t * param_name)
{
return ParamValuep(param_name) != nullptr;
}
bool Request::IsParam(const std::wstring & param_name)
{
ParamTab::iterator i;
for(i=param_tab.begin() ; i!=param_tab.end() ; ++i)
{
if( i->name == param_name )
return true;
}
return false;
return ParamValuep(param_name) != nullptr;
}
const std::wstring & Request::ParamValue(const wchar_t * param_name)
{
ParamTab::iterator i;
const std::wstring * val = ParamValuep(param_name);
if( val != nullptr )
return *val;
for(i=param_tab.begin() ; i!=param_tab.end() ; ++i)
{
if( i->name == param_name )
return i->value;
}
return str_empty;
return str_empty;
}
const std::wstring & Request::ParamValue(const std::wstring & param_name)
{
return ParamValue(param_name.c_str());
const std::wstring * val = ParamValuep(param_name);
if( val != nullptr )
return *val;
return str_empty;
}

3
winixd/core/request.h
View File

@@ -347,6 +347,9 @@ struct Request
const std::wstring & ParamValue(const wchar_t * param_name); // returns an empty string if there is no such a parameter
const std::wstring & ParamValue(const std::wstring & param_name); // returns an empty string if there is no such a parameter
std::wstring * ParamValuep(const wchar_t * param_name); // returns nullptr if there is no such a parameter
std::wstring * ParamValuep(const std::wstring & param_name); // returns nullptr if there is no such a parameter
bool IsPostVar(const wchar_t * var);
bool IsPostVar(const std::wstring & var);
const std::wstring & PostVar(const wchar_t * var); // returns an empty string if there is no such a parameter

77
winixd/core/system.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2016, Tomasz Sowa
* Copyright (c) 2010-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -152,33 +152,84 @@ void System::Init()
}
void System::PutUrlProto(bool can_use_ssl, std::wstring & str, bool clear_str)
/*
* try_to_use_ssl is to be meant: config->use_ssl, config->use_ssl_static, config->use_ssl_common
*/
bool System::IsSSLRequired(bool try_to_use_ssl)
{
bool ssl = false;
bool ssl = false;
if( clear_str )
str.clear();
if( can_use_ssl )
if( try_to_use_ssl )
{
if( !config->use_ssl_only_for_logged_users ||
cur->session->puser ||
(cur->request->function && cur->request->function->need_ssl) )
{
str += config->url_ssl_proto;
ssl = true;
}
}
if( !ssl )
return ssl;
}
bool System::IsSSLRequired()
{
return IsSSLRequired(config->use_ssl);
}
/*
* try_to_use_ssl is to be meant: config->use_ssl, config->use_ssl_static, config->use_ssl_common
*/
void System::PutUrlProto(bool can_use_ssl, std::wstring & str, bool clear_str)
{
if( clear_str )
str.clear();
if( IsSSLRequired() )
str += config->url_ssl_proto;
else
str += config->url_proto;
}
/*
* try_to_use_ssl is to be meant: config->use_ssl, config->use_ssl_static, config->use_ssl_common
*/
void System::PutUrlProto(bool can_use_ssl, PT::TextStream & str, bool clear_stream)
{
if( clear_stream )
str.clear();
if( IsSSLRequired(can_use_ssl) )
{
str << config->url_ssl_proto;
}
else
{
str << config->url_proto;
}
}
void System::PutUrlProto(std::wstring & str, bool clear_str)
{
return PutUrlProto(config->use_ssl, str, clear_str);
}
void System::PutUrlProto(PT::TextStream & str, bool clear_stream)
{
return PutUrlProto(config->use_ssl, str, clear_stream);
}
void System::CreateItemLink(long parent_id, const std::wstring & url, const std::wstring & subdomain,
std::wstring & link, bool clear_str)
{
PutUrlProto(config->use_ssl, link, clear_str);
PutUrlProto(link, clear_str);
if( !subdomain.empty() )
{
@@ -207,7 +258,7 @@ void System::CreateItemLink(const Item & item, std::wstring & link, bool clear_s
*/
void System::RedirectTo(const Item & item, const wchar_t * postfix, bool use_reqtype)
{
PutUrlProto(config->use_ssl, cur->request->redirect_to);
PutUrlProto(cur->request->redirect_to);
if( !cur->request->subdomain.empty() )
{
@@ -246,7 +297,7 @@ void System::RedirectTo(const Item & item, const wchar_t * postfix, bool use_req
*/
void System::RedirectTo(long item_id, const wchar_t * postfix, bool use_reqtype)
{
PutUrlProto(config->use_ssl, cur->request->redirect_to);
PutUrlProto(cur->request->redirect_to);
if( !cur->request->subdomain.empty() )
{
@@ -300,7 +351,7 @@ void System::RedirectTo(long item_id, const wchar_t * postfix, bool use_reqtype)
*/
void System::RedirectTo(const wchar_t * url, bool use_reqtype)
{
PutUrlProto(config->use_ssl, cur->request->redirect_to);
PutUrlProto(cur->request->redirect_to);
if( !cur->request->subdomain.empty() )
{

8
winixd/core/system.h
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2016, Tomasz Sowa
* Copyright (c) 2010-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -119,7 +119,13 @@ public:
void AddParams(const ParamTab & param_tab, std::wstring & str, bool clear_str = true);
bool IsSSLRequired(bool try_to_use_ssl);
bool IsSSLRequired();
void PutUrlProto(bool can_use_ssl, std::wstring & str, bool clear_str = true);
void PutUrlProto(bool can_use_ssl, PT::TextStream & str, bool clear_stream = true);
void PutUrlProto(std::wstring & str, bool clear_str = true);
void PutUrlProto(PT::TextStream & str, bool clear_stream = true);
void RedirectTo(const Item & item, const wchar_t * postfix = 0, bool use_reqtype = true);
void RedirectTo(long item_id, const wchar_t * postfix = 0, bool use_reqtype = true);
void RedirectTo(const wchar_t * url, bool use_reqtype = true);