some work on dependency injection

git-svn-id: svn://ttmath.org/publicrep/winix/branches/0.7.x@1147 e52654a7-88a9-db11-a3e9-0013d4bc506e

winixd/core/Makefile.dep

@@ -4,9 +4,8 @@ acceptbaseparser.o: acceptbaseparser.h winixbase.h
 acceptbaseparser.o: ../../../winix/winixd/core/config.h
 acceptbaseparser.o: ../../../pikotools/space/spaceparser.h
 acceptbaseparser.o: ../../../pikotools/space/space.h
-acceptbaseparser.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-acceptbaseparser.o: textstream.h misc.h item.h
-acceptbaseparser.o: ../../../pikotools/space/space.h
+acceptbaseparser.o: ../../../pikotools/textstream/types.h log.h textstream.h
+acceptbaseparser.o: misc.h item.h ../../../pikotools/space/space.h
 acceptbaseparser.o: ../../../pikotools/date/date.h
 acceptbaseparser.o: ../../../pikotools/convert/convert.h
 acceptbaseparser.o: ../../../pikotools/convert/inttostr.h
@@ -33,7 +32,7 @@ app.o: winix_const.h error.h user.h plugindata.h rebus.h winixbase.h
 app.o: ../../../winix/winixd/core/config.h
 app.o: ../../../pikotools/space/spaceparser.h
 app.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h
-app.o: htmlfilter.h log.h textstream.h logmanipulators.h filelog.h
+app.o: log.h textstream.h logmanipulators.h filelog.h
 app.o: ../../../winix/winixd/core/synchro.h ../../../winix/winixd/core/log.h
 app.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h ipban.h cur.h
 app.o: request.h config.h ../../../winix/winixd/templates/htmltextstream.h
@@ -136,8 +135,8 @@ basethread.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h
 basethread.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h
 basethread.o: ../../../pikotools/space/spaceparser.h
 basethread.o: ../../../pikotools/space/space.h
-basethread.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-basethread.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+basethread.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
+basethread.o: item.h ../../../pikotools/space/space.h
 basethread.o: ../../../pikotools/date/date.h
 basethread.o: ../../../pikotools/convert/convert.h
 basethread.o: ../../../pikotools/convert/inttostr.h
@@ -151,6 +150,7 @@ basethread.o: filelog.h ../../../winix/winixd/core/synchro.h
 basethread.o: ../../../winix/winixd/core/log.h
 basethread.o: ../../../winix/winixd/core/filelog.h lock.h
 bbcodeparser.o: bbcodeparser.h htmlfilter.h
+bbcodeparser.o: ../../../winix/winixd/core/winixbase.h
 compress.o: compress.h requesttypes.h
 compress.o: ../../../pikotools/textstream/textstream.h
 compress.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
@@ -164,9 +164,8 @@ compress.o: ../../../pikotools/textstream/types.h winixbase.h
 compress.o: ../../../winix/winixd/core/config.h
 compress.o: ../../../pikotools/space/spaceparser.h
 compress.o: ../../../pikotools/space/space.h
-compress.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-compress.o: textstream.h logmanipulators.h filelog.h
-compress.o: ../../../winix/winixd/core/synchro.h
+compress.o: ../../../pikotools/textstream/types.h log.h textstream.h
+compress.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
 compress.o: ../../../winix/winixd/core/log.h
 compress.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
 config.o: config.h log.h textstream.h misc.h item.h
@@ -183,14 +182,14 @@ config.o: filelog.h ../../../winix/winixd/core/synchro.h crypt.h run.h
 config.o: winixbase.h ../../../winix/winixd/core/config.h
 config.o: ../../../pikotools/space/spaceparser.h
 config.o: ../../../pikotools/space/space.h
-config.o: ../../../pikotools/textstream/types.h htmlfilter.h
+config.o: ../../../pikotools/textstream/types.h
 config.o: ../../../winix/winixd/core/log.h
 config.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h user.h
 crypt.o: crypt.h run.h winixbase.h ../../../winix/winixd/core/config.h
 crypt.o: ../../../pikotools/space/spaceparser.h
 crypt.o: ../../../pikotools/space/space.h
-crypt.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-crypt.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+crypt.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
+crypt.o: item.h ../../../pikotools/space/space.h
 crypt.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
 crypt.o: ../../../pikotools/convert/inttostr.h
 crypt.o: ../../../pikotools/convert/strtoint.h
@@ -216,8 +215,8 @@ dircontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h winixbase.h
 dircontainer.o: ../../../winix/winixd/core/config.h
 dircontainer.o: ../../../pikotools/space/spaceparser.h
 dircontainer.o: ../../../pikotools/space/space.h
-dircontainer.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-dircontainer.o: textstream.h logmanipulators.h filelog.h
+dircontainer.o: ../../../pikotools/textstream/types.h log.h textstream.h
+dircontainer.o: logmanipulators.h filelog.h
 dircontainer.o: ../../../winix/winixd/core/synchro.h
 dircontainer.o: ../../../winix/winixd/core/log.h
 dircontainer.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
@@ -233,7 +232,7 @@ dirs.o: winix_const.h dircontainer.h winixbase.h
 dirs.o: ../../../winix/winixd/core/config.h
 dirs.o: ../../../pikotools/space/spaceparser.h
 dirs.o: ../../../pikotools/space/space.h
-dirs.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h textstream.h
+dirs.o: ../../../pikotools/textstream/types.h log.h textstream.h
 dirs.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
 dirs.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
 dirs.o: lock.h synchro.h ../../../winix/winixd/db/db.h
@@ -281,8 +280,8 @@ filelog.o: ../../../winix/winixd/core/synchro.h timezones.h timezone.h
 filelog.o: ../../../pikotools/space/spaceparser.h
 filelog.o: ../../../pikotools/space/space.h
 filelog.o: ../../../pikotools/textstream/types.h winixbase.h
-filelog.o: ../../../winix/winixd/core/config.h htmlfilter.h log.h
-filelog.o: logmanipulators.h ../../../winix/winixd/core/log.h
+filelog.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h
+filelog.o: ../../../winix/winixd/core/log.h
 filelog.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
 groups.o: groups.h group.h ugcontainer.h ../../../winix/winixd/db/db.h
 groups.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h
@@ -309,21 +308,20 @@ groups.o: ../../../winix/winixd/core/user.h
 groups.o: ../../../winix/winixd/core/group.h
 groups.o: ../../../winix/winixd/core/dircontainer.h
 groups.o: ../../../winix/winixd/core/ugcontainer.h winixbase.h
-groups.o: ../../../winix/winixd/core/config.h htmlfilter.h log.h textstream.h
+groups.o: ../../../winix/winixd/core/config.h log.h textstream.h
 groups.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
 groups.o: ../../../winix/winixd/core/log.h
 groups.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h winixmodel.h
 groups.o: plugin.h pluginmsg.h plugindata.h
-htmlfilter.o: htmlfilter.h
+htmlfilter.o: htmlfilter.h ../../../winix/winixd/core/winixbase.h
 httpsimpleparser.o: httpsimpleparser.h winixmodel.h
 httpsimpleparser.o: ../../../winix/winixd/core/winixbase.h plugin.h
 httpsimpleparser.o: pluginmsg.h plugindata.h winixbase.h
 httpsimpleparser.o: ../../../winix/winixd/core/config.h
 httpsimpleparser.o: ../../../pikotools/space/spaceparser.h
 httpsimpleparser.o: ../../../pikotools/space/space.h
-httpsimpleparser.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-httpsimpleparser.o: textstream.h misc.h item.h
-httpsimpleparser.o: ../../../pikotools/space/space.h
+httpsimpleparser.o: ../../../pikotools/textstream/types.h log.h textstream.h
+httpsimpleparser.o: misc.h item.h ../../../pikotools/space/space.h
 httpsimpleparser.o: ../../../pikotools/date/date.h
 httpsimpleparser.o: ../../../pikotools/convert/convert.h
 httpsimpleparser.o: ../../../pikotools/convert/inttostr.h
@@ -342,8 +340,8 @@ image.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h
 image.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h
 image.o: ../../../pikotools/space/spaceparser.h
 image.o: ../../../pikotools/space/space.h
-image.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-image.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+image.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
+image.o: item.h ../../../pikotools/space/space.h
 image.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
 image.o: ../../../pikotools/convert/inttostr.h
 image.o: ../../../pikotools/convert/strtoint.h
@@ -394,8 +392,8 @@ ipbancontainer.o: plugindata.h winixbase.h
 ipbancontainer.o: ../../../winix/winixd/core/config.h
 ipbancontainer.o: ../../../pikotools/space/spaceparser.h
 ipbancontainer.o: ../../../pikotools/space/space.h
-ipbancontainer.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-ipbancontainer.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+ipbancontainer.o: ../../../pikotools/textstream/types.h log.h textstream.h
+ipbancontainer.o: misc.h item.h ../../../pikotools/space/space.h
 ipbancontainer.o: ../../../pikotools/date/date.h
 ipbancontainer.o: ../../../pikotools/convert/convert.h
 ipbancontainer.o: ../../../pikotools/convert/inttostr.h
@@ -421,7 +419,7 @@ item.o: winix_const.h crypt.h run.h winixbase.h
 item.o: ../../../winix/winixd/core/config.h
 item.o: ../../../pikotools/space/spaceparser.h
 item.o: ../../../pikotools/space/space.h
-item.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h textstream.h
+item.o: ../../../pikotools/textstream/types.h log.h textstream.h
 item.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
 item.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
 item.o: lock.h synchro.h config.h user.h
@@ -430,9 +428,8 @@ job.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h
 job.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h
 job.o: ../../../pikotools/space/spaceparser.h
 job.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h
-job.o: htmlfilter.h log.h textstream.h misc.h item.h
-job.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
-job.o: ../../../pikotools/convert/convert.h
+job.o: log.h textstream.h misc.h item.h ../../../pikotools/space/space.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 requesttypes.h
@@ -455,16 +452,16 @@ lastcontainer.o: ../../../pikotools/utf8/utf8.h winix_const.h winixbase.h
 lastcontainer.o: ../../../winix/winixd/core/config.h
 lastcontainer.o: ../../../pikotools/space/spaceparser.h
 lastcontainer.o: ../../../pikotools/space/space.h
-lastcontainer.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-lastcontainer.o: textstream.h logmanipulators.h filelog.h
+lastcontainer.o: ../../../pikotools/textstream/types.h log.h textstream.h
+lastcontainer.o: logmanipulators.h filelog.h
 lastcontainer.o: ../../../winix/winixd/core/synchro.h
 lastcontainer.o: ../../../winix/winixd/core/log.h
 lastcontainer.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
 loadavg.o: loadavg.h winixbase.h ../../../winix/winixd/core/config.h
 loadavg.o: ../../../pikotools/space/spaceparser.h
 loadavg.o: ../../../pikotools/space/space.h
-loadavg.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-loadavg.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+loadavg.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
+loadavg.o: item.h ../../../pikotools/space/space.h
 loadavg.o: ../../../pikotools/date/date.h
 loadavg.o: ../../../pikotools/convert/convert.h
 loadavg.o: ../../../pikotools/convert/inttostr.h
@@ -505,6 +502,7 @@ misc.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h
 misc.o: ../../../ezc/src/patternparser.h
 misc.o: ../../../winix/winixd/templates/patterncacher.h
 misc.o: ../../../winix/winixd/core/item.h
+misc.o: ../../../winix/winixd/core/winixbase.h
 misc.o: ../../../winix/winixd/templates/indexpatterns.h
 misc.o: ../../../winix/winixd/templates/patterns.h
 misc.o: ../../../winix/winixd/templates/locale.h
@@ -514,7 +512,7 @@ misc.o: ../../../winix/winixd/templates/localefilter.h
 misc.o: ../../../winix/winixd/core/config.h
 misc.o: ../../../pikotools/space/spaceparser.h
 misc.o: ../../../pikotools/space/space.h
-misc.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h textstream.h
+misc.o: ../../../pikotools/textstream/types.h log.h textstream.h
 misc.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
 misc.o: ../../../winix/winixd/core/cur.h ../../../winix/winixd/core/system.h
 misc.o: ../../../winix/winixd/core/sessionmanager.h
@@ -522,7 +520,6 @@ misc.o: ../../../winix/winixd/core/htmlfilter.h ../../../winix/winixd/db/db.h
 misc.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h
 misc.o: ../../../winix/winixd/db/dbtextstream.h
 misc.o: ../../../winix/winixd/core/textstream.h
-misc.o: ../../../winix/winixd/core/winixbase.h
 misc.o: ../../../winix/winixd/core/error.h
 misc.o: ../../../winix/winixd/db/dbitemquery.h
 misc.o: ../../../winix/winixd/db/dbitemcolumns.h
@@ -530,7 +527,13 @@ misc.o: ../../../winix/winixd/core/user.h ../../../winix/winixd/core/group.h
 misc.o: ../../../winix/winixd/core/dircontainer.h
 misc.o: ../../../winix/winixd/core/ugcontainer.h winixbase.h
 misc.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
-misc.o: lock.h synchro.h
+misc.o: lock.h synchro.h ../../../winix/winixd/core/winixrequest.h
+misc.o: ../../../winix/winixd/core/winixsystem.h
+misc.o: ../../../winix/winixd/core/winixmodel.h
+misc.o: ../../../winix/winixd/core/slog.h cur.h request.h error.h config.h
+misc.o: ../../../winix/winixd/templates/htmltextstream.h
+misc.o: ../../../pikotools/space/spacetojson.h session.h user.h plugindata.h
+misc.o: rebus.h ipban.h mount.h ../../../winix/winixd/templates/locale.h
 mount.o: mount.h misc.h item.h ../../../pikotools/space/space.h
 mount.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
 mount.o: ../../../pikotools/convert/inttostr.h
@@ -553,8 +556,8 @@ mountparser.o: ../../../pikotools/utf8/utf8.h winix_const.h dirs.h
 mountparser.o: dircontainer.h winixbase.h ../../../winix/winixd/core/config.h
 mountparser.o: ../../../pikotools/space/spaceparser.h
 mountparser.o: ../../../pikotools/space/space.h
-mountparser.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-mountparser.o: textstream.h logmanipulators.h filelog.h
+mountparser.o: ../../../pikotools/textstream/types.h log.h textstream.h
+mountparser.o: logmanipulators.h filelog.h
 mountparser.o: ../../../winix/winixd/core/synchro.h
 mountparser.o: ../../../winix/winixd/core/log.h
 mountparser.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
@@ -589,9 +592,8 @@ mounts.o: ../../../pikotools/utf8/utf8.h winix_const.h dircontainer.h
 mounts.o: winixbase.h ../../../winix/winixd/core/config.h
 mounts.o: ../../../pikotools/space/spaceparser.h
 mounts.o: ../../../pikotools/space/space.h
-mounts.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-mounts.o: textstream.h logmanipulators.h filelog.h
-mounts.o: ../../../winix/winixd/core/synchro.h
+mounts.o: ../../../pikotools/textstream/types.h log.h textstream.h
+mounts.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
 mounts.o: ../../../winix/winixd/core/log.h
 mounts.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
 mounts.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
@@ -615,8 +617,8 @@ plugin.o: plugin.h pluginmsg.h plugindata.h winixbase.h
 plugin.o: ../../../winix/winixd/core/config.h
 plugin.o: ../../../pikotools/space/spaceparser.h
 plugin.o: ../../../pikotools/space/space.h
-plugin.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-plugin.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+plugin.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
+plugin.o: item.h ../../../pikotools/space/space.h
 plugin.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
 plugin.o: ../../../pikotools/convert/inttostr.h
 plugin.o: ../../../pikotools/convert/strtoint.h
@@ -723,13 +725,13 @@ plugin.o: ../../../winix/winixd/templates/patterncacher.h
 plugin.o: ../../../winix/winixd/templates/indexpatterns.h
 plugin.o: ../../../winix/winixd/templates/patterns.h
 plugin.o: ../../../winix/winixd/templates/changepatterns.h
-plugin.o: ../../../winix/winixd/templates/htmltextstream.h winixsystem.h
+plugin.o: ../../../winix/winixd/templates/htmltextstream.h winixrequest.h
 plugindata.o: plugindata.h plugin.h pluginmsg.h winixbase.h
 plugindata.o: ../../../winix/winixd/core/config.h
 plugindata.o: ../../../pikotools/space/spaceparser.h
 plugindata.o: ../../../pikotools/space/space.h
-plugindata.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-plugindata.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+plugindata.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
+plugindata.o: item.h ../../../pikotools/space/space.h
 plugindata.o: ../../../pikotools/date/date.h
 plugindata.o: ../../../pikotools/convert/convert.h
 plugindata.o: ../../../pikotools/convert/inttostr.h
@@ -756,8 +758,8 @@ postmultiparser.o: ../../../pikotools/textstream/types.h config.h winixbase.h
 postmultiparser.o: ../../../winix/winixd/core/config.h
 postmultiparser.o: ../../../pikotools/space/spaceparser.h
 postmultiparser.o: ../../../pikotools/space/space.h
-postmultiparser.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-postmultiparser.o: textstream.h logmanipulators.h filelog.h
+postmultiparser.o: ../../../pikotools/textstream/types.h log.h textstream.h
+postmultiparser.o: logmanipulators.h filelog.h
 postmultiparser.o: ../../../winix/winixd/core/synchro.h
 postmultiparser.o: ../../../winix/winixd/core/log.h
 postmultiparser.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
@@ -775,7 +777,7 @@ rebus.o: ../../../winix/winixd/core/synchro.h rebus.h winixbase.h
 rebus.o: ../../../winix/winixd/core/config.h
 rebus.o: ../../../pikotools/space/spaceparser.h
 rebus.o: ../../../pikotools/space/space.h
-rebus.o: ../../../pikotools/textstream/types.h htmlfilter.h
+rebus.o: ../../../pikotools/textstream/types.h
 rebus.o: ../../../winix/winixd/core/log.h
 rebus.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h cur.h
 rebus.o: request.h error.h config.h
@@ -801,15 +803,14 @@ request.o: ../../../pikotools/textstream/types.h
 request.o: ../../../ezc/src/outstreams.h log.h logmanipulators.h filelog.h
 request.o: ../../../winix/winixd/core/synchro.h plugin.h pluginmsg.h
 request.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h
-request.o: ../../../pikotools/space/spaceparser.h htmlfilter.h
+request.o: ../../../pikotools/space/spaceparser.h
 request.o: ../../../winix/winixd/core/log.h
 request.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
 run.o: run.h winixbase.h ../../../winix/winixd/core/config.h
 run.o: ../../../pikotools/space/spaceparser.h
 run.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h
-run.o: htmlfilter.h log.h textstream.h misc.h item.h
-run.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h
-run.o: ../../../pikotools/convert/convert.h
+run.o: log.h textstream.h misc.h item.h ../../../pikotools/space/space.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 requesttypes.h
@@ -833,9 +834,8 @@ session.o: plugindata.h rebus.h winixbase.h
 session.o: ../../../winix/winixd/core/config.h
 session.o: ../../../pikotools/space/spaceparser.h
 session.o: ../../../pikotools/space/space.h
-session.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-session.o: textstream.h logmanipulators.h filelog.h
-session.o: ../../../winix/winixd/core/synchro.h
+session.o: ../../../pikotools/textstream/types.h log.h textstream.h
+session.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
 session.o: ../../../winix/winixd/core/log.h
 session.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h ipban.h
 sessioncontainer.o: sessioncontainer.h session.h item.h
@@ -853,8 +853,8 @@ sessioncontainer.o: user.h plugindata.h rebus.h winixbase.h
 sessioncontainer.o: ../../../winix/winixd/core/config.h
 sessioncontainer.o: ../../../pikotools/space/spaceparser.h
 sessioncontainer.o: ../../../pikotools/space/space.h
-sessioncontainer.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-sessioncontainer.o: textstream.h logmanipulators.h filelog.h
+sessioncontainer.o: ../../../pikotools/textstream/types.h log.h textstream.h
+sessioncontainer.o: logmanipulators.h filelog.h
 sessioncontainer.o: ../../../winix/winixd/core/synchro.h
 sessioncontainer.o: ../../../winix/winixd/core/log.h
 sessioncontainer.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
@@ -870,8 +870,8 @@ sessionidmanager.o: ../../../pikotools/space/space.h ../../../tito/src/aes.h
 sessionidmanager.o: winixbase.h ../../../winix/winixd/core/config.h
 sessionidmanager.o: ../../../pikotools/space/spaceparser.h
 sessionidmanager.o: ../../../pikotools/space/space.h
-sessionidmanager.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-sessionidmanager.o: textstream.h misc.h item.h ../../../pikotools/date/date.h
+sessionidmanager.o: ../../../pikotools/textstream/types.h log.h textstream.h
+sessionidmanager.o: misc.h item.h ../../../pikotools/date/date.h
 sessionidmanager.o: ../../../pikotools/convert/convert.h
 sessionidmanager.o: ../../../pikotools/convert/inttostr.h
 sessionidmanager.o: ../../../pikotools/convert/strtoint.h
@@ -899,8 +899,8 @@ sessionmanager.o: plugindata.h rebus.h winixbase.h
 sessionmanager.o: ../../../winix/winixd/core/config.h
 sessionmanager.o: ../../../pikotools/space/spaceparser.h
 sessionmanager.o: ../../../pikotools/space/space.h
-sessionmanager.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-sessionmanager.o: textstream.h logmanipulators.h filelog.h
+sessionmanager.o: ../../../pikotools/textstream/types.h log.h textstream.h
+sessionmanager.o: logmanipulators.h filelog.h
 sessionmanager.o: ../../../winix/winixd/core/synchro.h
 sessionmanager.o: ../../../winix/winixd/core/log.h
 sessionmanager.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
@@ -968,8 +968,8 @@ sessionparser.o: plugindata.h rebus.h winixbase.h
 sessionparser.o: ../../../winix/winixd/core/config.h
 sessionparser.o: ../../../pikotools/space/spaceparser.h
 sessionparser.o: ../../../pikotools/space/space.h
-sessionparser.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-sessionparser.o: textstream.h logmanipulators.h filelog.h
+sessionparser.o: ../../../pikotools/textstream/types.h log.h textstream.h
+sessionparser.o: logmanipulators.h filelog.h
 sessionparser.o: ../../../winix/winixd/core/synchro.h
 sessionparser.o: ../../../winix/winixd/core/log.h
 sessionparser.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
@@ -1009,19 +1009,20 @@ slog.o: ../../../pikotools/space/space.h
 slog.o: ../../../pikotools/textstream/types.h ../../../ezc/src/outstreams.h
 slog.o: session.h user.h plugindata.h rebus.h winixbase.h
 slog.o: ../../../winix/winixd/core/config.h
-slog.o: ../../../pikotools/space/spaceparser.h htmlfilter.h log.h
-slog.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
+slog.o: ../../../pikotools/space/spaceparser.h log.h logmanipulators.h
+slog.o: filelog.h ../../../winix/winixd/core/synchro.h
 slog.o: ../../../winix/winixd/core/log.h ../../../winix/winixd/core/filelog.h
 slog.o: lock.h synchro.h ipban.h mount.h
 slog.o: ../../../winix/winixd/templates/locale.h
+slog.o: ../../../winix/winixd/core/winixbase.h
 synchro.o: synchro.h
 system.o: system.h job.h basethread.h synchro.h winixmodel.h
 system.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h
 system.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h
 system.o: ../../../pikotools/space/spaceparser.h
 system.o: ../../../pikotools/space/space.h
-system.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-system.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+system.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
+system.o: item.h ../../../pikotools/space/space.h
 system.o: ../../../pikotools/date/date.h ../../../pikotools/convert/convert.h
 system.o: ../../../pikotools/convert/inttostr.h
 system.o: ../../../pikotools/convert/strtoint.h
@@ -1077,12 +1078,12 @@ system.o: ../../../winix/winixd/core/cur.h
 system.o: ../../../winix/winixd/core/system.h
 system.o: ../../../winix/winixd/core/sessionmanager.h
 system.o: ../../../winix/winixd/core/htmlfilter.h
-system.o: ../../../winix/winixd/functions/functions.h
-system.o: ../../../winix/winixd/functions/functionbase.h
-system.o: ../../../winix/winixd/core/request.h
 system.o: ../../../winix/winixd/core/winixrequest.h
 system.o: ../../../winix/winixd/core/winixsystem.h
 system.o: ../../../winix/winixd/core/slog.h
+system.o: ../../../winix/winixd/functions/functions.h
+system.o: ../../../winix/winixd/functions/functionbase.h
+system.o: ../../../winix/winixd/core/request.h
 system.o: ../../../winix/winixd/functions/functionparser.h
 system.o: ../../../winix/winixd/functions/account.h
 system.o: ../../../winix/winixd/functions/adduser.h
@@ -1130,8 +1131,8 @@ threadmanager.o: ../../../winix/winixd/core/winixbase.h plugin.h pluginmsg.h
 threadmanager.o: plugindata.h winixbase.h ../../../winix/winixd/core/config.h
 threadmanager.o: ../../../pikotools/space/spaceparser.h
 threadmanager.o: ../../../pikotools/space/space.h
-threadmanager.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-threadmanager.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+threadmanager.o: ../../../pikotools/textstream/types.h log.h textstream.h
+threadmanager.o: misc.h item.h ../../../pikotools/space/space.h
 threadmanager.o: ../../../pikotools/date/date.h
 threadmanager.o: ../../../pikotools/convert/convert.h
 threadmanager.o: ../../../pikotools/convert/inttostr.h
@@ -1168,9 +1169,8 @@ timezones.o: ../../../pikotools/utf8/utf8.h winix_const.h
 timezones.o: ../../../pikotools/space/spaceparser.h
 timezones.o: ../../../pikotools/space/space.h
 timezones.o: ../../../pikotools/textstream/types.h winixbase.h
-timezones.o: ../../../winix/winixd/core/config.h htmlfilter.h log.h
-timezones.o: textstream.h logmanipulators.h filelog.h
-timezones.o: ../../../winix/winixd/core/synchro.h
+timezones.o: ../../../winix/winixd/core/config.h log.h textstream.h
+timezones.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
 timezones.o: ../../../winix/winixd/core/log.h
 timezones.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
 user.o: user.h ../../../pikotools/space/space.h
@@ -1194,9 +1194,8 @@ users.o: winix_const.h ugcontainer.h lastcontainer.h winixbase.h
 users.o: ../../../winix/winixd/core/config.h
 users.o: ../../../pikotools/space/spaceparser.h
 users.o: ../../../pikotools/space/space.h
-users.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-users.o: textstream.h logmanipulators.h filelog.h
-users.o: ../../../winix/winixd/core/synchro.h
+users.o: ../../../pikotools/textstream/types.h log.h textstream.h
+users.o: logmanipulators.h filelog.h ../../../winix/winixd/core/synchro.h
 users.o: ../../../winix/winixd/core/log.h
 users.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h cur.h
 users.o: request.h error.h config.h
@@ -1239,8 +1238,8 @@ users.o: ../../../tito/src/aes.h
 winixbase.o: winixbase.h ../../../winix/winixd/core/config.h
 winixbase.o: ../../../pikotools/space/spaceparser.h
 winixbase.o: ../../../pikotools/space/space.h
-winixbase.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-winixbase.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+winixbase.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
+winixbase.o: item.h ../../../pikotools/space/space.h
 winixbase.o: ../../../pikotools/date/date.h
 winixbase.o: ../../../pikotools/convert/convert.h
 winixbase.o: ../../../pikotools/convert/inttostr.h
@@ -1258,8 +1257,8 @@ winixmodel.o: pluginmsg.h plugindata.h winixbase.h
 winixmodel.o: ../../../winix/winixd/core/config.h
 winixmodel.o: ../../../pikotools/space/spaceparser.h
 winixmodel.o: ../../../pikotools/space/space.h
-winixmodel.o: ../../../pikotools/textstream/types.h htmlfilter.h log.h
-winixmodel.o: textstream.h misc.h item.h ../../../pikotools/space/space.h
+winixmodel.o: ../../../pikotools/textstream/types.h log.h textstream.h misc.h
+winixmodel.o: item.h ../../../pikotools/space/space.h
 winixmodel.o: ../../../pikotools/date/date.h
 winixmodel.o: ../../../pikotools/convert/convert.h
 winixmodel.o: ../../../pikotools/convert/inttostr.h
@@ -1273,4 +1272,5 @@ winixmodel.o: filelog.h ../../../winix/winixd/core/synchro.h
 winixmodel.o: ../../../winix/winixd/core/log.h
 winixmodel.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h
 winixrequest.o: winixrequest.h
-winixsystem.o: winixsystem.h
+winixsystem.o: winixsystem.h ../../../winix/winixd/core/winixmodel.h
+winixsystem.o: ../../../winix/winixd/core/system.h

winixd/core/app.cpp

@@ -111,7 +111,7 @@ App::App()
 	plugin.SetTemplates(&templates);
 	//plugin.SetSynchro(&synchro);
 	plugin.SetSessionManager(&session_manager);
-	plugin.SetWinixSystem(&winix_system);
+	plugin.SetWinixRequest(&winix_request);
 
 	req.SetConfig(&config);
 
@@ -138,6 +138,7 @@ App::App()
 	system.SetFunctions(&functions);
 	system.SetSessionManager(&session_manager);
 
+	templates.set_dependency(&winix_request);
 	templates.SetConfig(&config);
 	templates.SetCur(&cur);
 	templates.SetDb(&db);
@@ -163,6 +164,9 @@ void App::InitFileLog()
 	file_log.set_synchro(&synchro);
 	file_log.set_time_zones(&system.time_zones);
 	file_log.init(config.log_file, config.log_stdout, config.log_time_zone_id);
+
+	log.SetFileLog(&file_log);
+	log.Init(config.log_level, config.log_save_each_line, config.log_request);
 }
 
 
@@ -1901,6 +1905,8 @@ void App::LogUserGroups()
 {
 	LogUsers();
 	LogGroups();
+
+	log << log3 << "base_url: " << config.base_url << logend;
 }
 
 

winixd/core/config.cpp

@@ -324,11 +324,6 @@ void Config::AssignValues(bool stdout_is_closed)
 
 void Config::SetAdditionalVariables()
 {
-	if( html_filter_orphans_mode_str == L"160" )
-		html_filter_orphans_mode = HTMLFilter::orphan_160space;
-	else
-		html_filter_orphans_mode = HTMLFilter::orphan_nbsp;
-
 	for(size_t i=0 ; i<static_dirs.size() ; ++i)
 		NoLastSlash(static_dirs[i]);
 

winixd/core/config.h

@@ -37,7 +37,6 @@
 
 #include <string>
 #include "space/spaceparser.h"
-#include "htmlfilter.h"
 #include "log.h"
 #include "filelog.h"
 
@@ -331,7 +330,6 @@ public:
 	// either: "nbsp" or "160"
 	// default: "nbsp"
 	std::wstring html_filter_orphans_mode_str;
-	HTMLFilter::OrphanMode html_filter_orphans_mode;
 
 	// the html nofilter tag
 	// content betweeng these tags (opening and closing) will not be filtered

winixd/core/htmlfilter.cpp

@@ -234,9 +234,12 @@ void HTMLFilter::ClearOrphans()
 
 
 
-void HTMLFilter::OrphansMode(HTMLFilter::OrphanMode mode)
+void HTMLFilter::OrphansMode(const std::wstring & orphan_mode_str)
 {
-	orphan_mode = mode;
+	if( orphan_mode_str == L"160" )
+		orphan_mode = orphan_160space;
+	else
+		orphan_mode = orphan_nbsp;
 }
 
 

winixd/core/htmlfilter.h

@@ -39,6 +39,7 @@
 #include <map>
 #include <vector>
 #include <algorithm>
+#include "core/winixbase.h"
 
 
 namespace Winix
@@ -86,7 +87,7 @@ namespace Winix
 
 	the filter recognizes xml simple tags (with / at the end) such as: <br />
 */
-class HTMLFilter
+class HTMLFilter : public WinixBase
 {
 public:
 
@@ -146,7 +147,7 @@ public:
 	// check 'orphans' for the specicic language
 	// if an orphan is detected then the non-break space ("&nbsp;" or ascii 160 code) will be put
 	// default disable (lang_none)
-	void OrphansMode(OrphanMode mode = orphan_nbsp);
+	void OrphansMode(const std::wstring & orphan_mode);
 
 	// skipping some unsafe tags
 	// (script, iframe, frame, frameset, applet, head, meta, html, link, body, ...)

winixd/core/plugin.cpp

@@ -40,13 +40,36 @@
 #include "sessionmanager.h"
 #include "functions/functions.h"
 #include "templates/templates.h"
-#include "winixsystem.h"
+#include "winixrequest.h"
+
 
 
 namespace Winix
 {
 
 
+/*
+ *
+ * PluginInfo
+ *
+ *
+ */
+
+
+void PluginInfo::set_dependency_for(WinixBase * winix_base)
+{
+	plugin->SetDependencyFor(winix_base);
+}
+
+
+
+/*
+ *
+ * Plugin
+ *
+ *
+ */
+
 
 void Plugin::UnloadPlugins()
 {
@@ -71,7 +94,7 @@ Plugin::Plugin()
 	functions       = nullptr;
 	templates       = nullptr;
 	session_manager = nullptr;
-	winix_system    = nullptr;
+	winix_request   = nullptr;
 }
 	
 
@@ -128,9 +151,9 @@ void Plugin::SetSessionManager(SessionManager * psession_manager)
 }
 
 
-void Plugin::SetWinixSystem(WinixSystem * winix_system)
+void Plugin::SetWinixRequest(WinixRequest * winix_request)
 {
-	this->winix_system = winix_system;
+	this->winix_request = winix_request;
 }
 
 
@@ -154,7 +177,7 @@ void Plugin::Unlock()
 bool Plugin::SetDependency(PluginInfo & info)
 {
 	// for safety we call a plugin function only when all our pointers are not null
-	bool res = (db && config && cur && system && functions && templates && synchro && session_manager && winix_system);
+	bool res = (db && config && cur && system && functions && templates && synchro && session_manager && winix_request);
 
 	if( !res )
 	{
@@ -171,13 +194,19 @@ bool Plugin::SetDependency(PluginInfo & info)
 	info.templates = templates;
 	info.synchro   = synchro;
 	info.session_manager = session_manager;
-	info.winix_system = winix_system;
 	info.plugin	   = this;
+
 	info.log.SetDependency(&log);
+	log.Init(config->log_level, config->log_save_each_line, config->log_request);
 
 return res;
 }
 
+void Plugin::SetDependencyFor(WinixBase * winix_base)
+{
+	winix_base->set_dependency(winix_request);
+}
+
 
 void Plugin::LoadPlugins(const std::wstring & plugins_dir, const std::vector<std::wstring> & plugins)
 {
@@ -536,5 +565,13 @@ const Plugin::Plugins * Plugin::GetPlugins()
 }
 
 
+
+
+
+
+
+
+
+
 } // namespace Winix
 

winixd/core/plugin.h

@@ -55,7 +55,7 @@ class Functions;
 class Templates;
 class SessionManager;
 
-class WinixSystem;
+class WinixRequest;
 
 
 
@@ -80,6 +80,7 @@ class Plugin;
 class Session;
 
 
+// move me to a different file
 struct PluginInfo
 {
 	// these variables are used for some purposes
@@ -103,9 +104,7 @@ struct PluginInfo
 	Synchro   * synchro;
 	SessionManager * session_manager;
 
-	// temporarily?
 	Log log;
-	WinixSystem * winix_system;
 
 	Plugin * plugin;
 
@@ -127,8 +126,17 @@ struct PluginInfo
 	// function return status
 	// default: false (if not set by the plugin)
 	bool res;
+
+
+
+	void set_dependency_for(WinixBase * winix_base);
+
+	void set_dependency_for(WinixBase & winix_base)
+	{
+		set_dependency_for(&winix_base);
+	}
 	
-	
+
 	void Clear()
 	{
 		// pointers to winix objects are not cleared here
@@ -144,6 +152,7 @@ struct PluginInfo
 
 		res = false;
 	}
+
 };
 
 
@@ -214,7 +223,7 @@ public:
 	//void SetSynchro(Synchro * psynchro);
 	void SetSessionManager(SessionManager * psession_manager);
 
-	void SetWinixSystem(WinixSystem * winix_system);
+	void SetWinixRequest(WinixRequest * winix_request);
 
 	void LoadPlugin(const wchar_t * filename);
 	void LoadPlugin(const std::wstring & filename);
@@ -268,7 +277,7 @@ private:
 	//Synchro   * synchro;
 	SessionManager * session_manager;
 
-	WinixSystem * winix_system;
+	WinixRequest * winix_request;
 
 	std::wstring temp_path;	// used when loading plugins
 
@@ -281,8 +290,11 @@ private:
 	void Call(Session * ses, int message, Slots::iterator & slot, PluginInfo & info);
 
 	bool SetDependency(PluginInfo & info);
+	void SetDependencyFor(WinixBase * winix_base);
 	void Lock();
 	void Unlock();
+
+	friend PluginInfo;
 };
 
 

winixd/core/winixmodel.cpp

@@ -78,6 +78,11 @@ void WinixModel::set_dependency(WinixModel * winix_model)
 }
 
 
+Plugin * WinixModel::get_plugin()
+{
+	return plugin;
+}
+
 
 }
 

winixd/core/winixmodel.h

@@ -57,6 +57,10 @@ public:
 	void set_dependency(WinixBase * winix_base);
 	void set_dependency(WinixModel * winix_model);
 
+
+	// temporarily for templates, will be removed
+	Plugin * get_plugin();
+
 protected:
 
 	morm::ModelConnector * model_connector;

winixd/core/winixsystem.cpp

@@ -45,6 +45,11 @@ WinixSystem::WinixSystem()
 }
 
 
+WinixSystem::~WinixSystem()
+{
+}
+
+
 void WinixSystem::set_system(System * system)
 {
 	this->system = system;

winixd/db/Makefile.dep

@@ -15,7 +15,6 @@ db.o: ../../../winix/winixd/core/winix_const.h
 db.o: ../../../winix/winixd/core/winixbase.h
 db.o: ../../../winix/winixd/core/config.h
 db.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h
-db.o: ../../../winix/winixd/core/htmlfilter.h
 db.o: ../../../winix/winixd/core/log.h
 db.o: ../../../winix/winixd/core/textstream.h
 db.o: ../../../winix/winixd/core/logmanipulators.h
@@ -47,9 +46,7 @@ dbbase.o: ../../../winix/winixd/core/winix_const.h
 dbbase.o: ../../../winix/winixd/core/winixbase.h
 dbbase.o: ../../../winix/winixd/core/config.h
 dbbase.o: ../../../pikotools/space/spaceparser.h
-dbbase.o: ../../../pikotools/space/space.h
-dbbase.o: ../../../winix/winixd/core/htmlfilter.h
-dbbase.o: ../../../winix/winixd/core/log.h
+dbbase.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 dbbase.o: ../../../winix/winixd/core/textstream.h
 dbbase.o: ../../../winix/winixd/core/logmanipulators.h
 dbbase.o: ../../../winix/winixd/core/filelog.h
@@ -77,9 +74,7 @@ dbconn.o: ../../../winix/winixd/core/winix_const.h
 dbconn.o: ../../../winix/winixd/core/winixbase.h
 dbconn.o: ../../../winix/winixd/core/config.h
 dbconn.o: ../../../pikotools/space/spaceparser.h
-dbconn.o: ../../../pikotools/space/space.h
-dbconn.o: ../../../winix/winixd/core/htmlfilter.h
-dbconn.o: ../../../winix/winixd/core/log.h
+dbconn.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 dbconn.o: ../../../winix/winixd/core/textstream.h
 dbconn.o: ../../../winix/winixd/core/logmanipulators.h
 dbconn.o: ../../../winix/winixd/core/filelog.h
@@ -111,7 +106,6 @@ dbitemcolumns.o: ../../../winix/winixd/core/winixbase.h
 dbitemcolumns.o: ../../../winix/winixd/core/config.h
 dbitemcolumns.o: ../../../pikotools/space/spaceparser.h
 dbitemcolumns.o: ../../../pikotools/space/space.h
-dbitemcolumns.o: ../../../winix/winixd/core/htmlfilter.h
 dbitemcolumns.o: ../../../winix/winixd/core/log.h
 dbitemcolumns.o: ../../../winix/winixd/core/textstream.h
 dbitemcolumns.o: ../../../winix/winixd/core/logmanipulators.h

winixd/functions/Makefile.dep

@@ -20,9 +20,7 @@ account.o: ../../../pikotools/utf8/utf8.h
 account.o: ../../../winix/winixd/core/winixbase.h
 account.o: ../../../winix/winixd/core/config.h
 account.o: ../../../pikotools/space/spaceparser.h
-account.o: ../../../pikotools/space/space.h
-account.o: ../../../winix/winixd/core/htmlfilter.h
-account.o: ../../../winix/winixd/core/log.h
+account.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 account.o: ../../../winix/winixd/core/textstream.h
 account.o: ../../../winix/winixd/core/logmanipulators.h
 account.o: ../../../winix/winixd/core/filelog.h
@@ -125,9 +123,7 @@ adduser.o: ../../../pikotools/utf8/utf8.h
 adduser.o: ../../../winix/winixd/core/winixbase.h
 adduser.o: ../../../winix/winixd/core/config.h
 adduser.o: ../../../pikotools/space/spaceparser.h
-adduser.o: ../../../pikotools/space/space.h
-adduser.o: ../../../winix/winixd/core/htmlfilter.h
-adduser.o: ../../../winix/winixd/core/log.h
+adduser.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 adduser.o: ../../../winix/winixd/core/textstream.h
 adduser.o: ../../../winix/winixd/core/logmanipulators.h
 adduser.o: ../../../winix/winixd/core/filelog.h
@@ -226,9 +222,7 @@ cat.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 cat.o: ../../../winix/winixd/core/winixbase.h
 cat.o: ../../../winix/winixd/core/config.h
 cat.o: ../../../pikotools/space/spaceparser.h
-cat.o: ../../../pikotools/space/space.h
-cat.o: ../../../winix/winixd/core/htmlfilter.h
-cat.o: ../../../winix/winixd/core/log.h
+cat.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 cat.o: ../../../winix/winixd/core/textstream.h
 cat.o: ../../../winix/winixd/core/logmanipulators.h
 cat.o: ../../../winix/winixd/core/filelog.h
@@ -317,9 +311,7 @@ chmod.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 chmod.o: ../../../winix/winixd/core/winixbase.h
 chmod.o: ../../../winix/winixd/core/config.h
 chmod.o: ../../../pikotools/space/spaceparser.h
-chmod.o: ../../../pikotools/space/space.h
-chmod.o: ../../../winix/winixd/core/htmlfilter.h
-chmod.o: ../../../winix/winixd/core/log.h
+chmod.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 chmod.o: ../../../winix/winixd/core/textstream.h
 chmod.o: ../../../winix/winixd/core/logmanipulators.h
 chmod.o: ../../../winix/winixd/core/filelog.h
@@ -413,9 +405,7 @@ chown.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 chown.o: ../../../winix/winixd/core/winixbase.h
 chown.o: ../../../winix/winixd/core/config.h
 chown.o: ../../../pikotools/space/spaceparser.h
-chown.o: ../../../pikotools/space/space.h
-chown.o: ../../../winix/winixd/core/htmlfilter.h
-chown.o: ../../../winix/winixd/core/log.h
+chown.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 chown.o: ../../../winix/winixd/core/textstream.h
 chown.o: ../../../winix/winixd/core/logmanipulators.h
 chown.o: ../../../winix/winixd/core/filelog.h
@@ -512,9 +502,7 @@ ckeditor.o: ../../../pikotools/utf8/utf8.h
 ckeditor.o: ../../../winix/winixd/core/winixbase.h
 ckeditor.o: ../../../winix/winixd/core/config.h
 ckeditor.o: ../../../pikotools/space/spaceparser.h
-ckeditor.o: ../../../pikotools/space/space.h
-ckeditor.o: ../../../winix/winixd/core/htmlfilter.h
-ckeditor.o: ../../../winix/winixd/core/log.h
+ckeditor.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 ckeditor.o: ../../../winix/winixd/core/textstream.h
 ckeditor.o: ../../../winix/winixd/core/logmanipulators.h
 ckeditor.o: ../../../winix/winixd/core/filelog.h
@@ -609,7 +597,6 @@ cp.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 cp.o: ../../../winix/winixd/core/winixbase.h
 cp.o: ../../../winix/winixd/core/config.h
 cp.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h
-cp.o: ../../../winix/winixd/core/htmlfilter.h
 cp.o: ../../../winix/winixd/core/log.h
 cp.o: ../../../winix/winixd/core/textstream.h
 cp.o: ../../../winix/winixd/core/logmanipulators.h
@@ -702,9 +689,7 @@ default.o: ../../../pikotools/utf8/utf8.h
 default.o: ../../../winix/winixd/core/winixbase.h
 default.o: ../../../winix/winixd/core/config.h
 default.o: ../../../pikotools/space/spaceparser.h
-default.o: ../../../pikotools/space/space.h
-default.o: ../../../winix/winixd/core/htmlfilter.h
-default.o: ../../../winix/winixd/core/log.h
+default.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 default.o: ../../../winix/winixd/core/textstream.h
 default.o: ../../../winix/winixd/core/logmanipulators.h
 default.o: ../../../winix/winixd/core/filelog.h
@@ -804,9 +789,7 @@ download.o: ../../../pikotools/utf8/utf8.h
 download.o: ../../../winix/winixd/core/winixbase.h
 download.o: ../../../winix/winixd/core/config.h
 download.o: ../../../pikotools/space/spaceparser.h
-download.o: ../../../pikotools/space/space.h
-download.o: ../../../winix/winixd/core/htmlfilter.h
-download.o: ../../../winix/winixd/core/log.h
+download.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 download.o: ../../../winix/winixd/core/textstream.h
 download.o: ../../../winix/winixd/core/logmanipulators.h
 download.o: ../../../winix/winixd/core/filelog.h
@@ -903,9 +886,7 @@ emacs.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 emacs.o: ../../../winix/winixd/core/winixbase.h
 emacs.o: ../../../winix/winixd/core/config.h
 emacs.o: ../../../pikotools/space/spaceparser.h
-emacs.o: ../../../pikotools/space/space.h
-emacs.o: ../../../winix/winixd/core/htmlfilter.h
-emacs.o: ../../../winix/winixd/core/log.h
+emacs.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 emacs.o: ../../../winix/winixd/core/textstream.h
 emacs.o: ../../../winix/winixd/core/logmanipulators.h
 emacs.o: ../../../winix/winixd/core/filelog.h
@@ -1004,9 +985,7 @@ env.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 env.o: ../../../winix/winixd/core/winixbase.h
 env.o: ../../../winix/winixd/core/config.h
 env.o: ../../../pikotools/space/spaceparser.h
-env.o: ../../../pikotools/space/space.h
-env.o: ../../../winix/winixd/core/htmlfilter.h
-env.o: ../../../winix/winixd/core/log.h
+env.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 env.o: ../../../winix/winixd/core/textstream.h
 env.o: ../../../winix/winixd/core/logmanipulators.h
 env.o: ../../../winix/winixd/core/filelog.h
@@ -1100,7 +1079,6 @@ functionbase.o: ../../../winix/winixd/core/winixbase.h
 functionbase.o: ../../../winix/winixd/core/config.h
 functionbase.o: ../../../pikotools/space/spaceparser.h
 functionbase.o: ../../../pikotools/space/space.h
-functionbase.o: ../../../winix/winixd/core/htmlfilter.h
 functionbase.o: ../../../winix/winixd/core/log.h
 functionbase.o: ../../../winix/winixd/core/textstream.h
 functionbase.o: ../../../winix/winixd/core/logmanipulators.h
@@ -1205,7 +1183,6 @@ functionparser.o: ../../../winix/winixd/core/winixbase.h
 functionparser.o: ../../../winix/winixd/core/config.h
 functionparser.o: ../../../pikotools/space/spaceparser.h
 functionparser.o: ../../../pikotools/space/space.h
-functionparser.o: ../../../winix/winixd/core/htmlfilter.h
 functionparser.o: ../../../winix/winixd/core/log.h
 functionparser.o: ../../../winix/winixd/core/textstream.h
 functionparser.o: ../../../winix/winixd/core/logmanipulators.h
@@ -1311,7 +1288,6 @@ functions.o: ../../../winix/winixd/core/winixbase.h
 functions.o: ../../../winix/winixd/core/config.h
 functions.o: ../../../pikotools/space/spaceparser.h
 functions.o: ../../../pikotools/space/space.h
-functions.o: ../../../winix/winixd/core/htmlfilter.h
 functions.o: ../../../winix/winixd/core/log.h
 functions.o: ../../../winix/winixd/core/textstream.h
 functions.o: ../../../winix/winixd/core/logmanipulators.h
@@ -1423,9 +1399,7 @@ imgcrop.o: ../../../pikotools/utf8/utf8.h
 imgcrop.o: ../../../winix/winixd/core/winixbase.h
 imgcrop.o: ../../../winix/winixd/core/config.h
 imgcrop.o: ../../../pikotools/space/spaceparser.h
-imgcrop.o: ../../../pikotools/space/space.h
-imgcrop.o: ../../../winix/winixd/core/htmlfilter.h
-imgcrop.o: ../../../winix/winixd/core/log.h
+imgcrop.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 imgcrop.o: ../../../winix/winixd/core/textstream.h
 imgcrop.o: ../../../winix/winixd/core/logmanipulators.h
 imgcrop.o: ../../../winix/winixd/core/filelog.h
@@ -1522,9 +1496,7 @@ ipban.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 ipban.o: ../../../winix/winixd/core/winixbase.h
 ipban.o: ../../../winix/winixd/core/config.h
 ipban.o: ../../../pikotools/space/spaceparser.h
-ipban.o: ../../../pikotools/space/space.h
-ipban.o: ../../../winix/winixd/core/htmlfilter.h
-ipban.o: ../../../winix/winixd/core/log.h
+ipban.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 ipban.o: ../../../winix/winixd/core/textstream.h
 ipban.o: ../../../winix/winixd/core/logmanipulators.h
 ipban.o: ../../../winix/winixd/core/filelog.h
@@ -1618,9 +1590,7 @@ last.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 last.o: ../../../winix/winixd/core/winixbase.h
 last.o: ../../../winix/winixd/core/config.h
 last.o: ../../../pikotools/space/spaceparser.h
-last.o: ../../../pikotools/space/space.h
-last.o: ../../../winix/winixd/core/htmlfilter.h
-last.o: ../../../winix/winixd/core/log.h
+last.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 last.o: ../../../winix/winixd/core/textstream.h
 last.o: ../../../winix/winixd/core/logmanipulators.h
 last.o: ../../../winix/winixd/core/filelog.h
@@ -1710,7 +1680,6 @@ ln.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 ln.o: ../../../winix/winixd/core/winixbase.h
 ln.o: ../../../winix/winixd/core/config.h
 ln.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h
-ln.o: ../../../winix/winixd/core/htmlfilter.h
 ln.o: ../../../winix/winixd/core/log.h
 ln.o: ../../../winix/winixd/core/textstream.h
 ln.o: ../../../winix/winixd/core/logmanipulators.h
@@ -1802,9 +1771,7 @@ locale.o: ../../../pikotools/utf8/utf8.h
 locale.o: ../../../winix/winixd/core/winixbase.h
 locale.o: ../../../winix/winixd/core/config.h
 locale.o: ../../../pikotools/space/spaceparser.h
-locale.o: ../../../pikotools/space/space.h
-locale.o: ../../../winix/winixd/core/htmlfilter.h
-locale.o: ../../../winix/winixd/core/log.h
+locale.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 locale.o: ../../../winix/winixd/core/textstream.h
 locale.o: ../../../winix/winixd/core/logmanipulators.h
 locale.o: ../../../winix/winixd/core/filelog.h
@@ -1915,9 +1882,7 @@ login.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 login.o: ../../../winix/winixd/core/winixbase.h
 login.o: ../../../winix/winixd/core/config.h
 login.o: ../../../pikotools/space/spaceparser.h
-login.o: ../../../pikotools/space/space.h
-login.o: ../../../winix/winixd/core/htmlfilter.h
-login.o: ../../../winix/winixd/core/log.h
+login.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 login.o: ../../../winix/winixd/core/logmanipulators.h
 login.o: ../../../winix/winixd/core/filelog.h
 login.o: ../../../winix/winixd/core/synchro.h
@@ -2002,9 +1967,7 @@ logout.o: ../../../pikotools/utf8/utf8.h
 logout.o: ../../../winix/winixd/core/winixbase.h
 logout.o: ../../../winix/winixd/core/config.h
 logout.o: ../../../pikotools/space/spaceparser.h
-logout.o: ../../../pikotools/space/space.h
-logout.o: ../../../winix/winixd/core/htmlfilter.h
-logout.o: ../../../winix/winixd/core/log.h
+logout.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 logout.o: ../../../winix/winixd/core/textstream.h
 logout.o: ../../../winix/winixd/core/logmanipulators.h
 logout.o: ../../../winix/winixd/core/filelog.h
@@ -2099,7 +2062,6 @@ ls.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 ls.o: ../../../winix/winixd/core/winixbase.h
 ls.o: ../../../winix/winixd/core/config.h
 ls.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h
-ls.o: ../../../winix/winixd/core/htmlfilter.h
 ls.o: ../../../winix/winixd/core/log.h
 ls.o: ../../../winix/winixd/core/textstream.h
 ls.o: ../../../winix/winixd/core/logmanipulators.h
@@ -2186,9 +2148,7 @@ man.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 man.o: ../../../winix/winixd/core/winixbase.h
 man.o: ../../../winix/winixd/core/config.h
 man.o: ../../../pikotools/space/spaceparser.h
-man.o: ../../../pikotools/space/space.h
-man.o: ../../../winix/winixd/core/htmlfilter.h
-man.o: ../../../winix/winixd/core/log.h
+man.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 man.o: ../../../winix/winixd/core/textstream.h
 man.o: ../../../winix/winixd/core/logmanipulators.h
 man.o: ../../../winix/winixd/core/filelog.h
@@ -2277,9 +2237,7 @@ meta.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 meta.o: ../../../winix/winixd/core/winixbase.h
 meta.o: ../../../winix/winixd/core/config.h
 meta.o: ../../../pikotools/space/spaceparser.h
-meta.o: ../../../pikotools/space/space.h
-meta.o: ../../../winix/winixd/core/htmlfilter.h
-meta.o: ../../../winix/winixd/core/log.h
+meta.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 meta.o: ../../../winix/winixd/core/textstream.h
 meta.o: ../../../winix/winixd/core/logmanipulators.h
 meta.o: ../../../winix/winixd/core/filelog.h
@@ -2371,9 +2329,7 @@ mkdir.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 mkdir.o: ../../../winix/winixd/core/winixbase.h
 mkdir.o: ../../../winix/winixd/core/config.h
 mkdir.o: ../../../pikotools/space/spaceparser.h
-mkdir.o: ../../../pikotools/space/space.h
-mkdir.o: ../../../winix/winixd/core/htmlfilter.h
-mkdir.o: ../../../winix/winixd/core/log.h
+mkdir.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 mkdir.o: ../../../winix/winixd/core/textstream.h
 mkdir.o: ../../../winix/winixd/core/logmanipulators.h
 mkdir.o: ../../../winix/winixd/core/filelog.h
@@ -2467,9 +2423,7 @@ mount.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 mount.o: ../../../winix/winixd/core/winixbase.h
 mount.o: ../../../winix/winixd/core/config.h
 mount.o: ../../../pikotools/space/spaceparser.h
-mount.o: ../../../pikotools/space/space.h
-mount.o: ../../../winix/winixd/core/htmlfilter.h
-mount.o: ../../../winix/winixd/core/log.h
+mount.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 mount.o: ../../../winix/winixd/core/textstream.h
 mount.o: ../../../winix/winixd/core/logmanipulators.h
 mount.o: ../../../winix/winixd/core/filelog.h
@@ -2561,7 +2515,6 @@ mv.o: ../../../pikotools/textstream/types.h ../../../pikotools/utf8/utf8.h
 mv.o: ../../../winix/winixd/core/winixbase.h
 mv.o: ../../../winix/winixd/core/config.h
 mv.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h
-mv.o: ../../../winix/winixd/core/htmlfilter.h
 mv.o: ../../../winix/winixd/core/log.h
 mv.o: ../../../winix/winixd/core/textstream.h
 mv.o: ../../../winix/winixd/core/logmanipulators.h
@@ -2652,9 +2605,7 @@ nicedit.o: ../../../pikotools/utf8/utf8.h
 nicedit.o: ../../../winix/winixd/core/winixbase.h
 nicedit.o: ../../../winix/winixd/core/config.h
 nicedit.o: ../../../pikotools/space/spaceparser.h
-nicedit.o: ../../../pikotools/space/space.h
-nicedit.o: ../../../winix/winixd/core/htmlfilter.h
-nicedit.o: ../../../winix/winixd/core/log.h
+nicedit.o: ../../../pikotools/space/space.h ../../../winix/winixd/core/log.h
 nicedit.o: ../../../winix/winixd/core/textstream.h
 nicedit.o: ../../../winix/winixd/core/logmanipulators.h
 nicedit.o: ../../../winix/winixd/core/filelog.h