diff --git a/winixd/Makefile b/winixd/Makefile index 5a73c47..82379ea 100644 --- a/winixd/Makefile +++ b/winixd/Makefile @@ -65,7 +65,7 @@ all: winix winix.so plugins winix: $(objfiles_main) winix.so - $(CXX) -o winix $(CXXFLAGS) $(LDFLAGS) $(objfiles_main) winix.so + $(CXX) -o winix $(CXXFLAGS) $(LDFLAGS) $(objfiles_main) winix.so -lcurl winix.so: $(objfiles_no_main) @@ -73,7 +73,7 @@ winix.so: $(objfiles_no_main) @cd ../../morm ; $(MAKE) -e @cd ../../ezc ; $(MAKE) -e @cd ../../tito ; $(MAKE) -e - $(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) $(objfiles_no_main) ../../pikotools/src/pikotools.a ../../morm/src/morm.a ../../ezc/src/ezc.a ../../tito/src/tito.a $(LDFLAGS) -lfcgi -lpq -lz -lpthread -lcurl -lmagic -Wl,-no-whole-archive + $(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) $(objfiles_no_main) ../../pikotools/src/pikotools.a ../../morm/src/morm.a ../../ezc/src/ezc.a ../../tito/src/tito.a $(LDFLAGS) -lfcgi -lpq -lz -lpthread -lmagic -Wl,-no-whole-archive plugins: FORCE diff --git a/winixd/Makefile.dep b/winixd/Makefile.dep index f4a52e0..fa8c35e 100644 --- a/winixd/Makefile.dep +++ b/winixd/Makefile.dep @@ -44,9 +44,7 @@ ./core/basethread.o: ../../morm/src/postgresqlconnector.h ./core/basethread.o: ../../morm/src/postgresqlqueryresult.h ./core/basethread.o: ../../morm/src/transaction.h core/log.h core/synchro.h -./core/basethread.o: core/filelog.h core/lock.h ./core/plugin.h -./core/basethread.o: ./core/pluginmsg.h ./core/plugindata.h -./core/basethread.o: ./core/winixbase.h +./core/basethread.o: core/filelog.h core/lock.h ./core/app.o: ./core/app.h ./core/sessionmanager.h ./core/sessioncontainer.h ./core/app.o: ./core/session.h ./core/error.h models/user.h ./core/app.o: ../../morm/src/model.h @@ -106,31 +104,32 @@ ./core/app.o: ./core/cur.h ./core/request.h ./core/requesttypes.h ./core/app.o: models/item.h models/itemcontent.h templates/htmltextstream.h ./core/app.o: ./core/config.h models/winixmodel.h ./core/header.h -./core/app.o: ./core/mount.h ./core/winixmodeldeprecated.h ./core/plugin.h -./core/app.o: ./core/pluginmsg.h ./core/ipbancontainer.h -./core/app.o: ./core/lastcontainer.h ./core/system.h ./core/job.h -./core/app.o: ./core/basethread.h ./core/dirs.h ./core/dircontainer.h db/db.h -./core/app.o: db/dbbase.h db/dbconn.h db/dbtextstream.h core/textstream.h -./core/app.o: core/error.h models/group.h core/dircontainer.h -./core/app.o: core/ugcontainer.h ./core/mounts.h ./core/mountparser.h -./core/app.o: ./core/crypt.h ./core/run.h ./core/users.h ./core/ugcontainer.h -./core/app.o: ./core/groups.h ./core/loadavg.h ./core/image.h -./core/app.o: ./core/threadmanager.h models/winixmodelconnector.h +./core/app.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./core/app.o: ./core/winixmodeldeprecated.h ./core/mount.h ./core/mounts.h +./core/app.o: db/db.h db/dbbase.h db/dbconn.h db/dbtextstream.h +./core/app.o: core/textstream.h core/error.h models/group.h +./core/app.o: core/dircontainer.h core/ugcontainer.h ./core/mountparser.h +./core/app.o: ./core/ipbancontainer.h ./core/lastcontainer.h +./core/app.o: ./core/basethread.h ./core/sessionidmanager.h +./core/app.o: ../../tito/src/base64.h ../../tito/src/aes.h +./core/app.o: functions/functions.h functions/functionbase.h core/request.h ./core/app.o: notify/notify.h core/winixmodeldeprecated.h notify/notifypool.h ./core/app.o: templates/locale.h templates/patterns.h notify/notifythread.h ./core/app.o: core/basethread.h notify/templatesnotify.h core/users.h -./core/app.o: ./core/timezones.h ./core/timezone.h ./core/sessionidmanager.h -./core/app.o: ../../tito/src/base64.h ../../tito/src/aes.h -./core/app.o: functions/functions.h functions/functionbase.h core/request.h -./core/app.o: core/system.h core/winixrequest.h core/winixsystem.h core/cur.h -./core/app.o: core/sessionmanager.h core/slog.h functions/functionparser.h -./core/app.o: functions/account.h functions/adduser.h functions/cat.h -./core/app.o: functions/chmod.h functions/privchanger.h functions/chown.h -./core/app.o: functions/ckeditor.h functions/cp.h functions/default.h -./core/app.o: functions/download.h functions/emacs.h functions/env.h -./core/app.o: models/userwrapper.h models/user.h functions/imgcrop.h -./core/app.o: functions/last.h functions/login.h functions/logout.h -./core/app.o: functions/ln.h functions/ls.h functions/man.h functions/meta.h +./core/app.o: core/ugcontainer.h core/winixrequest.h core/winixsystem.h +./core/app.o: core/system.h core/job.h core/jobtask.h core/loadavg.h +./core/app.o: core/dirs.h core/dircontainer.h core/crypt.h core/run.h +./core/app.o: core/users.h core/groups.h core/image.h core/threadmanager.h +./core/app.o: models/winixmodelconnector.h core/timezones.h core/timezone.h +./core/app.o: core/cur.h core/sessionmanager.h core/slog.h +./core/app.o: functions/functionparser.h core/dirs.h functions/account.h +./core/app.o: functions/adduser.h functions/cat.h functions/chmod.h +./core/app.o: functions/privchanger.h functions/chown.h functions/ckeditor.h +./core/app.o: functions/cp.h functions/default.h functions/download.h +./core/app.o: functions/emacs.h functions/env.h models/userwrapper.h +./core/app.o: models/user.h functions/imgcrop.h functions/last.h +./core/app.o: functions/login.h functions/logout.h functions/ln.h +./core/app.o: functions/ls.h functions/man.h functions/meta.h ./core/app.o: functions/mkdir.h functions/mv.h functions/nicedit.h ./core/app.o: functions/node.h functions/passwd.h functions/priv.h ./core/app.o: functions/pw.h functions/reload.h functions/rm.h @@ -141,7 +140,7 @@ ./core/app.o: ../../pikotools/src/html/htmlparser.h templates/templates.h ./core/app.o: templates/patterncacher.h templates/indexpatterns.h ./core/app.o: templates/patterns.h templates/changepatterns.h -./core/app.o: ./core/compress.h ./core/postparser.h ./core/httpsimpleparser.h +./core/app.o: ./core/postparser.h ./core/httpsimpleparser.h ./core/app.o: ./core/cookieparser.h ./core/postmultiparser.h ./core/app.o: utils/acceptencodingparser.h utils/acceptbaseparser.h ./core/app.o: core/header.h ./core/winixrequest.h @@ -187,9 +186,9 @@ ./core/config.o: ../../morm/src/transaction.h ./core/config.o: ../../pikotools/src/convert/misc.h ./core/config.o: ../../pikotools/src/convert/text.h -./core/config.o: ../../pikotools/src/textstream/types.h ./core/crypt.h -./core/config.o: ./core/run.h ./core/winixbase.h models/user.h -./core/config.o: templates/misc.h templates/localefilter.h templates/locale.h +./core/config.o: ../../pikotools/src/textstream/types.h core/crypt.h +./core/config.o: core/run.h ./core/winixbase.h models/user.h templates/misc.h +./core/config.o: templates/localefilter.h templates/locale.h ./core/config.o: ../../pikotools/src/space/spaceparser.h ./core/config.o: ../../pikotools/src/space/space.h ./core/config.o: ../../pikotools/src/convert/baseparser.h core/winixbase.h @@ -262,22 +261,31 @@ ./core/request.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./core/request.o: templates/htmltextstream.h ./core/error.h ./core/config.h ./core/request.o: ./core/textstream.h models/winixmodel.h ./core/header.h -./core/request.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./core/request.o: ./core/winixbase.h functions/functionbase.h db/db.h -./core/request.o: db/dbbase.h db/dbconn.h db/dbtextstream.h core/textstream.h -./core/request.o: core/error.h models/user.h models/group.h -./core/request.o: core/dircontainer.h core/ugcontainer.h core/request.h -./core/request.o: core/system.h notify/notify.h core/winixmodeldeprecated.h -./core/request.o: notify/notifypool.h templates/locale.h templates/patterns.h +./core/request.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./core/request.o: ./core/pluginmsg.h ./core/plugindata.h +./core/request.o: ./core/winixmodeldeprecated.h ./core/mount.h +./core/request.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./core/request.o: db/dbtextstream.h core/textstream.h core/error.h +./core/request.o: models/user.h models/group.h core/dircontainer.h +./core/request.o: core/ugcontainer.h ./core/mountparser.h +./core/request.o: functions/functionbase.h core/request.h notify/notify.h +./core/request.o: core/winixmodeldeprecated.h notify/notifypool.h +./core/request.o: templates/locale.h templates/patterns.h ./core/request.o: notify/notifythread.h core/basethread.h -./core/request.o: notify/templatesnotify.h core/users.h core/winixrequest.h -./core/request.o: core/winixsystem.h ./core/winixmodeldeprecated.h core/cur.h -./core/request.o: core/sessionmanager.h core/slog.h ./core/cur.h -./core/request.o: ./core/session.h ./core/rebus.h ./core/ipban.h -./core/request.o: ./core/mount.h templates/templates.h +./core/request.o: notify/templatesnotify.h core/users.h core/ugcontainer.h +./core/request.o: ./core/lastcontainer.h ./core/cur.h ./core/session.h +./core/request.o: ./core/rebus.h ./core/ipban.h core/winixrequest.h +./core/request.o: core/winixsystem.h core/system.h core/job.h +./core/request.o: ./core/basethread.h core/jobtask.h core/loadavg.h +./core/request.o: core/dirs.h core/dircontainer.h core/crypt.h core/run.h +./core/request.o: core/users.h core/groups.h core/image.h +./core/request.o: core/threadmanager.h models/winixmodelconnector.h +./core/request.o: core/timezones.h core/timezone.h core/cur.h +./core/request.o: core/sessionmanager.h core/slog.h templates/templates.h ./core/request.o: templates/patterncacher.h templates/indexpatterns.h ./core/request.o: templates/patterns.h templates/changepatterns.h ./core/request.o: ../../pikotools/src/html/htmlparser.h +./core/request.o: ../../pikotools/src/convert/misc.h ./core/compress.o: ./core/compress.h ./core/requesttypes.h ./core/compress.o: ../../pikotools/src/textstream/textstream.h ./core/compress.o: ../../pikotools/src/textstream/stream.h @@ -316,8 +324,8 @@ ./core/compress.o: ../../morm/src/postgresqlconnector.h ./core/compress.o: ../../morm/src/postgresqlqueryresult.h ./core/compress.o: ../../morm/src/transaction.h -./core/crypt.o: ./core/crypt.h ./core/run.h ./core/winixbase.h -./core/crypt.o: ./core/config.h models/user.h ../../morm/src/model.h +./core/crypt.o: core/crypt.h core/run.h ./core/winixbase.h ./core/config.h +./core/crypt.o: models/user.h ../../morm/src/model.h ./core/crypt.o: ../../pikotools/src/textstream/textstream.h ./core/crypt.o: ../../pikotools/src/textstream/stream.h ./core/crypt.o: ../../pikotools/src/space/space.h @@ -372,8 +380,8 @@ ./core/crypt.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./core/crypt.o: templates/htmltextstream.h models/winixmodel.h ./core/crypt.o: models/winixmodelconnector.h -./core/dircontainer.o: ./core/dircontainer.h ./core/winixbase.h models/item.h -./core/dircontainer.o: models/winixmodel.h ../../morm/src/model.h +./core/dircontainer.o: core/dircontainer.h core/log.h core/logmanipulators.h +./core/dircontainer.o: ../../pikotools/src/log/log.h ./core/dircontainer.o: ../../pikotools/src/textstream/textstream.h ./core/dircontainer.o: ../../pikotools/src/textstream/stream.h ./core/dircontainer.o: ../../pikotools/src/space/space.h @@ -386,17 +394,17 @@ ./core/dircontainer.o: ../../pikotools/src/utf8/utf8_templates.h ./core/dircontainer.o: ../../pikotools/src/utf8/utf8_private.h ./core/dircontainer.o: ../../pikotools/src/utf8/utf8_stream.h +./core/dircontainer.o: ../../pikotools/src/log/filelog.h +./core/dircontainer.o: ../../morm/src/morm.h ../../morm/src/version.h +./core/dircontainer.o: ../../morm/src/morm_types.h ../../morm/src/model.h ./core/dircontainer.o: ../../morm/src/modelconnector.h ./core/dircontainer.o: ../../morm/src/clearer.h ../../morm/src/ft.h ./core/dircontainer.o: ../../morm/src/dbconnector.h -./core/dircontainer.o: ../../pikotools/src/log/log.h -./core/dircontainer.o: ../../pikotools/src/log/filelog.h ./core/dircontainer.o: ../../morm/src/queryresult.h ./core/dircontainer.o: ../../morm/src/flatconnector.h ./core/dircontainer.o: ../../morm/src/dbexpression.h ./core/dircontainer.o: ../../morm/src/baseexpression.h -./core/dircontainer.o: ../../morm/src/morm_types.h ../../morm/src/modelenv.h -./core/dircontainer.o: ../../morm/src/modeldata.h +./core/dircontainer.o: ../../morm/src/modelenv.h ../../morm/src/modeldata.h ./core/dircontainer.o: ../../morm/src/cursorhelper.h ./core/dircontainer.o: ../../morm/src/finderhelper.h ./core/dircontainer.o: ../../morm/src/fieldvaluehelper.h @@ -406,36 +414,14 @@ ./core/dircontainer.o: ../../morm/src/select.h ../../ezc/src/funinfo.h ./core/dircontainer.o: ../../ezc/src/item.h ./core/dircontainer.o: ../../pikotools/src/convert/text.h -./core/dircontainer.o: ../../morm/src/flatexpression.h core/log.h -./core/dircontainer.o: models/winixmodelconnector.h models/itemcontent.h -./core/dircontainer.o: templates/htmltextstream.h templates/misc.h -./core/dircontainer.o: templates/localefilter.h templates/locale.h -./core/dircontainer.o: ../../pikotools/src/space/spaceparser.h -./core/dircontainer.o: ../../pikotools/src/space/space.h -./core/dircontainer.o: ../../pikotools/src/textstream/types.h -./core/dircontainer.o: ../../pikotools/src/convert/baseparser.h -./core/dircontainer.o: core/winixbase.h core/config.h core/log.h -./core/dircontainer.o: core/logmanipulators.h ../../morm/src/morm.h -./core/dircontainer.o: ../../morm/src/version.h ../../morm/src/finder.h -./core/dircontainer.o: ../../morm/src/cursor.h +./core/dircontainer.o: ../../morm/src/flatexpression.h +./core/dircontainer.o: ../../morm/src/finder.h ../../morm/src/cursor.h ./core/dircontainer.o: ../../morm/src/jsonexpression.h ./core/dircontainer.o: ../../morm/src/postgresqlexpression.h ./core/dircontainer.o: ../../morm/src/jsonconnector.h ./core/dircontainer.o: ../../morm/src/postgresqlconnector.h ./core/dircontainer.o: ../../morm/src/postgresqlqueryresult.h -./core/dircontainer.o: ../../morm/src/transaction.h core/synchro.h -./core/dircontainer.o: core/filelog.h core/lock.h ./core/synchro.h -./core/dircontainer.o: ../../pikotools/src/convert/patternreplacer.h -./core/dircontainer.o: ../../pikotools/src/convert/strtoint.h -./core/dircontainer.o: ../../pikotools/src/convert/text.h -./core/dircontainer.o: ../../pikotools/src/convert/misc.h ../../ezc/src/ezc.h -./core/dircontainer.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h -./core/dircontainer.o: ../../ezc/src/cache.h ../../ezc/src/functions.h -./core/dircontainer.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h -./core/dircontainer.o: ../../ezc/src/outstreams.h -./core/dircontainer.o: ../../ezc/src/expressionparser.h -./core/dircontainer.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h -./core/dircontainer.o: templates/htmltextstream.h +./core/dircontainer.o: ../../morm/src/transaction.h ./core/winixmodeldeprecated.o: ./core/winixmodeldeprecated.h core/winixbase.h ./core/winixmodeldeprecated.o: core/config.h ./core/winixmodeldeprecated.o: ../../pikotools/src/space/spaceparser.h @@ -489,9 +475,7 @@ ./core/winixmodeldeprecated.o: ../../morm/src/postgresqlqueryresult.h ./core/winixmodeldeprecated.o: ../../morm/src/transaction.h core/log.h ./core/winixmodeldeprecated.o: core/synchro.h core/filelog.h core/lock.h -./core/winixmodeldeprecated.o: ./core/synchro.h ./core/plugin.h -./core/winixmodeldeprecated.o: ./core/pluginmsg.h ./core/plugindata.h -./core/winixmodeldeprecated.o: ./core/winixbase.h +./core/winixmodeldeprecated.o: ./core/synchro.h ./core/header.o: ./core/header.h core/log.h core/logmanipulators.h ./core/header.o: ../../pikotools/src/log/log.h ./core/header.o: ../../pikotools/src/textstream/textstream.h @@ -528,8 +512,8 @@ ./core/header.o: ../../morm/src/postgresqlconnector.h ./core/header.o: ../../morm/src/postgresqlqueryresult.h ./core/header.o: ../../morm/src/transaction.h -./core/dirs.o: ./core/dirs.h ./core/dircontainer.h ./core/winixbase.h -./core/dirs.o: models/item.h models/winixmodel.h ../../morm/src/model.h +./core/dirs.o: core/dirs.h core/dircontainer.h db/db.h db/dbbase.h +./core/dirs.o: db/dbconn.h db/dbtextstream.h core/textstream.h ./core/dirs.o: ../../pikotools/src/textstream/textstream.h ./core/dirs.o: ../../pikotools/src/textstream/stream.h ./core/dirs.o: ../../pikotools/src/space/space.h @@ -541,39 +525,37 @@ ./core/dirs.o: ../../pikotools/src/textstream/stream.h ./core/dirs.o: ../../pikotools/src/utf8/utf8_templates.h ./core/dirs.o: ../../pikotools/src/utf8/utf8_private.h -./core/dirs.o: ../../pikotools/src/utf8/utf8_stream.h -./core/dirs.o: ../../morm/src/modelconnector.h ../../morm/src/clearer.h -./core/dirs.o: ../../morm/src/ft.h ../../morm/src/dbconnector.h -./core/dirs.o: ../../pikotools/src/log/log.h -./core/dirs.o: ../../pikotools/src/log/filelog.h ../../morm/src/queryresult.h +./core/dirs.o: ../../pikotools/src/utf8/utf8_stream.h core/winixbase.h +./core/dirs.o: core/config.h ../../pikotools/src/space/spaceparser.h +./core/dirs.o: ../../pikotools/src/space/space.h +./core/dirs.o: ../../pikotools/src/textstream/types.h +./core/dirs.o: ../../pikotools/src/convert/baseparser.h core/log.h +./core/dirs.o: core/logmanipulators.h ../../pikotools/src/log/log.h +./core/dirs.o: ../../pikotools/src/log/filelog.h ../../morm/src/morm.h +./core/dirs.o: ../../morm/src/version.h ../../morm/src/morm_types.h +./core/dirs.o: ../../morm/src/model.h ../../morm/src/modelconnector.h +./core/dirs.o: ../../morm/src/clearer.h ../../morm/src/ft.h +./core/dirs.o: ../../morm/src/dbconnector.h ../../morm/src/queryresult.h ./core/dirs.o: ../../morm/src/flatconnector.h ../../morm/src/dbexpression.h -./core/dirs.o: ../../morm/src/baseexpression.h ../../morm/src/morm_types.h -./core/dirs.o: ../../morm/src/modelenv.h ../../morm/src/modeldata.h -./core/dirs.o: ../../morm/src/cursorhelper.h ../../morm/src/finderhelper.h +./core/dirs.o: ../../morm/src/baseexpression.h ../../morm/src/modelenv.h +./core/dirs.o: ../../morm/src/modeldata.h ../../morm/src/cursorhelper.h +./core/dirs.o: ../../morm/src/finderhelper.h ./core/dirs.o: ../../morm/src/fieldvaluehelper.h ../../morm/src/wrapper.h ./core/dirs.o: ../../morm/src/spacewrapper.h ./core/dirs.o: ../../morm/src/baseobjectwrapper.h ./core/dirs.o: ../../morm/src/modelcontainerwrapper.h ../../morm/src/select.h ./core/dirs.o: ../../ezc/src/funinfo.h ../../ezc/src/item.h ./core/dirs.o: ../../pikotools/src/convert/text.h -./core/dirs.o: ../../morm/src/flatexpression.h core/log.h -./core/dirs.o: models/winixmodelconnector.h models/itemcontent.h -./core/dirs.o: templates/htmltextstream.h templates/misc.h -./core/dirs.o: templates/localefilter.h templates/locale.h -./core/dirs.o: ../../pikotools/src/space/spaceparser.h -./core/dirs.o: ../../pikotools/src/space/space.h -./core/dirs.o: ../../pikotools/src/textstream/types.h -./core/dirs.o: ../../pikotools/src/convert/baseparser.h core/winixbase.h -./core/dirs.o: core/config.h core/log.h core/logmanipulators.h -./core/dirs.o: ../../morm/src/morm.h ../../morm/src/version.h -./core/dirs.o: ../../morm/src/finder.h ../../morm/src/cursor.h -./core/dirs.o: ../../morm/src/jsonexpression.h +./core/dirs.o: ../../morm/src/flatexpression.h ../../morm/src/finder.h +./core/dirs.o: ../../morm/src/cursor.h ../../morm/src/jsonexpression.h ./core/dirs.o: ../../morm/src/postgresqlexpression.h ./core/dirs.o: ../../morm/src/jsonconnector.h ./core/dirs.o: ../../morm/src/postgresqlconnector.h ./core/dirs.o: ../../morm/src/postgresqlqueryresult.h -./core/dirs.o: ../../morm/src/transaction.h core/synchro.h core/filelog.h -./core/dirs.o: core/lock.h ./core/synchro.h +./core/dirs.o: ../../morm/src/transaction.h core/log.h core/synchro.h +./core/dirs.o: core/filelog.h core/lock.h ./core/synchro.h core/error.h +./core/dirs.o: models/user.h templates/misc.h templates/localefilter.h +./core/dirs.o: templates/locale.h ./core/dirs.o: ../../pikotools/src/convert/patternreplacer.h ./core/dirs.o: ../../pikotools/src/convert/strtoint.h ./core/dirs.o: ../../pikotools/src/convert/text.h @@ -583,16 +565,21 @@ ./core/dirs.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h ./core/dirs.o: ../../ezc/src/outstreams.h ../../ezc/src/expressionparser.h ./core/dirs.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h -./core/dirs.o: templates/htmltextstream.h db/db.h db/dbbase.h db/dbconn.h -./core/dirs.o: db/dbtextstream.h core/textstream.h core/error.h models/user.h -./core/dirs.o: models/group.h core/dircontainer.h core/ugcontainer.h -./core/dirs.o: ./core/request.h ./core/requesttypes.h ./core/error.h -./core/dirs.o: ./core/config.h ./core/textstream.h models/winixmodel.h -./core/dirs.o: ./core/header.h ./core/winixmodeldeprecated.h ./core/plugin.h -./core/dirs.o: ./core/pluginmsg.h ./core/plugindata.h notify/notify.h +./core/dirs.o: templates/htmltextstream.h models/winixmodel.h +./core/dirs.o: models/winixmodelconnector.h models/group.h +./core/dirs.o: core/dircontainer.h ./core/winixbase.h models/item.h +./core/dirs.o: models/itemcontent.h templates/htmltextstream.h +./core/dirs.o: core/ugcontainer.h ./core/request.h ./core/requesttypes.h +./core/dirs.o: ./core/error.h ./core/config.h ./core/textstream.h +./core/dirs.o: models/winixmodel.h ./core/header.h ./core/compress.h +./core/dirs.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h +./core/dirs.o: ./core/winixmodeldeprecated.h ./core/mount.h ./core/mounts.h +./core/dirs.o: ./core/mountparser.h notify/notify.h ./core/dirs.o: core/winixmodeldeprecated.h notify/notifypool.h ./core/dirs.o: templates/locale.h templates/patterns.h notify/notifythread.h ./core/dirs.o: core/basethread.h notify/templatesnotify.h core/users.h +./core/dirs.o: core/ugcontainer.h ./core/lastcontainer.h ./core/cur.h +./core/dirs.o: ./core/session.h ./core/rebus.h ./core/ipban.h ./core/filelog.o: ../../pikotools/src/log/filelog.h ./core/filelog.o: ../../pikotools/src/textstream/textstream.h ./core/filelog.o: ../../pikotools/src/textstream/stream.h @@ -605,12 +592,12 @@ ./core/filelog.o: ../../pikotools/src/textstream/stream.h ./core/filelog.o: ../../pikotools/src/utf8/utf8_templates.h ./core/filelog.o: ../../pikotools/src/utf8/utf8_private.h -./core/filelog.o: ../../pikotools/src/utf8/utf8_stream.h ./core/timezones.h -./core/filelog.o: ./core/timezone.h ../../pikotools/src/space/spaceparser.h +./core/filelog.o: ../../pikotools/src/utf8/utf8_stream.h core/timezones.h +./core/filelog.o: core/timezone.h ../../pikotools/src/space/spaceparser.h ./core/filelog.o: ../../pikotools/src/space/space.h ./core/filelog.o: ../../pikotools/src/textstream/types.h ./core/filelog.o: ../../pikotools/src/convert/baseparser.h ./core/winixbase.h -./core/groups.o: ./core/groups.h models/group.h ../../morm/src/model.h +./core/groups.o: core/groups.h models/group.h ../../morm/src/model.h ./core/groups.o: ../../pikotools/src/textstream/textstream.h ./core/groups.o: ../../pikotools/src/textstream/stream.h ./core/groups.o: ../../pikotools/src/space/space.h @@ -638,7 +625,7 @@ ./core/groups.o: ../../morm/src/modelcontainerwrapper.h ./core/groups.o: ../../morm/src/select.h ../../ezc/src/funinfo.h ./core/groups.o: ../../ezc/src/item.h ../../pikotools/src/convert/text.h -./core/groups.o: ../../morm/src/flatexpression.h ./core/ugcontainer.h db/db.h +./core/groups.o: ../../morm/src/flatexpression.h core/ugcontainer.h db/db.h ./core/groups.o: db/dbbase.h db/dbconn.h db/dbtextstream.h core/textstream.h ./core/groups.o: core/winixbase.h core/config.h ./core/groups.o: ../../pikotools/src/space/spaceparser.h @@ -667,9 +654,9 @@ ./core/groups.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./core/groups.o: templates/htmltextstream.h models/winixmodel.h ./core/groups.o: models/winixmodelconnector.h core/dircontainer.h -./core/groups.o: core/ugcontainer.h ./core/winixbase.h -./core/groups.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./core/groups.o: ./core/pluginmsg.h ./core/plugindata.h +./core/groups.o: ./core/winixbase.h models/item.h models/itemcontent.h +./core/groups.o: templates/htmltextstream.h core/ugcontainer.h +./core/groups.o: ./core/winixmodeldeprecated.h ./core/httpsimpleparser.o: ./core/httpsimpleparser.h ./core/httpsimpleparser.o: ./core/winixmodeldeprecated.h core/winixbase.h ./core/httpsimpleparser.o: core/config.h @@ -722,12 +709,10 @@ ./core/httpsimpleparser.o: ../../morm/src/postgresqlqueryresult.h ./core/httpsimpleparser.o: ../../morm/src/transaction.h core/log.h ./core/httpsimpleparser.o: core/synchro.h core/filelog.h core/lock.h -./core/httpsimpleparser.o: ./core/synchro.h ./core/plugin.h -./core/httpsimpleparser.o: ./core/pluginmsg.h ./core/plugindata.h -./core/httpsimpleparser.o: ./core/winixbase.h +./core/httpsimpleparser.o: ./core/synchro.h ./core/httpsimpleparser.o: ../../pikotools/src/convert/misc.h ./core/httpsimpleparser.o: ../../pikotools/src/convert/text.h -./core/image.o: ./core/image.h ./core/basethread.h ./core/synchro.h +./core/image.o: core/image.h ./core/basethread.h ./core/synchro.h ./core/image.o: ./core/winixmodeldeprecated.h core/winixbase.h core/config.h ./core/image.o: ../../pikotools/src/space/spaceparser.h ./core/image.o: ../../pikotools/src/space/space.h @@ -768,8 +753,7 @@ ./core/image.o: ../../morm/src/postgresqlconnector.h ./core/image.o: ../../morm/src/postgresqlqueryresult.h ./core/image.o: ../../morm/src/transaction.h core/log.h core/synchro.h -./core/image.o: core/filelog.h core/lock.h ./core/plugin.h ./core/pluginmsg.h -./core/image.o: ./core/plugindata.h ./core/winixbase.h ./core/textstream.h +./core/image.o: core/filelog.h core/lock.h ./core/textstream.h ./core/image.o: ../../pikotools/src/convert/misc.h ./core/image.o: ../../pikotools/src/convert/text.h db/db.h db/dbbase.h ./core/image.o: db/dbconn.h db/dbtextstream.h core/textstream.h core/error.h @@ -784,21 +768,23 @@ ./core/image.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./core/image.o: templates/htmltextstream.h models/winixmodel.h ./core/image.o: models/winixmodelconnector.h models/group.h -./core/image.o: core/dircontainer.h core/ugcontainer.h models/item.h +./core/image.o: core/dircontainer.h ./core/winixbase.h models/item.h ./core/image.o: models/itemcontent.h templates/htmltextstream.h -./core/image.o: ./core/system.h ./core/job.h ./core/dirs.h -./core/image.o: ./core/dircontainer.h ./core/request.h ./core/requesttypes.h -./core/image.o: ./core/error.h ./core/config.h models/winixmodel.h -./core/image.o: ./core/header.h ./core/mounts.h ./core/mount.h -./core/image.o: ./core/mountparser.h ./core/crypt.h ./core/run.h -./core/image.o: ./core/users.h ./core/ugcontainer.h ./core/lastcontainer.h -./core/image.o: ./core/cur.h ./core/session.h ./core/rebus.h ./core/ipban.h -./core/image.o: ./core/groups.h ./core/loadavg.h ./core/threadmanager.h -./core/image.o: models/winixmodelconnector.h notify/notify.h -./core/image.o: core/winixmodeldeprecated.h notify/notifypool.h -./core/image.o: templates/locale.h templates/patterns.h notify/notifythread.h -./core/image.o: core/basethread.h notify/templatesnotify.h core/users.h -./core/image.o: ./core/timezones.h ./core/timezone.h +./core/image.o: core/ugcontainer.h ./core/system.h core/job.h core/jobtask.h +./core/image.o: core/request.h ./core/cur.h ./core/request.h +./core/image.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./core/image.o: models/winixmodel.h ./core/header.h ./core/compress.h +./core/image.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h +./core/image.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./core/image.o: ./core/session.h ./core/rebus.h ./core/ipban.h core/loadavg.h +./core/image.o: core/dirs.h core/dircontainer.h core/crypt.h core/run.h +./core/image.o: core/users.h core/groups.h core/ugcontainer.h +./core/image.o: core/threadmanager.h models/winixmodelconnector.h +./core/image.o: notify/notify.h core/winixmodeldeprecated.h +./core/image.o: notify/notifypool.h templates/locale.h templates/patterns.h +./core/image.o: notify/notifythread.h core/basethread.h +./core/image.o: notify/templatesnotify.h core/users.h ./core/lastcontainer.h +./core/image.o: core/timezones.h core/timezone.h ./core/ipbancontainer.o: ./core/ipbancontainer.h ./core/ipban.h ./core/ipbancontainer.o: ./core/winixmodeldeprecated.h core/winixbase.h ./core/ipbancontainer.o: core/config.h @@ -849,9 +835,8 @@ ./core/ipbancontainer.o: ../../morm/src/postgresqlqueryresult.h ./core/ipbancontainer.o: ../../morm/src/transaction.h core/log.h ./core/ipbancontainer.o: core/synchro.h core/filelog.h core/lock.h -./core/ipbancontainer.o: ./core/synchro.h ./core/plugin.h ./core/pluginmsg.h -./core/ipbancontainer.o: ./core/plugindata.h ./core/winixbase.h -./core/job.o: ./core/job.h ./core/basethread.h ./core/synchro.h +./core/ipbancontainer.o: ./core/synchro.h +./core/job.o: core/job.h ./core/basethread.h ./core/synchro.h ./core/job.o: ./core/winixmodeldeprecated.h core/winixbase.h core/config.h ./core/job.o: ../../pikotools/src/space/spaceparser.h ./core/job.o: ../../pikotools/src/space/space.h @@ -891,8 +876,55 @@ ./core/job.o: ../../morm/src/postgresqlconnector.h ./core/job.o: ../../morm/src/postgresqlqueryresult.h ./core/job.o: ../../morm/src/transaction.h core/log.h core/synchro.h -./core/job.o: core/filelog.h core/lock.h ./core/plugin.h ./core/pluginmsg.h -./core/job.o: ./core/plugindata.h ./core/winixbase.h +./core/job.o: core/filelog.h core/lock.h core/jobtask.h core/request.h +./core/job.o: ./core/cur.h ./core/request.h ./core/requesttypes.h +./core/job.o: models/item.h models/winixmodel.h models/winixmodelconnector.h +./core/job.o: models/itemcontent.h templates/htmltextstream.h +./core/job.o: templates/misc.h templates/localefilter.h templates/locale.h +./core/job.o: ../../pikotools/src/convert/patternreplacer.h +./core/job.o: ../../pikotools/src/convert/strtoint.h +./core/job.o: ../../pikotools/src/convert/text.h +./core/job.o: ../../pikotools/src/convert/misc.h ../../ezc/src/ezc.h +./core/job.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h +./core/job.o: ../../ezc/src/cache.h ../../ezc/src/functions.h +./core/job.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h +./core/job.o: ../../ezc/src/outstreams.h ../../ezc/src/expressionparser.h +./core/job.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h +./core/job.o: templates/htmltextstream.h ./core/error.h ./core/config.h +./core/job.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./core/job.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./core/job.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./core/job.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./core/job.o: db/dbtextstream.h core/textstream.h core/error.h models/user.h +./core/job.o: models/group.h core/dircontainer.h core/ugcontainer.h +./core/job.o: ./core/mountparser.h ./core/session.h ./core/rebus.h +./core/job.o: ./core/ipban.h core/loadavg.h functions/functions.h +./core/job.o: functions/functionbase.h notify/notify.h +./core/job.o: core/winixmodeldeprecated.h notify/notifypool.h +./core/job.o: templates/locale.h templates/patterns.h notify/notifythread.h +./core/job.o: core/basethread.h notify/templatesnotify.h core/users.h +./core/job.o: core/ugcontainer.h ./core/lastcontainer.h core/winixrequest.h +./core/job.o: core/winixsystem.h core/system.h core/dirs.h +./core/job.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./core/job.o: core/groups.h core/image.h core/threadmanager.h +./core/job.o: models/winixmodelconnector.h core/timezones.h core/timezone.h +./core/job.o: core/cur.h core/sessionmanager.h core/slog.h +./core/job.o: functions/functionparser.h core/dirs.h functions/account.h +./core/job.o: functions/adduser.h functions/cat.h functions/chmod.h +./core/job.o: functions/privchanger.h functions/chown.h functions/ckeditor.h +./core/job.o: functions/cp.h functions/default.h functions/download.h +./core/job.o: functions/emacs.h functions/env.h models/userwrapper.h +./core/job.o: models/user.h functions/imgcrop.h functions/last.h +./core/job.o: functions/login.h functions/logout.h functions/ln.h +./core/job.o: functions/ls.h functions/man.h functions/meta.h +./core/job.o: functions/mkdir.h functions/mv.h functions/nicedit.h +./core/job.o: functions/node.h functions/passwd.h functions/priv.h +./core/job.o: functions/pw.h functions/reload.h functions/rm.h +./core/job.o: functions/rmuser.h functions/sort.h functions/specialdefault.h +./core/job.o: functions/stat.h functions/subject.h functions/template.h +./core/job.o: functions/tinymce.h functions/uname.h functions/upload.h +./core/job.o: functions/uptime.h functions/who.h functions/vim.h +./core/job.o: ../../pikotools/src/html/htmlparser.h ./core/lastcontainer.o: ./core/lastcontainer.h ./core/lastcontainer.o: ../../pikotools/src/date/date.h ./core/lastcontainer.o: ../../pikotools/src/convert/inttostr.h @@ -940,7 +972,7 @@ ./core/lastcontainer.o: ../../pikotools/src/convert/misc.h ./core/lastcontainer.o: ../../pikotools/src/convert/text.h ./core/lastcontainer.o: ../../pikotools/src/textstream/types.h -./core/loadavg.o: ./core/loadavg.h ./core/winixbase.h ./core/request.h +./core/loadavg.o: core/loadavg.h ./core/winixbase.h ./core/request.h ./core/loadavg.o: ./core/requesttypes.h ./core/loadavg.o: ../../pikotools/src/textstream/textstream.h ./core/loadavg.o: ../../pikotools/src/textstream/stream.h @@ -999,6 +1031,12 @@ ./core/loadavg.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./core/loadavg.o: templates/htmltextstream.h ./core/error.h ./core/config.h ./core/loadavg.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./core/loadavg.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./core/loadavg.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./core/loadavg.o: ./core/mount.h ./core/mounts.h db/db.h db/dbbase.h +./core/loadavg.o: db/dbconn.h db/dbtextstream.h core/textstream.h +./core/loadavg.o: core/error.h models/user.h models/group.h +./core/loadavg.o: core/dircontainer.h core/ugcontainer.h ./core/mountparser.h ./core/lock.o: core/lock.h ./core/synchro.h ./core/log.o: core/log.h core/logmanipulators.h ../../pikotools/src/log/log.h ./core/log.o: ../../pikotools/src/textstream/textstream.h @@ -1091,18 +1129,28 @@ ./core/misc.o: ../../pikotools/src/convert/strtoint.h ./core/misc.o: templates/htmltextstream.h templates/indexpatterns.h ./core/misc.o: templates/patterns.h templates/changepatterns.h core/cur.h -./core/misc.o: core/system.h core/sessionmanager.h -./core/misc.o: ../../pikotools/src/html/htmlparser.h db/db.h db/dbbase.h -./core/misc.o: db/dbconn.h db/dbtextstream.h core/textstream.h core/error.h -./core/misc.o: models/user.h models/group.h core/dircontainer.h -./core/misc.o: core/ugcontainer.h ./core/winixbase.h core/winixrequest.h -./core/misc.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./core/misc.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./core/misc.o: core/slog.h ./core/cur.h ./core/request.h -./core/misc.o: ./core/requesttypes.h ./core/error.h ./core/config.h -./core/misc.o: ./core/textstream.h models/winixmodel.h ./core/header.h -./core/misc.o: ./core/session.h ./core/rebus.h ./core/ipban.h ./core/mount.h -./core/misc.o: templates/locale.h ../../pikotools/src/convert/convert.h +./core/misc.o: core/system.h core/job.h ./core/basethread.h +./core/misc.o: ./core/winixmodeldeprecated.h core/jobtask.h core/request.h +./core/misc.o: ./core/cur.h ./core/request.h ./core/requesttypes.h +./core/misc.o: ./core/error.h ./core/config.h ./core/textstream.h +./core/misc.o: models/winixmodel.h ./core/header.h ./core/compress.h +./core/misc.o: ./core/winixbase.h ./core/plugin.h ./core/pluginmsg.h +./core/misc.o: ./core/plugindata.h ./core/mount.h ./core/mounts.h db/db.h +./core/misc.o: db/dbbase.h db/dbconn.h db/dbtextstream.h core/textstream.h +./core/misc.o: core/error.h models/user.h models/group.h core/dircontainer.h +./core/misc.o: core/ugcontainer.h ./core/mountparser.h ./core/session.h +./core/misc.o: ./core/rebus.h ./core/ipban.h core/loadavg.h core/dirs.h +./core/misc.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./core/misc.o: core/groups.h core/ugcontainer.h core/image.h +./core/misc.o: core/threadmanager.h models/winixmodelconnector.h +./core/misc.o: notify/notify.h core/winixmodeldeprecated.h +./core/misc.o: notify/notifypool.h templates/locale.h templates/patterns.h +./core/misc.o: notify/notifythread.h core/basethread.h +./core/misc.o: notify/templatesnotify.h core/users.h ./core/lastcontainer.h +./core/misc.o: core/timezones.h core/timezone.h core/sessionmanager.h +./core/misc.o: ../../pikotools/src/html/htmlparser.h core/winixrequest.h +./core/misc.o: core/winixsystem.h core/slog.h +./core/misc.o: ../../pikotools/src/convert/convert.h ./core/misc.o: ../../pikotools/src/convert/inttostr.h ./core/misc.o: ../../pikotools/src/convert/patternreplacer.h ./core/misc.o: ../../pikotools/src/convert/double.h @@ -1121,8 +1169,7 @@ ./core/mount.o: ../../pikotools/src/utf8/utf8.h ./core/mount.o: ../../pikotools/src/utf8/utf8_templates.h ./core/mount.o: ../../pikotools/src/utf8/utf8_private.h -./core/mountparser.o: ./core/mountparser.h ./core/mount.h ./core/dirs.h -./core/mountparser.o: ./core/dircontainer.h ./core/winixbase.h models/item.h +./core/mountparser.o: ./core/mountparser.h ./core/mount.h models/item.h ./core/mountparser.o: models/winixmodel.h ../../morm/src/model.h ./core/mountparser.o: ../../pikotools/src/textstream/textstream.h ./core/mountparser.o: ../../pikotools/src/textstream/stream.h @@ -1183,17 +1230,18 @@ ./core/mountparser.o: ../../ezc/src/outstreams.h ./core/mountparser.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./core/mountparser.o: ../../ezc/src/patternparser.h -./core/mountparser.o: templates/htmltextstream.h db/db.h db/dbbase.h -./core/mountparser.o: db/dbconn.h db/dbtextstream.h core/textstream.h -./core/mountparser.o: core/error.h models/user.h models/group.h -./core/mountparser.o: core/dircontainer.h core/ugcontainer.h ./core/request.h +./core/mountparser.o: templates/htmltextstream.h +./core/mountparser.o: ./core/winixmodeldeprecated.h core/dirs.h +./core/mountparser.o: core/dircontainer.h db/db.h db/dbbase.h db/dbconn.h +./core/mountparser.o: db/dbtextstream.h core/textstream.h core/error.h +./core/mountparser.o: models/user.h models/group.h core/dircontainer.h +./core/mountparser.o: ./core/winixbase.h core/ugcontainer.h ./core/request.h ./core/mountparser.o: ./core/requesttypes.h ./core/error.h ./core/config.h ./core/mountparser.o: ./core/textstream.h models/winixmodel.h ./core/header.h -./core/mountparser.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./core/mountparser.o: ./core/pluginmsg.h ./core/plugindata.h -./core/mounts.o: ./core/mounts.h ./core/mount.h ./core/error.h ./core/dirs.h -./core/mounts.o: ./core/dircontainer.h ./core/winixbase.h models/item.h -./core/mounts.o: models/winixmodel.h ../../morm/src/model.h +./core/mountparser.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./core/mountparser.o: ./core/plugindata.h ./core/mounts.h +./core/mounts.o: ./core/mounts.h ./core/mount.h ./core/error.h db/db.h +./core/mounts.o: db/dbbase.h db/dbconn.h db/dbtextstream.h core/textstream.h ./core/mounts.o: ../../pikotools/src/textstream/textstream.h ./core/mounts.o: ../../pikotools/src/textstream/stream.h ./core/mounts.o: ../../pikotools/src/space/space.h @@ -1205,40 +1253,37 @@ ./core/mounts.o: ../../pikotools/src/textstream/stream.h ./core/mounts.o: ../../pikotools/src/utf8/utf8_templates.h ./core/mounts.o: ../../pikotools/src/utf8/utf8_private.h -./core/mounts.o: ../../pikotools/src/utf8/utf8_stream.h -./core/mounts.o: ../../morm/src/modelconnector.h ../../morm/src/clearer.h -./core/mounts.o: ../../morm/src/ft.h ../../morm/src/dbconnector.h -./core/mounts.o: ../../pikotools/src/log/log.h -./core/mounts.o: ../../pikotools/src/log/filelog.h -./core/mounts.o: ../../morm/src/queryresult.h ../../morm/src/flatconnector.h -./core/mounts.o: ../../morm/src/dbexpression.h -./core/mounts.o: ../../morm/src/baseexpression.h ../../morm/src/morm_types.h -./core/mounts.o: ../../morm/src/modelenv.h ../../morm/src/modeldata.h -./core/mounts.o: ../../morm/src/cursorhelper.h ../../morm/src/finderhelper.h +./core/mounts.o: ../../pikotools/src/utf8/utf8_stream.h core/winixbase.h +./core/mounts.o: core/config.h ../../pikotools/src/space/spaceparser.h +./core/mounts.o: ../../pikotools/src/space/space.h +./core/mounts.o: ../../pikotools/src/textstream/types.h +./core/mounts.o: ../../pikotools/src/convert/baseparser.h core/log.h +./core/mounts.o: core/logmanipulators.h ../../pikotools/src/log/log.h +./core/mounts.o: ../../pikotools/src/log/filelog.h ../../morm/src/morm.h +./core/mounts.o: ../../morm/src/version.h ../../morm/src/morm_types.h +./core/mounts.o: ../../morm/src/model.h ../../morm/src/modelconnector.h +./core/mounts.o: ../../morm/src/clearer.h ../../morm/src/ft.h +./core/mounts.o: ../../morm/src/dbconnector.h ../../morm/src/queryresult.h +./core/mounts.o: ../../morm/src/flatconnector.h ../../morm/src/dbexpression.h +./core/mounts.o: ../../morm/src/baseexpression.h ../../morm/src/modelenv.h +./core/mounts.o: ../../morm/src/modeldata.h ../../morm/src/cursorhelper.h +./core/mounts.o: ../../morm/src/finderhelper.h ./core/mounts.o: ../../morm/src/fieldvaluehelper.h ../../morm/src/wrapper.h ./core/mounts.o: ../../morm/src/spacewrapper.h ./core/mounts.o: ../../morm/src/baseobjectwrapper.h ./core/mounts.o: ../../morm/src/modelcontainerwrapper.h ./core/mounts.o: ../../morm/src/select.h ../../ezc/src/funinfo.h ./core/mounts.o: ../../ezc/src/item.h ../../pikotools/src/convert/text.h -./core/mounts.o: ../../morm/src/flatexpression.h core/log.h -./core/mounts.o: models/winixmodelconnector.h models/itemcontent.h -./core/mounts.o: templates/htmltextstream.h templates/misc.h -./core/mounts.o: templates/localefilter.h templates/locale.h -./core/mounts.o: ../../pikotools/src/space/spaceparser.h -./core/mounts.o: ../../pikotools/src/space/space.h -./core/mounts.o: ../../pikotools/src/textstream/types.h -./core/mounts.o: ../../pikotools/src/convert/baseparser.h core/winixbase.h -./core/mounts.o: core/config.h core/log.h core/logmanipulators.h -./core/mounts.o: ../../morm/src/morm.h ../../morm/src/version.h -./core/mounts.o: ../../morm/src/finder.h ../../morm/src/cursor.h -./core/mounts.o: ../../morm/src/jsonexpression.h +./core/mounts.o: ../../morm/src/flatexpression.h ../../morm/src/finder.h +./core/mounts.o: ../../morm/src/cursor.h ../../morm/src/jsonexpression.h ./core/mounts.o: ../../morm/src/postgresqlexpression.h ./core/mounts.o: ../../morm/src/jsonconnector.h ./core/mounts.o: ../../morm/src/postgresqlconnector.h ./core/mounts.o: ../../morm/src/postgresqlqueryresult.h -./core/mounts.o: ../../morm/src/transaction.h core/synchro.h core/filelog.h -./core/mounts.o: core/lock.h ./core/synchro.h +./core/mounts.o: ../../morm/src/transaction.h core/log.h core/synchro.h +./core/mounts.o: core/filelog.h core/lock.h ./core/synchro.h core/error.h +./core/mounts.o: models/user.h templates/misc.h templates/localefilter.h +./core/mounts.o: templates/locale.h ./core/mounts.o: ../../pikotools/src/convert/patternreplacer.h ./core/mounts.o: ../../pikotools/src/convert/strtoint.h ./core/mounts.o: ../../pikotools/src/convert/text.h @@ -1248,44 +1293,42 @@ ./core/mounts.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h ./core/mounts.o: ../../ezc/src/outstreams.h ../../ezc/src/expressionparser.h ./core/mounts.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h -./core/mounts.o: templates/htmltextstream.h db/db.h db/dbbase.h db/dbconn.h -./core/mounts.o: db/dbtextstream.h core/textstream.h core/error.h -./core/mounts.o: models/user.h models/group.h core/dircontainer.h +./core/mounts.o: templates/htmltextstream.h models/winixmodel.h +./core/mounts.o: models/winixmodelconnector.h models/group.h +./core/mounts.o: core/dircontainer.h ./core/winixbase.h models/item.h +./core/mounts.o: models/itemcontent.h templates/htmltextstream.h ./core/mounts.o: core/ugcontainer.h ./core/request.h ./core/requesttypes.h ./core/mounts.o: ./core/config.h ./core/textstream.h models/winixmodel.h -./core/mounts.o: ./core/header.h ./core/winixmodeldeprecated.h -./core/mounts.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./core/mounts.o: ./core/mountparser.h ./core/cur.h ./core/session.h -./core/mounts.o: ./core/rebus.h ./core/ipban.h +./core/mounts.o: ./core/header.h ./core/compress.h ./core/plugin.h +./core/mounts.o: ./core/pluginmsg.h ./core/plugindata.h +./core/mounts.o: ./core/winixmodeldeprecated.h ./core/mountparser.h +./core/mounts.o: ./core/cur.h ./core/session.h ./core/rebus.h ./core/ipban.h +./core/mounts.o: core/dirs.h core/dircontainer.h ./core/plugin.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./core/plugin.o: ./core/winixbase.h ../../morm/src/modelconnector.h -./core/plugin.o: ../../morm/src/clearer.h ../../pikotools/src/date/date.h -./core/plugin.o: ../../pikotools/src/convert/inttostr.h -./core/plugin.o: ../../pikotools/src/space/space.h ../../morm/src/ft.h -./core/plugin.o: ../../morm/src/dbconnector.h -./core/plugin.o: ../../pikotools/src/textstream/textstream.h -./core/plugin.o: ../../pikotools/src/textstream/stream.h -./core/plugin.o: ../../pikotools/src/membuffer/membuffer.h +./core/plugin.o: ./core/winixmodeldeprecated.h core/winixbase.h core/config.h +./core/plugin.o: ../../pikotools/src/space/spaceparser.h +./core/plugin.o: ../../pikotools/src/space/space.h ./core/plugin.o: ../../pikotools/src/textstream/types.h +./core/plugin.o: ../../pikotools/src/convert/inttostr.h ./core/plugin.o: ../../pikotools/src/utf8/utf8.h ./core/plugin.o: ../../pikotools/src/textstream/stream.h ./core/plugin.o: ../../pikotools/src/utf8/utf8_templates.h ./core/plugin.o: ../../pikotools/src/utf8/utf8_private.h -./core/plugin.o: ../../pikotools/src/utf8/utf8_stream.h -./core/plugin.o: ../../pikotools/src/log/log.h -./core/plugin.o: ../../pikotools/src/log/filelog.h -./core/plugin.o: ../../morm/src/queryresult.h ../../morm/src/flatconnector.h -./core/plugin.o: ../../pikotools/src/convert/misc.h -./core/plugin.o: ../../pikotools/src/convert/text.h -./core/plugin.o: ../../pikotools/src/textstream/types.h ./core/system.h -./core/plugin.o: ./core/job.h ./core/basethread.h ./core/synchro.h -./core/plugin.o: ./core/winixmodeldeprecated.h core/winixbase.h core/config.h -./core/plugin.o: ../../pikotools/src/space/spaceparser.h +./core/plugin.o: ../../pikotools/src/convert/baseparser.h +./core/plugin.o: ../../pikotools/src/textstream/textstream.h +./core/plugin.o: ../../pikotools/src/textstream/stream.h ./core/plugin.o: ../../pikotools/src/space/space.h -./core/plugin.o: ../../pikotools/src/convert/baseparser.h core/log.h -./core/plugin.o: core/logmanipulators.h ../../morm/src/morm.h +./core/plugin.o: ../../pikotools/src/date/date.h +./core/plugin.o: ../../pikotools/src/membuffer/membuffer.h +./core/plugin.o: ../../pikotools/src/textstream/types.h +./core/plugin.o: ../../pikotools/src/utf8/utf8_stream.h core/log.h +./core/plugin.o: core/logmanipulators.h ../../pikotools/src/log/log.h +./core/plugin.o: ../../pikotools/src/log/filelog.h ../../morm/src/morm.h ./core/plugin.o: ../../morm/src/version.h ../../morm/src/morm_types.h -./core/plugin.o: ../../morm/src/model.h ../../morm/src/dbexpression.h +./core/plugin.o: ../../morm/src/model.h ../../morm/src/modelconnector.h +./core/plugin.o: ../../morm/src/clearer.h ../../morm/src/ft.h +./core/plugin.o: ../../morm/src/dbconnector.h ../../morm/src/queryresult.h +./core/plugin.o: ../../morm/src/flatconnector.h ../../morm/src/dbexpression.h ./core/plugin.o: ../../morm/src/baseexpression.h ../../morm/src/modelenv.h ./core/plugin.o: ../../morm/src/modeldata.h ../../morm/src/cursorhelper.h ./core/plugin.o: ../../morm/src/finderhelper.h @@ -1302,8 +1345,12 @@ ./core/plugin.o: ../../morm/src/postgresqlconnector.h ./core/plugin.o: ../../morm/src/postgresqlqueryresult.h ./core/plugin.o: ../../morm/src/transaction.h core/log.h core/synchro.h -./core/plugin.o: core/filelog.h core/lock.h ./core/dirs.h -./core/plugin.o: ./core/dircontainer.h models/item.h models/winixmodel.h +./core/plugin.o: core/filelog.h core/lock.h ./core/synchro.h ./core/mount.h +./core/plugin.o: ../../pikotools/src/convert/misc.h +./core/plugin.o: ../../pikotools/src/convert/text.h ./core/system.h +./core/plugin.o: core/job.h ./core/basethread.h core/jobtask.h core/request.h +./core/plugin.o: ./core/cur.h ./core/request.h ./core/requesttypes.h +./core/plugin.o: models/item.h models/winixmodel.h ./core/plugin.o: models/winixmodelconnector.h models/itemcontent.h ./core/plugin.o: templates/htmltextstream.h templates/misc.h ./core/plugin.o: templates/localefilter.h templates/locale.h @@ -1314,41 +1361,40 @@ ./core/plugin.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h ./core/plugin.o: ../../ezc/src/outstreams.h ../../ezc/src/expressionparser.h ./core/plugin.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h -./core/plugin.o: templates/htmltextstream.h db/db.h db/dbbase.h db/dbconn.h -./core/plugin.o: db/dbtextstream.h core/textstream.h core/error.h -./core/plugin.o: models/user.h models/group.h core/dircontainer.h -./core/plugin.o: core/ugcontainer.h ./core/request.h ./core/requesttypes.h -./core/plugin.o: ./core/error.h ./core/config.h ./core/textstream.h -./core/plugin.o: models/winixmodel.h ./core/header.h ./core/mounts.h -./core/plugin.o: ./core/mount.h ./core/mountparser.h ./core/crypt.h -./core/plugin.o: ./core/run.h ./core/users.h ./core/ugcontainer.h -./core/plugin.o: ./core/lastcontainer.h ./core/cur.h ./core/session.h -./core/plugin.o: ./core/rebus.h ./core/ipban.h ./core/groups.h -./core/plugin.o: ./core/loadavg.h ./core/image.h ./core/threadmanager.h +./core/plugin.o: templates/htmltextstream.h ./core/error.h ./core/config.h +./core/plugin.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./core/plugin.o: ./core/compress.h ./core/winixbase.h ./core/mounts.h db/db.h +./core/plugin.o: db/dbbase.h db/dbconn.h db/dbtextstream.h core/textstream.h +./core/plugin.o: core/error.h models/user.h models/group.h +./core/plugin.o: core/dircontainer.h core/ugcontainer.h ./core/mountparser.h +./core/plugin.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./core/plugin.o: core/loadavg.h core/dirs.h core/dircontainer.h core/crypt.h +./core/plugin.o: core/run.h core/users.h core/groups.h core/ugcontainer.h +./core/plugin.o: core/image.h core/threadmanager.h ./core/plugin.o: models/winixmodelconnector.h notify/notify.h ./core/plugin.o: core/winixmodeldeprecated.h notify/notifypool.h ./core/plugin.o: templates/locale.h templates/patterns.h ./core/plugin.o: notify/notifythread.h core/basethread.h -./core/plugin.o: notify/templatesnotify.h core/users.h ./core/timezones.h -./core/plugin.o: ./core/timezone.h ./core/sessionmanager.h +./core/plugin.o: notify/templatesnotify.h core/users.h ./core/lastcontainer.h +./core/plugin.o: core/timezones.h core/timezone.h ./core/sessionmanager.h ./core/plugin.o: ./core/sessioncontainer.h ./core/ipbancontainer.h ./core/plugin.o: ./core/sessionidmanager.h ../../tito/src/base64.h ./core/plugin.o: ../../tito/src/aes.h functions/functions.h -./core/plugin.o: functions/functionbase.h core/request.h core/system.h -./core/plugin.o: core/winixrequest.h core/winixsystem.h core/cur.h +./core/plugin.o: functions/functionbase.h core/winixrequest.h +./core/plugin.o: core/winixsystem.h core/system.h core/cur.h ./core/plugin.o: core/sessionmanager.h core/slog.h functions/functionparser.h -./core/plugin.o: functions/account.h functions/adduser.h functions/cat.h -./core/plugin.o: functions/chmod.h functions/privchanger.h functions/chown.h -./core/plugin.o: functions/ckeditor.h functions/cp.h functions/default.h -./core/plugin.o: functions/download.h functions/emacs.h functions/env.h -./core/plugin.o: models/userwrapper.h models/user.h functions/imgcrop.h -./core/plugin.o: functions/last.h functions/login.h functions/logout.h -./core/plugin.o: functions/ln.h functions/ls.h functions/man.h -./core/plugin.o: functions/meta.h functions/mkdir.h functions/mv.h -./core/plugin.o: functions/nicedit.h functions/node.h functions/passwd.h -./core/plugin.o: functions/priv.h functions/pw.h functions/reload.h -./core/plugin.o: functions/rm.h functions/rmuser.h functions/sort.h -./core/plugin.o: functions/specialdefault.h functions/stat.h +./core/plugin.o: core/dirs.h functions/account.h functions/adduser.h +./core/plugin.o: functions/cat.h functions/chmod.h functions/privchanger.h +./core/plugin.o: functions/chown.h functions/ckeditor.h functions/cp.h +./core/plugin.o: functions/default.h functions/download.h functions/emacs.h +./core/plugin.o: functions/env.h models/userwrapper.h models/user.h +./core/plugin.o: functions/imgcrop.h functions/last.h functions/login.h +./core/plugin.o: functions/logout.h functions/ln.h functions/ls.h +./core/plugin.o: functions/man.h functions/meta.h functions/mkdir.h +./core/plugin.o: functions/mv.h functions/nicedit.h functions/node.h +./core/plugin.o: functions/passwd.h functions/priv.h functions/pw.h +./core/plugin.o: functions/reload.h functions/rm.h functions/rmuser.h +./core/plugin.o: functions/sort.h functions/specialdefault.h functions/stat.h ./core/plugin.o: functions/subject.h functions/template.h functions/tinymce.h ./core/plugin.o: functions/uname.h functions/upload.h functions/uptime.h ./core/plugin.o: functions/who.h functions/vim.h @@ -1357,27 +1403,32 @@ ./core/plugin.o: templates/patterns.h templates/changepatterns.h ./core/plugin.o: ./core/winixrequest.h ./core/plugindata.o: ./core/plugindata.h ./core/plugin.h ./core/pluginmsg.h -./core/plugindata.o: ./core/winixbase.h ../../morm/src/modelconnector.h -./core/plugindata.o: ../../morm/src/clearer.h ../../pikotools/src/date/date.h -./core/plugindata.o: ../../pikotools/src/convert/inttostr.h -./core/plugindata.o: ../../pikotools/src/space/space.h ../../morm/src/ft.h -./core/plugindata.o: ../../morm/src/dbconnector.h -./core/plugindata.o: ../../pikotools/src/textstream/textstream.h -./core/plugindata.o: ../../pikotools/src/textstream/stream.h -./core/plugindata.o: ../../pikotools/src/membuffer/membuffer.h +./core/plugindata.o: ./core/winixmodeldeprecated.h core/winixbase.h +./core/plugindata.o: core/config.h ../../pikotools/src/space/spaceparser.h +./core/plugindata.o: ../../pikotools/src/space/space.h ./core/plugindata.o: ../../pikotools/src/textstream/types.h +./core/plugindata.o: ../../pikotools/src/convert/inttostr.h ./core/plugindata.o: ../../pikotools/src/utf8/utf8.h ./core/plugindata.o: ../../pikotools/src/textstream/stream.h ./core/plugindata.o: ../../pikotools/src/utf8/utf8_templates.h ./core/plugindata.o: ../../pikotools/src/utf8/utf8_private.h -./core/plugindata.o: ../../pikotools/src/utf8/utf8_stream.h -./core/plugindata.o: ../../pikotools/src/log/log.h -./core/plugindata.o: ../../pikotools/src/log/filelog.h -./core/plugindata.o: ../../morm/src/queryresult.h -./core/plugindata.o: ../../morm/src/flatconnector.h core/log.h -./core/plugindata.o: core/logmanipulators.h ../../morm/src/morm.h +./core/plugindata.o: ../../pikotools/src/convert/baseparser.h +./core/plugindata.o: ../../pikotools/src/textstream/textstream.h +./core/plugindata.o: ../../pikotools/src/textstream/stream.h +./core/plugindata.o: ../../pikotools/src/space/space.h +./core/plugindata.o: ../../pikotools/src/date/date.h +./core/plugindata.o: ../../pikotools/src/membuffer/membuffer.h +./core/plugindata.o: ../../pikotools/src/textstream/types.h +./core/plugindata.o: ../../pikotools/src/utf8/utf8_stream.h core/log.h +./core/plugindata.o: core/logmanipulators.h ../../pikotools/src/log/log.h +./core/plugindata.o: ../../pikotools/src/log/filelog.h ../../morm/src/morm.h ./core/plugindata.o: ../../morm/src/version.h ../../morm/src/morm_types.h -./core/plugindata.o: ../../morm/src/model.h ../../morm/src/dbexpression.h +./core/plugindata.o: ../../morm/src/model.h ../../morm/src/modelconnector.h +./core/plugindata.o: ../../morm/src/clearer.h ../../morm/src/ft.h +./core/plugindata.o: ../../morm/src/dbconnector.h +./core/plugindata.o: ../../morm/src/queryresult.h +./core/plugindata.o: ../../morm/src/flatconnector.h +./core/plugindata.o: ../../morm/src/dbexpression.h ./core/plugindata.o: ../../morm/src/baseexpression.h ./core/plugindata.o: ../../morm/src/modelenv.h ../../morm/src/modeldata.h ./core/plugindata.o: ../../morm/src/cursorhelper.h @@ -1394,7 +1445,9 @@ ./core/plugindata.o: ../../morm/src/jsonconnector.h ./core/plugindata.o: ../../morm/src/postgresqlconnector.h ./core/plugindata.o: ../../morm/src/postgresqlqueryresult.h -./core/plugindata.o: ../../morm/src/transaction.h +./core/plugindata.o: ../../morm/src/transaction.h core/log.h core/synchro.h +./core/plugindata.o: core/filelog.h core/lock.h ./core/synchro.h +./core/plugindata.o: ./core/mount.h ./core/postmultiparser.o: ./core/postmultiparser.h ./core/error.h ./core/postmultiparser.o: ./core/request.h ./core/requesttypes.h ./core/postmultiparser.o: ../../pikotools/src/textstream/textstream.h @@ -1465,7 +1518,14 @@ ./core/postmultiparser.o: ../../ezc/src/patternparser.h ./core/postmultiparser.o: templates/htmltextstream.h ./core/config.h ./core/postmultiparser.o: ./core/textstream.h models/winixmodel.h -./core/postmultiparser.o: ./core/header.h ./core/winixbase.h +./core/postmultiparser.o: ./core/header.h ./core/compress.h +./core/postmultiparser.o: ./core/winixbase.h ./core/plugin.h +./core/postmultiparser.o: ./core/pluginmsg.h ./core/plugindata.h +./core/postmultiparser.o: ./core/winixmodeldeprecated.h ./core/mount.h +./core/postmultiparser.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./core/postmultiparser.o: db/dbtextstream.h core/textstream.h core/error.h +./core/postmultiparser.o: models/user.h models/group.h core/dircontainer.h +./core/postmultiparser.o: core/ugcontainer.h ./core/mountparser.h ./core/rebus.o: core/log.h core/logmanipulators.h ./core/rebus.o: ../../pikotools/src/log/log.h ./core/rebus.o: ../../pikotools/src/textstream/textstream.h @@ -1523,9 +1583,14 @@ ./core/rebus.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./core/rebus.o: templates/htmltextstream.h ./core/error.h ./core/config.h ./core/rebus.o: ./core/textstream.h models/winixmodel.h ./core/header.h -./core/rebus.o: ./core/session.h models/user.h ./core/plugindata.h -./core/rebus.o: ./core/ipban.h ./core/mount.h -./core/run.o: ./core/run.h ./core/winixbase.h +./core/rebus.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./core/rebus.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./core/rebus.o: ./core/mount.h ./core/mounts.h db/db.h db/dbbase.h +./core/rebus.o: db/dbconn.h db/dbtextstream.h core/textstream.h core/error.h +./core/rebus.o: models/user.h models/group.h core/dircontainer.h +./core/rebus.o: core/ugcontainer.h ./core/mountparser.h ./core/session.h +./core/rebus.o: ./core/ipban.h +./core/run.o: core/run.h ./core/winixbase.h ./core/session.o: ./core/session.h ./core/error.h models/user.h ./core/session.o: ../../morm/src/model.h ./core/session.o: ../../pikotools/src/textstream/textstream.h @@ -1657,9 +1722,13 @@ ./core/sessioncontainer.o: ./core/request.h ./core/requesttypes.h ./core/sessioncontainer.o: models/item.h models/itemcontent.h ./core/sessioncontainer.o: templates/htmltextstream.h ./core/config.h -./core/sessioncontainer.o: models/winixmodel.h ./core/header.h ./core/mount.h -./core/sessioncontainer.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./core/sessioncontainer.o: ./core/pluginmsg.h +./core/sessioncontainer.o: models/winixmodel.h ./core/header.h +./core/sessioncontainer.o: ./core/compress.h ./core/plugin.h +./core/sessioncontainer.o: ./core/pluginmsg.h ./core/winixmodeldeprecated.h +./core/sessioncontainer.o: ./core/mount.h ./core/mounts.h db/db.h db/dbbase.h +./core/sessioncontainer.o: db/dbconn.h db/dbtextstream.h core/textstream.h +./core/sessioncontainer.o: core/error.h models/group.h core/dircontainer.h +./core/sessioncontainer.o: core/ugcontainer.h ./core/mountparser.h ./core/sessionidmanager.o: ./core/sessionidmanager.h ../../tito/src/base64.h ./core/sessionidmanager.o: ../../pikotools/src/space/space.h ./core/sessionidmanager.o: ../../tito/src/aes.h ./core/winixbase.h @@ -1751,28 +1820,29 @@ ./core/sessionmanager.o: ./core/request.h ./core/requesttypes.h models/item.h ./core/sessionmanager.o: models/itemcontent.h templates/htmltextstream.h ./core/sessionmanager.o: ./core/config.h models/winixmodel.h ./core/header.h -./core/sessionmanager.o: ./core/mount.h ./core/winixmodeldeprecated.h -./core/sessionmanager.o: ./core/plugin.h ./core/pluginmsg.h +./core/sessionmanager.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./core/sessionmanager.o: ./core/winixmodeldeprecated.h ./core/mount.h +./core/sessionmanager.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./core/sessionmanager.o: db/dbtextstream.h core/textstream.h core/error.h +./core/sessionmanager.o: models/group.h core/dircontainer.h +./core/sessionmanager.o: core/ugcontainer.h ./core/mountparser.h ./core/sessionmanager.o: ./core/ipbancontainer.h ./core/lastcontainer.h -./core/sessionmanager.o: ./core/system.h ./core/job.h ./core/basethread.h -./core/sessionmanager.o: ./core/dirs.h ./core/dircontainer.h db/db.h -./core/sessionmanager.o: db/dbbase.h db/dbconn.h db/dbtextstream.h -./core/sessionmanager.o: core/textstream.h core/error.h models/group.h -./core/sessionmanager.o: core/dircontainer.h core/ugcontainer.h -./core/sessionmanager.o: ./core/mounts.h ./core/mountparser.h ./core/crypt.h -./core/sessionmanager.o: ./core/run.h ./core/users.h ./core/ugcontainer.h -./core/sessionmanager.o: ./core/groups.h ./core/loadavg.h ./core/image.h -./core/sessionmanager.o: ./core/threadmanager.h models/winixmodelconnector.h +./core/sessionmanager.o: ./core/basethread.h ./core/sessionidmanager.h +./core/sessionmanager.o: ../../tito/src/base64.h ../../tito/src/aes.h +./core/sessionmanager.o: ./core/sessionparser.h core/users.h +./core/sessionmanager.o: functions/functionbase.h core/request.h ./core/sessionmanager.o: notify/notify.h core/winixmodeldeprecated.h ./core/sessionmanager.o: notify/notifypool.h templates/locale.h ./core/sessionmanager.o: templates/patterns.h notify/notifythread.h ./core/sessionmanager.o: core/basethread.h notify/templatesnotify.h -./core/sessionmanager.o: core/users.h ./core/timezones.h ./core/timezone.h -./core/sessionmanager.o: ./core/sessionidmanager.h ../../tito/src/base64.h -./core/sessionmanager.o: ../../tito/src/aes.h ./core/sessionparser.h -./core/sessionmanager.o: functions/functionbase.h core/request.h -./core/sessionmanager.o: core/system.h core/winixrequest.h core/winixsystem.h -./core/sessionmanager.o: core/cur.h core/sessionmanager.h core/slog.h +./core/sessionmanager.o: core/users.h core/ugcontainer.h core/winixrequest.h +./core/sessionmanager.o: core/winixsystem.h core/system.h core/job.h +./core/sessionmanager.o: core/jobtask.h core/loadavg.h core/dirs.h +./core/sessionmanager.o: core/dircontainer.h core/crypt.h core/run.h +./core/sessionmanager.o: core/groups.h core/image.h core/threadmanager.h +./core/sessionmanager.o: models/winixmodelconnector.h core/timezones.h +./core/sessionmanager.o: core/timezone.h core/cur.h core/sessionmanager.h +./core/sessionmanager.o: core/slog.h ./core/system.h ./core/sessionparser.o: ./core/sessionparser.h ./core/session.h ./core/sessionparser.o: ./core/error.h models/user.h ../../morm/src/model.h ./core/sessionparser.o: ../../pikotools/src/textstream/textstream.h @@ -1843,12 +1913,12 @@ ./core/sessionparser.o: ./core/request.h ./core/requesttypes.h models/item.h ./core/sessionparser.o: models/itemcontent.h templates/htmltextstream.h ./core/sessionparser.o: ./core/config.h models/winixmodel.h ./core/header.h -./core/sessionparser.o: ./core/mount.h ./core/winixmodeldeprecated.h -./core/sessionparser.o: ./core/plugin.h ./core/pluginmsg.h ./core/users.h -./core/sessionparser.o: ./core/ugcontainer.h ./core/lastcontainer.h db/db.h -./core/sessionparser.o: db/dbbase.h db/dbconn.h db/dbtextstream.h -./core/sessionparser.o: core/textstream.h core/error.h models/group.h -./core/sessionparser.o: core/dircontainer.h core/ugcontainer.h +./core/sessionparser.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./core/sessionparser.o: ./core/winixmodeldeprecated.h ./core/mount.h +./core/sessionparser.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./core/sessionparser.o: db/dbtextstream.h core/textstream.h core/error.h +./core/sessionparser.o: models/group.h core/dircontainer.h core/ugcontainer.h +./core/sessionparser.o: ./core/mountparser.h core/users.h ./core/slog.o: ./core/slog.h ./core/cur.h ./core/request.h ./core/slog.o: ./core/requesttypes.h ./core/slog.o: ../../pikotools/src/textstream/textstream.h @@ -1907,11 +1977,16 @@ ./core/slog.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./core/slog.o: templates/htmltextstream.h ./core/error.h ./core/config.h ./core/slog.o: ./core/textstream.h models/winixmodel.h ./core/header.h -./core/slog.o: ./core/session.h models/user.h ./core/plugindata.h -./core/slog.o: ./core/rebus.h ./core/winixbase.h ./core/ipban.h -./core/slog.o: ./core/mount.h templates/locale.h +./core/slog.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./core/slog.o: ./core/pluginmsg.h ./core/plugindata.h +./core/slog.o: ./core/winixmodeldeprecated.h ./core/mount.h ./core/mounts.h +./core/slog.o: db/db.h db/dbbase.h db/dbconn.h db/dbtextstream.h +./core/slog.o: core/textstream.h core/error.h models/user.h models/group.h +./core/slog.o: core/dircontainer.h core/ugcontainer.h ./core/mountparser.h +./core/slog.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./core/slog.o: templates/locale.h ./core/synchro.o: ./core/synchro.h -./core/system.o: ./core/system.h ./core/job.h ./core/basethread.h +./core/system.o: ./core/system.h core/job.h ./core/basethread.h ./core/system.o: ./core/synchro.h ./core/winixmodeldeprecated.h ./core/system.o: core/winixbase.h core/config.h ./core/system.o: ../../pikotools/src/space/spaceparser.h @@ -1953,12 +2028,12 @@ ./core/system.o: ../../morm/src/postgresqlconnector.h ./core/system.o: ../../morm/src/postgresqlqueryresult.h ./core/system.o: ../../morm/src/transaction.h core/log.h core/synchro.h -./core/system.o: core/filelog.h core/lock.h ./core/plugin.h -./core/system.o: ./core/pluginmsg.h ./core/plugindata.h ./core/winixbase.h -./core/system.o: ./core/dirs.h ./core/dircontainer.h models/item.h -./core/system.o: models/winixmodel.h models/winixmodelconnector.h -./core/system.o: models/itemcontent.h templates/htmltextstream.h -./core/system.o: templates/misc.h templates/localefilter.h templates/locale.h +./core/system.o: core/filelog.h core/lock.h core/jobtask.h core/request.h +./core/system.o: ./core/cur.h ./core/request.h ./core/requesttypes.h +./core/system.o: models/item.h models/winixmodel.h +./core/system.o: models/winixmodelconnector.h models/itemcontent.h +./core/system.o: templates/htmltextstream.h templates/misc.h +./core/system.o: templates/localefilter.h templates/locale.h ./core/system.o: ../../pikotools/src/convert/patternreplacer.h ./core/system.o: ../../pikotools/src/convert/strtoint.h ./core/system.o: ../../pikotools/src/convert/text.h @@ -1968,46 +2043,45 @@ ./core/system.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h ./core/system.o: ../../ezc/src/outstreams.h ../../ezc/src/expressionparser.h ./core/system.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h -./core/system.o: templates/htmltextstream.h db/db.h db/dbbase.h db/dbconn.h +./core/system.o: templates/htmltextstream.h ./core/error.h ./core/config.h +./core/system.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./core/system.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./core/system.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./core/system.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h ./core/system.o: db/dbtextstream.h core/textstream.h core/error.h ./core/system.o: models/user.h models/group.h core/dircontainer.h -./core/system.o: core/ugcontainer.h ./core/request.h ./core/requesttypes.h -./core/system.o: ./core/error.h ./core/config.h ./core/textstream.h -./core/system.o: models/winixmodel.h ./core/header.h ./core/mounts.h -./core/system.o: ./core/mount.h ./core/mountparser.h ./core/crypt.h -./core/system.o: ./core/run.h ./core/users.h ./core/ugcontainer.h -./core/system.o: ./core/lastcontainer.h ./core/cur.h ./core/session.h -./core/system.o: ./core/rebus.h ./core/ipban.h ./core/groups.h -./core/system.o: ./core/loadavg.h ./core/image.h ./core/threadmanager.h -./core/system.o: models/winixmodelconnector.h notify/notify.h -./core/system.o: core/winixmodeldeprecated.h notify/notifypool.h -./core/system.o: templates/locale.h templates/patterns.h +./core/system.o: core/ugcontainer.h ./core/mountparser.h ./core/session.h +./core/system.o: ./core/rebus.h ./core/ipban.h core/loadavg.h core/dirs.h +./core/system.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./core/system.o: core/groups.h core/ugcontainer.h core/image.h +./core/system.o: core/threadmanager.h models/winixmodelconnector.h +./core/system.o: notify/notify.h core/winixmodeldeprecated.h +./core/system.o: notify/notifypool.h templates/locale.h templates/patterns.h ./core/system.o: notify/notifythread.h core/basethread.h -./core/system.o: notify/templatesnotify.h core/users.h ./core/timezones.h -./core/system.o: ./core/timezone.h templates/templates.h +./core/system.o: notify/templatesnotify.h core/users.h ./core/lastcontainer.h +./core/system.o: core/timezones.h core/timezone.h templates/templates.h ./core/system.o: templates/patterncacher.h templates/indexpatterns.h ./core/system.o: templates/patterns.h templates/changepatterns.h core/cur.h ./core/system.o: core/system.h core/sessionmanager.h ./core/system.o: ../../pikotools/src/html/htmlparser.h core/winixrequest.h ./core/system.o: core/winixsystem.h core/slog.h functions/functions.h -./core/system.o: functions/functionbase.h core/request.h -./core/system.o: functions/functionparser.h functions/account.h -./core/system.o: functions/adduser.h functions/cat.h functions/chmod.h -./core/system.o: functions/privchanger.h functions/chown.h -./core/system.o: functions/ckeditor.h functions/cp.h functions/default.h -./core/system.o: functions/download.h functions/emacs.h functions/env.h -./core/system.o: models/userwrapper.h models/user.h functions/imgcrop.h -./core/system.o: functions/last.h functions/login.h functions/logout.h -./core/system.o: functions/ln.h functions/ls.h functions/man.h -./core/system.o: functions/meta.h functions/mkdir.h functions/mv.h -./core/system.o: functions/nicedit.h functions/node.h functions/passwd.h -./core/system.o: functions/priv.h functions/pw.h functions/reload.h -./core/system.o: functions/rm.h functions/rmuser.h functions/sort.h -./core/system.o: functions/specialdefault.h functions/stat.h +./core/system.o: functions/functionbase.h functions/functionparser.h +./core/system.o: core/dirs.h functions/account.h functions/adduser.h +./core/system.o: functions/cat.h functions/chmod.h functions/privchanger.h +./core/system.o: functions/chown.h functions/ckeditor.h functions/cp.h +./core/system.o: functions/default.h functions/download.h functions/emacs.h +./core/system.o: functions/env.h models/userwrapper.h models/user.h +./core/system.o: functions/imgcrop.h functions/last.h functions/login.h +./core/system.o: functions/logout.h functions/ln.h functions/ls.h +./core/system.o: functions/man.h functions/meta.h functions/mkdir.h +./core/system.o: functions/mv.h functions/nicedit.h functions/node.h +./core/system.o: functions/passwd.h functions/priv.h functions/pw.h +./core/system.o: functions/reload.h functions/rm.h functions/rmuser.h +./core/system.o: functions/sort.h functions/specialdefault.h functions/stat.h ./core/system.o: functions/subject.h functions/template.h functions/tinymce.h ./core/system.o: functions/uname.h functions/upload.h functions/uptime.h ./core/system.o: functions/who.h functions/vim.h -./core/threadmanager.o: ./core/threadmanager.h ./core/basethread.h +./core/threadmanager.o: core/threadmanager.h ./core/basethread.h ./core/threadmanager.o: ./core/synchro.h ./core/winixmodeldeprecated.h ./core/threadmanager.o: core/winixbase.h core/config.h ./core/threadmanager.o: ../../pikotools/src/space/spaceparser.h @@ -2057,10 +2131,8 @@ ./core/threadmanager.o: ../../morm/src/postgresqlqueryresult.h ./core/threadmanager.o: ../../morm/src/transaction.h core/log.h ./core/threadmanager.o: core/synchro.h core/filelog.h core/lock.h -./core/threadmanager.o: ./core/plugin.h ./core/pluginmsg.h -./core/threadmanager.o: ./core/plugindata.h ./core/winixbase.h ./core/threadmanager.o: models/winixmodelconnector.h -./core/timezone.o: ./core/timezone.h ../../pikotools/src/date/date.h +./core/timezone.o: core/timezone.h ../../pikotools/src/date/date.h ./core/timezone.o: ../../pikotools/src/convert/inttostr.h ./core/timezone.o: ../../pikotools/src/space/space.h ./core/timezone.o: ../../pikotools/src/convert/misc.h @@ -2075,7 +2147,7 @@ ./core/timezone.o: ../../pikotools/src/utf8/utf8.h ./core/timezone.o: ../../pikotools/src/utf8/utf8_templates.h ./core/timezone.o: ../../pikotools/src/utf8/utf8_private.h -./core/timezones.o: ./core/timezones.h ./core/timezone.h +./core/timezones.o: core/timezones.h core/timezone.h ./core/timezones.o: ../../pikotools/src/date/date.h ./core/timezones.o: ../../pikotools/src/convert/inttostr.h ./core/timezones.o: ../../pikotools/src/space/space.h @@ -2118,7 +2190,9 @@ ./core/timezones.o: ../../morm/src/postgresqlconnector.h ./core/timezones.o: ../../morm/src/postgresqlqueryresult.h ./core/timezones.o: ../../morm/src/transaction.h -./core/users.o: ./core/users.h models/user.h ../../morm/src/model.h +./core/users.o: core/users.h ./core/sessionmanager.h +./core/users.o: ./core/sessioncontainer.h ./core/session.h ./core/error.h +./core/users.o: models/user.h ../../morm/src/model.h ./core/users.o: ../../pikotools/src/textstream/textstream.h ./core/users.o: ../../pikotools/src/textstream/stream.h ./core/users.o: ../../pikotools/src/space/space.h @@ -2172,33 +2246,25 @@ ./core/users.o: ../../ezc/src/outstreams.h ../../ezc/src/expressionparser.h ./core/users.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./core/users.o: templates/htmltextstream.h models/winixmodel.h -./core/users.o: models/winixmodelconnector.h ./core/ugcontainer.h -./core/users.o: ./core/lastcontainer.h ./core/winixbase.h ./core/cur.h -./core/users.o: ./core/request.h ./core/requesttypes.h models/item.h -./core/users.o: models/itemcontent.h templates/htmltextstream.h -./core/users.o: ./core/error.h ./core/config.h ./core/textstream.h -./core/users.o: models/winixmodel.h ./core/header.h ./core/session.h -./core/users.o: ./core/plugindata.h ./core/rebus.h ./core/ipban.h -./core/users.o: ./core/mount.h db/db.h db/dbbase.h db/dbconn.h -./core/users.o: db/dbtextstream.h core/textstream.h core/error.h -./core/users.o: models/group.h core/dircontainer.h core/ugcontainer.h -./core/users.o: ./core/sessionmanager.h ./core/sessioncontainer.h -./core/users.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./core/users.o: ./core/pluginmsg.h ./core/ipbancontainer.h ./core/system.h -./core/users.o: ./core/job.h ./core/basethread.h ./core/dirs.h -./core/users.o: ./core/dircontainer.h ./core/mounts.h ./core/mountparser.h -./core/users.o: ./core/crypt.h ./core/run.h ./core/groups.h ./core/loadavg.h -./core/users.o: ./core/image.h ./core/threadmanager.h -./core/users.o: models/winixmodelconnector.h notify/notify.h -./core/users.o: core/winixmodeldeprecated.h notify/notifypool.h -./core/users.o: templates/locale.h templates/patterns.h notify/notifythread.h -./core/users.o: core/basethread.h notify/templatesnotify.h core/users.h -./core/users.o: ./core/timezones.h ./core/timezone.h -./core/users.o: ./core/sessionidmanager.h ../../tito/src/base64.h -./core/users.o: ../../tito/src/aes.h ./core/slog.h +./core/users.o: models/winixmodelconnector.h ./core/plugindata.h +./core/users.o: ./core/rebus.h ./core/winixbase.h ./core/textstream.h +./core/users.o: ./core/ipban.h ./core/cur.h ./core/request.h +./core/users.o: ./core/requesttypes.h models/item.h models/itemcontent.h +./core/users.o: templates/htmltextstream.h ./core/config.h +./core/users.o: models/winixmodel.h ./core/header.h ./core/compress.h +./core/users.o: ./core/plugin.h ./core/pluginmsg.h +./core/users.o: ./core/winixmodeldeprecated.h ./core/mount.h ./core/mounts.h +./core/users.o: db/db.h db/dbbase.h db/dbconn.h db/dbtextstream.h +./core/users.o: core/textstream.h core/error.h models/group.h +./core/users.o: core/dircontainer.h core/ugcontainer.h ./core/mountparser.h +./core/users.o: ./core/ipbancontainer.h ./core/lastcontainer.h +./core/users.o: ./core/basethread.h ./core/sessionidmanager.h +./core/users.o: ../../tito/src/base64.h ../../tito/src/aes.h ./core/slog.h +./core/users.o: templates/locale.h ./core/winixbase.o: ./core/winixbase.h ./core/winixrequest.o: ./core/winixrequest.h -./core/winixsystem.o: ./core/winixsystem.h core/system.h +./core/winixsystem.o: ./core/winixsystem.h core/system.h core/job.h +./core/winixsystem.o: ./core/basethread.h ./core/synchro.h ./core/winixsystem.o: ./core/winixmodeldeprecated.h core/winixbase.h ./core/winixsystem.o: core/config.h ../../pikotools/src/space/spaceparser.h ./core/winixsystem.o: ../../pikotools/src/space/space.h @@ -2242,9 +2308,41 @@ ./core/winixsystem.o: ../../morm/src/postgresqlconnector.h ./core/winixsystem.o: ../../morm/src/postgresqlqueryresult.h ./core/winixsystem.o: ../../morm/src/transaction.h core/log.h core/synchro.h -./core/winixsystem.o: core/filelog.h core/lock.h ./core/synchro.h +./core/winixsystem.o: core/filelog.h core/lock.h core/jobtask.h +./core/winixsystem.o: core/request.h ./core/cur.h ./core/request.h +./core/winixsystem.o: ./core/requesttypes.h models/item.h models/winixmodel.h +./core/winixsystem.o: models/winixmodelconnector.h models/itemcontent.h +./core/winixsystem.o: templates/htmltextstream.h templates/misc.h +./core/winixsystem.o: templates/localefilter.h templates/locale.h +./core/winixsystem.o: ../../pikotools/src/convert/patternreplacer.h +./core/winixsystem.o: ../../pikotools/src/convert/strtoint.h +./core/winixsystem.o: ../../pikotools/src/convert/text.h +./core/winixsystem.o: ../../pikotools/src/convert/misc.h ../../ezc/src/ezc.h +./core/winixsystem.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h +./core/winixsystem.o: ../../ezc/src/cache.h ../../ezc/src/functions.h +./core/winixsystem.o: ../../ezc/src/objects.h ../../ezc/src/pattern.h +./core/winixsystem.o: ../../ezc/src/outstreams.h +./core/winixsystem.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h +./core/winixsystem.o: ../../ezc/src/patternparser.h +./core/winixsystem.o: templates/htmltextstream.h ./core/error.h +./core/winixsystem.o: ./core/config.h ./core/textstream.h models/winixmodel.h +./core/winixsystem.o: ./core/header.h ./core/compress.h ./core/winixbase.h ./core/winixsystem.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./core/winixsystem.o: ./core/winixbase.h +./core/winixsystem.o: ./core/mount.h ./core/mounts.h db/db.h db/dbbase.h +./core/winixsystem.o: db/dbconn.h db/dbtextstream.h core/textstream.h +./core/winixsystem.o: core/error.h models/user.h models/group.h +./core/winixsystem.o: core/dircontainer.h core/ugcontainer.h +./core/winixsystem.o: ./core/mountparser.h ./core/session.h ./core/rebus.h +./core/winixsystem.o: ./core/ipban.h core/loadavg.h core/dirs.h +./core/winixsystem.o: core/dircontainer.h core/crypt.h core/run.h +./core/winixsystem.o: core/users.h core/groups.h core/ugcontainer.h +./core/winixsystem.o: core/image.h core/threadmanager.h +./core/winixsystem.o: models/winixmodelconnector.h notify/notify.h +./core/winixsystem.o: core/winixmodeldeprecated.h notify/notifypool.h +./core/winixsystem.o: templates/locale.h templates/patterns.h +./core/winixsystem.o: notify/notifythread.h core/basethread.h +./core/winixsystem.o: notify/templatesnotify.h core/users.h +./core/winixsystem.o: ./core/lastcontainer.h core/timezones.h core/timezone.h ./core/postparser.o: ./core/postparser.h ./core/httpsimpleparser.h ./core/postparser.o: ./core/winixmodeldeprecated.h core/winixbase.h ./core/postparser.o: core/config.h ../../pikotools/src/space/spaceparser.h @@ -2290,12 +2388,11 @@ ./core/postparser.o: ../../morm/src/postgresqlqueryresult.h ./core/postparser.o: ../../morm/src/transaction.h core/log.h core/synchro.h ./core/postparser.o: core/filelog.h core/lock.h ./core/synchro.h -./core/postparser.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./core/postparser.o: ./core/winixbase.h ./core/request.h -./core/postparser.o: ./core/requesttypes.h models/item.h models/winixmodel.h -./core/postparser.o: models/winixmodelconnector.h models/itemcontent.h -./core/postparser.o: templates/htmltextstream.h templates/misc.h -./core/postparser.o: templates/localefilter.h templates/locale.h +./core/postparser.o: ./core/request.h ./core/requesttypes.h models/item.h +./core/postparser.o: models/winixmodel.h models/winixmodelconnector.h +./core/postparser.o: models/itemcontent.h templates/htmltextstream.h +./core/postparser.o: templates/misc.h templates/localefilter.h +./core/postparser.o: templates/locale.h ./core/postparser.o: ../../pikotools/src/convert/patternreplacer.h ./core/postparser.o: ../../pikotools/src/convert/strtoint.h ./core/postparser.o: ../../pikotools/src/convert/text.h @@ -2307,7 +2404,13 @@ ./core/postparser.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./core/postparser.o: ../../ezc/src/patternparser.h templates/htmltextstream.h ./core/postparser.o: ./core/error.h ./core/config.h ./core/textstream.h -./core/postparser.o: models/winixmodel.h ./core/header.h +./core/postparser.o: models/winixmodel.h ./core/header.h ./core/compress.h +./core/postparser.o: ./core/winixbase.h ./core/plugin.h ./core/pluginmsg.h +./core/postparser.o: ./core/plugindata.h ./core/mount.h ./core/mounts.h +./core/postparser.o: db/db.h db/dbbase.h db/dbconn.h db/dbtextstream.h +./core/postparser.o: core/textstream.h core/error.h models/user.h +./core/postparser.o: models/group.h core/dircontainer.h core/ugcontainer.h +./core/postparser.o: ./core/mountparser.h ./db/db.o: ./db/db.h db/dbbase.h db/dbconn.h db/dbtextstream.h ./db/db.o: core/textstream.h ../../pikotools/src/textstream/textstream.h ./db/db.o: ../../pikotools/src/textstream/stream.h @@ -2359,7 +2462,8 @@ ./db/db.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./db/db.o: templates/htmltextstream.h models/winixmodel.h ./db/db.o: models/winixmodelconnector.h models/group.h core/dircontainer.h -./db/db.o: core/ugcontainer.h ./core/winixbase.h core/misc.h +./db/db.o: ./core/winixbase.h models/item.h models/itemcontent.h +./db/db.o: templates/htmltextstream.h core/ugcontainer.h core/misc.h ./db/db.o: ./core/requesttypes.h core/winix_const.h ./db/db.o: ../../pikotools/src/convert/convert.h ./db/db.o: ../../pikotools/src/convert/inttostr.h @@ -2532,30 +2636,37 @@ ./functions/account.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./functions/account.o: templates/htmltextstream.h models/winixmodel.h ./functions/account.o: models/winixmodelconnector.h models/group.h -./functions/account.o: core/dircontainer.h core/ugcontainer.h -./functions/account.o: ./core/winixbase.h core/request.h core/system.h -./functions/account.o: notify/notify.h core/winixmodeldeprecated.h -./functions/account.o: notify/notifypool.h templates/locale.h -./functions/account.o: templates/patterns.h notify/notifythread.h -./functions/account.o: core/basethread.h notify/templatesnotify.h -./functions/account.o: core/users.h core/winixrequest.h core/winixsystem.h -./functions/account.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/account.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/account.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/account.o: ./core/request.h ./core/requesttypes.h models/item.h +./functions/account.o: core/dircontainer.h ./core/winixbase.h models/item.h ./functions/account.o: models/itemcontent.h templates/htmltextstream.h -./functions/account.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/account.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/account.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./functions/account.o: core/misc.h core/winix_const.h +./functions/account.o: core/ugcontainer.h core/request.h notify/notify.h +./functions/account.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/account.o: templates/locale.h templates/patterns.h +./functions/account.o: notify/notifythread.h core/basethread.h +./functions/account.o: notify/templatesnotify.h core/users.h +./functions/account.o: core/ugcontainer.h ./core/lastcontainer.h ./core/cur.h +./functions/account.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./functions/account.o: ./core/config.h ./core/textstream.h +./functions/account.o: models/winixmodel.h ./core/header.h ./core/compress.h +./functions/account.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h +./functions/account.o: ./core/winixmodeldeprecated.h ./core/mount.h +./functions/account.o: ./core/mounts.h ./core/mountparser.h ./core/session.h +./functions/account.o: ./core/rebus.h ./core/ipban.h core/winixrequest.h +./functions/account.o: core/winixsystem.h core/system.h core/job.h +./functions/account.o: ./core/basethread.h core/jobtask.h core/loadavg.h +./functions/account.o: core/dirs.h core/dircontainer.h core/crypt.h +./functions/account.o: core/run.h core/users.h core/groups.h core/image.h +./functions/account.o: core/threadmanager.h models/winixmodelconnector.h +./functions/account.o: core/timezones.h core/timezone.h core/cur.h +./functions/account.o: core/sessionmanager.h core/slog.h core/misc.h +./functions/account.o: core/winix_const.h ./functions/account.o: ../../pikotools/src/convert/convert.h ./functions/account.o: ../../pikotools/src/convert/inttostr.h ./functions/account.o: ../../pikotools/src/convert/patternreplacer.h ./functions/account.o: ../../pikotools/src/convert/double.h ./functions/account.o: functions/functions.h functions/functionparser.h -./functions/account.o: functions/adduser.h functions/cat.h functions/chmod.h -./functions/account.o: functions/privchanger.h functions/chown.h -./functions/account.o: functions/ckeditor.h functions/cp.h +./functions/account.o: core/dirs.h functions/adduser.h functions/cat.h +./functions/account.o: functions/chmod.h functions/privchanger.h +./functions/account.o: functions/chown.h functions/ckeditor.h functions/cp.h ./functions/account.o: functions/default.h functions/download.h ./functions/account.o: functions/emacs.h functions/env.h models/userwrapper.h ./functions/account.o: models/user.h functions/imgcrop.h functions/last.h @@ -2564,13 +2675,12 @@ ./functions/account.o: functions/mkdir.h functions/mv.h functions/nicedit.h ./functions/account.o: functions/node.h functions/passwd.h functions/priv.h ./functions/account.o: functions/pw.h functions/reload.h functions/rm.h -./functions/account.o: functions/rmuser.h ./core/run.h functions/sort.h +./functions/account.o: functions/rmuser.h functions/sort.h ./functions/account.o: functions/specialdefault.h functions/stat.h ./functions/account.o: functions/subject.h functions/template.h -./functions/account.o: ./core/timezone.h functions/tinymce.h -./functions/account.o: functions/uname.h functions/upload.h -./functions/account.o: functions/uptime.h functions/who.h functions/vim.h -./functions/account.o: ../../pikotools/src/html/htmlparser.h +./functions/account.o: functions/tinymce.h functions/uname.h +./functions/account.o: functions/upload.h functions/uptime.h functions/who.h +./functions/account.o: functions/vim.h ../../pikotools/src/html/htmlparser.h ./functions/adduser.o: functions/adduser.h functions/functionbase.h db/db.h ./functions/adduser.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/adduser.o: core/textstream.h @@ -2635,30 +2745,37 @@ ./functions/adduser.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./functions/adduser.o: templates/htmltextstream.h models/winixmodel.h ./functions/adduser.o: models/winixmodelconnector.h models/group.h -./functions/adduser.o: core/dircontainer.h core/ugcontainer.h -./functions/adduser.o: ./core/winixbase.h core/request.h core/system.h -./functions/adduser.o: notify/notify.h core/winixmodeldeprecated.h -./functions/adduser.o: notify/notifypool.h templates/locale.h -./functions/adduser.o: templates/patterns.h notify/notifythread.h -./functions/adduser.o: core/basethread.h notify/templatesnotify.h -./functions/adduser.o: core/users.h core/winixrequest.h core/winixsystem.h -./functions/adduser.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/adduser.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/adduser.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/adduser.o: ./core/request.h ./core/requesttypes.h models/item.h +./functions/adduser.o: core/dircontainer.h ./core/winixbase.h models/item.h ./functions/adduser.o: models/itemcontent.h templates/htmltextstream.h -./functions/adduser.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/adduser.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/adduser.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./functions/adduser.o: core/misc.h core/winix_const.h +./functions/adduser.o: core/ugcontainer.h core/request.h notify/notify.h +./functions/adduser.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/adduser.o: templates/locale.h templates/patterns.h +./functions/adduser.o: notify/notifythread.h core/basethread.h +./functions/adduser.o: notify/templatesnotify.h core/users.h +./functions/adduser.o: core/ugcontainer.h ./core/lastcontainer.h ./core/cur.h +./functions/adduser.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./functions/adduser.o: ./core/config.h ./core/textstream.h +./functions/adduser.o: models/winixmodel.h ./core/header.h ./core/compress.h +./functions/adduser.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h +./functions/adduser.o: ./core/winixmodeldeprecated.h ./core/mount.h +./functions/adduser.o: ./core/mounts.h ./core/mountparser.h ./core/session.h +./functions/adduser.o: ./core/rebus.h ./core/ipban.h core/winixrequest.h +./functions/adduser.o: core/winixsystem.h core/system.h core/job.h +./functions/adduser.o: ./core/basethread.h core/jobtask.h core/loadavg.h +./functions/adduser.o: core/dirs.h core/dircontainer.h core/crypt.h +./functions/adduser.o: core/run.h core/users.h core/groups.h core/image.h +./functions/adduser.o: core/threadmanager.h models/winixmodelconnector.h +./functions/adduser.o: core/timezones.h core/timezone.h core/cur.h +./functions/adduser.o: core/sessionmanager.h core/slog.h core/misc.h +./functions/adduser.o: core/winix_const.h ./functions/adduser.o: ../../pikotools/src/convert/convert.h ./functions/adduser.o: ../../pikotools/src/convert/inttostr.h ./functions/adduser.o: ../../pikotools/src/convert/patternreplacer.h ./functions/adduser.o: ../../pikotools/src/convert/double.h ./functions/adduser.o: functions/functions.h functions/functionparser.h -./functions/adduser.o: functions/account.h functions/cat.h functions/chmod.h -./functions/adduser.o: functions/privchanger.h functions/chown.h -./functions/adduser.o: functions/ckeditor.h functions/cp.h +./functions/adduser.o: core/dirs.h functions/account.h functions/cat.h +./functions/adduser.o: functions/chmod.h functions/privchanger.h +./functions/adduser.o: functions/chown.h functions/ckeditor.h functions/cp.h ./functions/adduser.o: functions/default.h functions/download.h ./functions/adduser.o: functions/emacs.h functions/env.h models/userwrapper.h ./functions/adduser.o: models/user.h functions/imgcrop.h functions/last.h @@ -2667,13 +2784,12 @@ ./functions/adduser.o: functions/mkdir.h functions/mv.h functions/nicedit.h ./functions/adduser.o: functions/node.h functions/passwd.h functions/priv.h ./functions/adduser.o: functions/pw.h functions/reload.h functions/rm.h -./functions/adduser.o: functions/rmuser.h ./core/run.h functions/sort.h +./functions/adduser.o: functions/rmuser.h functions/sort.h ./functions/adduser.o: functions/specialdefault.h functions/stat.h ./functions/adduser.o: functions/subject.h functions/template.h -./functions/adduser.o: ./core/timezone.h functions/tinymce.h -./functions/adduser.o: functions/uname.h functions/upload.h -./functions/adduser.o: functions/uptime.h functions/who.h functions/vim.h -./functions/adduser.o: ../../pikotools/src/html/htmlparser.h +./functions/adduser.o: functions/tinymce.h functions/uname.h +./functions/adduser.o: functions/upload.h functions/uptime.h functions/who.h +./functions/adduser.o: functions/vim.h ../../pikotools/src/html/htmlparser.h ./functions/cat.o: functions/cat.h functions/functionbase.h db/db.h ./functions/cat.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/cat.o: core/textstream.h @@ -2731,21 +2847,28 @@ ./functions/cat.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./functions/cat.o: ../../ezc/src/patternparser.h templates/htmltextstream.h ./functions/cat.o: models/winixmodel.h models/winixmodelconnector.h -./functions/cat.o: models/group.h core/dircontainer.h core/ugcontainer.h -./functions/cat.o: ./core/winixbase.h core/request.h core/system.h -./functions/cat.o: notify/notify.h core/winixmodeldeprecated.h +./functions/cat.o: models/group.h core/dircontainer.h ./core/winixbase.h +./functions/cat.o: models/item.h models/itemcontent.h +./functions/cat.o: templates/htmltextstream.h core/ugcontainer.h +./functions/cat.o: core/request.h notify/notify.h core/winixmodeldeprecated.h ./functions/cat.o: notify/notifypool.h templates/locale.h ./functions/cat.o: templates/patterns.h notify/notifythread.h ./functions/cat.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/cat.o: core/winixrequest.h core/winixsystem.h -./functions/cat.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/cat.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/cat.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/cat.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/cat.o: models/itemcontent.h templates/htmltextstream.h -./functions/cat.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/cat.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/cat.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/cat.o: core/ugcontainer.h ./core/lastcontainer.h ./core/cur.h +./functions/cat.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./functions/cat.o: ./core/config.h ./core/textstream.h models/winixmodel.h +./functions/cat.o: ./core/header.h ./core/compress.h ./core/plugin.h +./functions/cat.o: ./core/pluginmsg.h ./core/plugindata.h +./functions/cat.o: ./core/winixmodeldeprecated.h ./core/mount.h +./functions/cat.o: ./core/mounts.h ./core/mountparser.h ./core/session.h +./functions/cat.o: ./core/rebus.h ./core/ipban.h core/winixrequest.h +./functions/cat.o: core/winixsystem.h core/system.h core/job.h +./functions/cat.o: ./core/basethread.h core/jobtask.h core/loadavg.h +./functions/cat.o: core/dirs.h core/dircontainer.h core/crypt.h core/run.h +./functions/cat.o: core/users.h core/groups.h core/image.h +./functions/cat.o: core/threadmanager.h models/winixmodelconnector.h +./functions/cat.o: core/timezones.h core/timezone.h core/cur.h +./functions/cat.o: core/sessionmanager.h core/slog.h ./functions/chmod.o: functions/chmod.h functions/functionbase.h db/db.h ./functions/chmod.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/chmod.o: core/textstream.h @@ -2805,22 +2928,29 @@ ./functions/chmod.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./functions/chmod.o: ../../ezc/src/patternparser.h templates/htmltextstream.h ./functions/chmod.o: models/winixmodel.h models/winixmodelconnector.h -./functions/chmod.o: models/group.h core/dircontainer.h core/ugcontainer.h -./functions/chmod.o: ./core/winixbase.h core/request.h core/system.h -./functions/chmod.o: notify/notify.h core/winixmodeldeprecated.h -./functions/chmod.o: notify/notifypool.h templates/locale.h -./functions/chmod.o: templates/patterns.h notify/notifythread.h -./functions/chmod.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/chmod.o: core/winixrequest.h core/winixsystem.h -./functions/chmod.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/chmod.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/chmod.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/chmod.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/chmod.o: models/itemcontent.h templates/htmltextstream.h -./functions/chmod.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/chmod.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/chmod.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./functions/chmod.o: functions/privchanger.h +./functions/chmod.o: models/group.h core/dircontainer.h ./core/winixbase.h +./functions/chmod.o: models/item.h models/itemcontent.h +./functions/chmod.o: templates/htmltextstream.h core/ugcontainer.h +./functions/chmod.o: core/request.h notify/notify.h +./functions/chmod.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/chmod.o: templates/locale.h templates/patterns.h +./functions/chmod.o: notify/notifythread.h core/basethread.h +./functions/chmod.o: notify/templatesnotify.h core/users.h core/ugcontainer.h +./functions/chmod.o: ./core/lastcontainer.h ./core/cur.h ./core/request.h +./functions/chmod.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./functions/chmod.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./functions/chmod.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./functions/chmod.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/chmod.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/chmod.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/chmod.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/chmod.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/chmod.o: core/loadavg.h core/dirs.h core/dircontainer.h +./functions/chmod.o: core/crypt.h core/run.h core/users.h core/groups.h +./functions/chmod.o: core/image.h core/threadmanager.h +./functions/chmod.o: models/winixmodelconnector.h core/timezones.h +./functions/chmod.o: core/timezone.h core/cur.h core/sessionmanager.h +./functions/chmod.o: core/slog.h functions/privchanger.h ./functions/chown.o: functions/chown.h functions/functionbase.h db/db.h ./functions/chown.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/chown.o: core/textstream.h @@ -2880,22 +3010,29 @@ ./functions/chown.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./functions/chown.o: ../../ezc/src/patternparser.h templates/htmltextstream.h ./functions/chown.o: models/winixmodel.h models/winixmodelconnector.h -./functions/chown.o: models/group.h core/dircontainer.h core/ugcontainer.h -./functions/chown.o: ./core/winixbase.h core/request.h core/system.h -./functions/chown.o: notify/notify.h core/winixmodeldeprecated.h -./functions/chown.o: notify/notifypool.h templates/locale.h -./functions/chown.o: templates/patterns.h notify/notifythread.h -./functions/chown.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/chown.o: core/winixrequest.h core/winixsystem.h -./functions/chown.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/chown.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/chown.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/chown.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/chown.o: models/itemcontent.h templates/htmltextstream.h -./functions/chown.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/chown.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/chown.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./functions/chown.o: functions/privchanger.h +./functions/chown.o: models/group.h core/dircontainer.h ./core/winixbase.h +./functions/chown.o: models/item.h models/itemcontent.h +./functions/chown.o: templates/htmltextstream.h core/ugcontainer.h +./functions/chown.o: core/request.h notify/notify.h +./functions/chown.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/chown.o: templates/locale.h templates/patterns.h +./functions/chown.o: notify/notifythread.h core/basethread.h +./functions/chown.o: notify/templatesnotify.h core/users.h core/ugcontainer.h +./functions/chown.o: ./core/lastcontainer.h ./core/cur.h ./core/request.h +./functions/chown.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./functions/chown.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./functions/chown.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./functions/chown.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/chown.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/chown.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/chown.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/chown.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/chown.o: core/loadavg.h core/dirs.h core/dircontainer.h +./functions/chown.o: core/crypt.h core/run.h core/users.h core/groups.h +./functions/chown.o: core/image.h core/threadmanager.h +./functions/chown.o: models/winixmodelconnector.h core/timezones.h +./functions/chown.o: core/timezone.h core/cur.h core/sessionmanager.h +./functions/chown.o: core/slog.h functions/privchanger.h ./functions/ckeditor.o: functions/ckeditor.h functions/functionbase.h db/db.h ./functions/ckeditor.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/ckeditor.o: core/textstream.h @@ -2962,21 +3099,29 @@ ./functions/ckeditor.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./functions/ckeditor.o: templates/htmltextstream.h models/winixmodel.h ./functions/ckeditor.o: models/winixmodelconnector.h models/group.h -./functions/ckeditor.o: core/dircontainer.h core/ugcontainer.h -./functions/ckeditor.o: ./core/winixbase.h core/request.h core/system.h -./functions/ckeditor.o: notify/notify.h core/winixmodeldeprecated.h -./functions/ckeditor.o: notify/notifypool.h templates/locale.h -./functions/ckeditor.o: templates/patterns.h notify/notifythread.h -./functions/ckeditor.o: core/basethread.h notify/templatesnotify.h -./functions/ckeditor.o: core/users.h core/winixrequest.h core/winixsystem.h -./functions/ckeditor.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/ckeditor.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/ckeditor.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/ckeditor.o: ./core/request.h ./core/requesttypes.h models/item.h +./functions/ckeditor.o: core/dircontainer.h ./core/winixbase.h models/item.h ./functions/ckeditor.o: models/itemcontent.h templates/htmltextstream.h +./functions/ckeditor.o: core/ugcontainer.h core/request.h notify/notify.h +./functions/ckeditor.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/ckeditor.o: templates/locale.h templates/patterns.h +./functions/ckeditor.o: notify/notifythread.h core/basethread.h +./functions/ckeditor.o: notify/templatesnotify.h core/users.h +./functions/ckeditor.o: core/ugcontainer.h ./core/lastcontainer.h +./functions/ckeditor.o: ./core/cur.h ./core/request.h ./core/requesttypes.h ./functions/ckeditor.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/ckeditor.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/ckeditor.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/ckeditor.o: models/winixmodel.h ./core/header.h ./core/compress.h +./functions/ckeditor.o: ./core/plugin.h ./core/pluginmsg.h +./functions/ckeditor.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/ckeditor.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/ckeditor.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/ckeditor.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/ckeditor.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/ckeditor.o: core/loadavg.h core/dirs.h core/dircontainer.h +./functions/ckeditor.o: core/crypt.h core/run.h core/users.h core/groups.h +./functions/ckeditor.o: core/image.h core/threadmanager.h +./functions/ckeditor.o: models/winixmodelconnector.h core/timezones.h +./functions/ckeditor.o: core/timezone.h core/cur.h core/sessionmanager.h +./functions/ckeditor.o: core/slog.h ./functions/cp.o: functions/cp.h functions/functionbase.h db/db.h db/dbbase.h ./functions/cp.o: db/dbconn.h db/dbtextstream.h core/textstream.h ./functions/cp.o: ../../pikotools/src/textstream/textstream.h @@ -3033,20 +3178,27 @@ ./functions/cp.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./functions/cp.o: templates/htmltextstream.h models/winixmodel.h ./functions/cp.o: models/winixmodelconnector.h models/group.h -./functions/cp.o: core/dircontainer.h core/ugcontainer.h ./core/winixbase.h -./functions/cp.o: core/request.h core/system.h notify/notify.h +./functions/cp.o: core/dircontainer.h ./core/winixbase.h models/item.h +./functions/cp.o: models/itemcontent.h templates/htmltextstream.h +./functions/cp.o: core/ugcontainer.h core/request.h notify/notify.h ./functions/cp.o: core/winixmodeldeprecated.h notify/notifypool.h ./functions/cp.o: templates/locale.h templates/patterns.h ./functions/cp.o: notify/notifythread.h core/basethread.h -./functions/cp.o: notify/templatesnotify.h core/users.h core/winixrequest.h -./functions/cp.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./functions/cp.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./functions/cp.o: core/cur.h core/sessionmanager.h core/slog.h ./core/cur.h -./functions/cp.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/cp.o: models/itemcontent.h templates/htmltextstream.h -./functions/cp.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/cp.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/cp.o: ./core/rebus.h ./core/ipban.h ./core/mount.h core/misc.h +./functions/cp.o: notify/templatesnotify.h core/users.h core/ugcontainer.h +./functions/cp.o: ./core/lastcontainer.h ./core/cur.h ./core/request.h +./functions/cp.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./functions/cp.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./functions/cp.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./functions/cp.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/cp.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/cp.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/cp.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/cp.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/cp.o: core/loadavg.h core/dirs.h core/dircontainer.h core/crypt.h +./functions/cp.o: core/run.h core/users.h core/groups.h core/image.h +./functions/cp.o: core/threadmanager.h models/winixmodelconnector.h +./functions/cp.o: core/timezones.h core/timezone.h core/cur.h +./functions/cp.o: core/sessionmanager.h core/slog.h core/misc.h ./functions/cp.o: core/winix_const.h ../../pikotools/src/convert/convert.h ./functions/cp.o: ../../pikotools/src/convert/inttostr.h ./functions/cp.o: ../../pikotools/src/convert/patternreplacer.h @@ -3115,21 +3267,28 @@ ./functions/default.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./functions/default.o: templates/htmltextstream.h models/winixmodel.h ./functions/default.o: models/winixmodelconnector.h models/group.h -./functions/default.o: core/dircontainer.h core/ugcontainer.h -./functions/default.o: ./core/winixbase.h core/request.h core/system.h -./functions/default.o: notify/notify.h core/winixmodeldeprecated.h -./functions/default.o: notify/notifypool.h templates/locale.h -./functions/default.o: templates/patterns.h notify/notifythread.h -./functions/default.o: core/basethread.h notify/templatesnotify.h -./functions/default.o: core/users.h core/winixrequest.h core/winixsystem.h -./functions/default.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/default.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/default.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/default.o: ./core/request.h ./core/requesttypes.h models/item.h +./functions/default.o: core/dircontainer.h ./core/winixbase.h models/item.h ./functions/default.o: models/itemcontent.h templates/htmltextstream.h -./functions/default.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/default.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/default.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/default.o: core/ugcontainer.h core/request.h notify/notify.h +./functions/default.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/default.o: templates/locale.h templates/patterns.h +./functions/default.o: notify/notifythread.h core/basethread.h +./functions/default.o: notify/templatesnotify.h core/users.h +./functions/default.o: core/ugcontainer.h ./core/lastcontainer.h ./core/cur.h +./functions/default.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./functions/default.o: ./core/config.h ./core/textstream.h +./functions/default.o: models/winixmodel.h ./core/header.h ./core/compress.h +./functions/default.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h +./functions/default.o: ./core/winixmodeldeprecated.h ./core/mount.h +./functions/default.o: ./core/mounts.h ./core/mountparser.h ./core/session.h +./functions/default.o: ./core/rebus.h ./core/ipban.h core/winixrequest.h +./functions/default.o: core/winixsystem.h core/system.h core/job.h +./functions/default.o: ./core/basethread.h core/jobtask.h core/loadavg.h +./functions/default.o: core/dirs.h core/dircontainer.h core/crypt.h +./functions/default.o: core/run.h core/users.h core/groups.h core/image.h +./functions/default.o: core/threadmanager.h models/winixmodelconnector.h +./functions/default.o: core/timezones.h core/timezone.h core/cur.h +./functions/default.o: core/sessionmanager.h core/slog.h ./functions/download.o: functions/download.h functions/functionbase.h db/db.h ./functions/download.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/download.o: core/textstream.h @@ -3196,21 +3355,29 @@ ./functions/download.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./functions/download.o: templates/htmltextstream.h models/winixmodel.h ./functions/download.o: models/winixmodelconnector.h models/group.h -./functions/download.o: core/dircontainer.h core/ugcontainer.h -./functions/download.o: ./core/winixbase.h core/request.h core/system.h -./functions/download.o: notify/notify.h core/winixmodeldeprecated.h -./functions/download.o: notify/notifypool.h templates/locale.h -./functions/download.o: templates/patterns.h notify/notifythread.h -./functions/download.o: core/basethread.h notify/templatesnotify.h -./functions/download.o: core/users.h core/winixrequest.h core/winixsystem.h -./functions/download.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/download.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/download.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/download.o: ./core/request.h ./core/requesttypes.h models/item.h +./functions/download.o: core/dircontainer.h ./core/winixbase.h models/item.h ./functions/download.o: models/itemcontent.h templates/htmltextstream.h +./functions/download.o: core/ugcontainer.h core/request.h notify/notify.h +./functions/download.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/download.o: templates/locale.h templates/patterns.h +./functions/download.o: notify/notifythread.h core/basethread.h +./functions/download.o: notify/templatesnotify.h core/users.h +./functions/download.o: core/ugcontainer.h ./core/lastcontainer.h +./functions/download.o: ./core/cur.h ./core/request.h ./core/requesttypes.h ./functions/download.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/download.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/download.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/download.o: models/winixmodel.h ./core/header.h ./core/compress.h +./functions/download.o: ./core/plugin.h ./core/pluginmsg.h +./functions/download.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/download.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/download.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/download.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/download.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/download.o: core/loadavg.h core/dirs.h core/dircontainer.h +./functions/download.o: core/crypt.h core/run.h core/users.h core/groups.h +./functions/download.o: core/image.h core/threadmanager.h +./functions/download.o: models/winixmodelconnector.h core/timezones.h +./functions/download.o: core/timezone.h core/cur.h core/sessionmanager.h +./functions/download.o: core/slog.h ./functions/emacs.o: functions/emacs.h functions/functionbase.h db/db.h ./functions/emacs.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/emacs.o: core/textstream.h @@ -3270,24 +3437,31 @@ ./functions/emacs.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./functions/emacs.o: ../../ezc/src/patternparser.h templates/htmltextstream.h ./functions/emacs.o: models/winixmodel.h models/winixmodelconnector.h -./functions/emacs.o: models/group.h core/dircontainer.h core/ugcontainer.h -./functions/emacs.o: ./core/winixbase.h core/request.h core/system.h -./functions/emacs.o: notify/notify.h core/winixmodeldeprecated.h -./functions/emacs.o: notify/notifypool.h templates/locale.h -./functions/emacs.o: templates/patterns.h notify/notifythread.h -./functions/emacs.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/emacs.o: core/winixrequest.h core/winixsystem.h -./functions/emacs.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/emacs.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/emacs.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/emacs.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/emacs.o: models/itemcontent.h templates/htmltextstream.h -./functions/emacs.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/emacs.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/emacs.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./functions/emacs.o: templates/templates.h templates/patterncacher.h -./functions/emacs.o: templates/indexpatterns.h templates/patterns.h -./functions/emacs.o: templates/changepatterns.h +./functions/emacs.o: models/group.h core/dircontainer.h ./core/winixbase.h +./functions/emacs.o: models/item.h models/itemcontent.h +./functions/emacs.o: templates/htmltextstream.h core/ugcontainer.h +./functions/emacs.o: core/request.h notify/notify.h +./functions/emacs.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/emacs.o: templates/locale.h templates/patterns.h +./functions/emacs.o: notify/notifythread.h core/basethread.h +./functions/emacs.o: notify/templatesnotify.h core/users.h core/ugcontainer.h +./functions/emacs.o: ./core/lastcontainer.h ./core/cur.h ./core/request.h +./functions/emacs.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./functions/emacs.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./functions/emacs.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./functions/emacs.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/emacs.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/emacs.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/emacs.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/emacs.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/emacs.o: core/loadavg.h core/dirs.h core/dircontainer.h +./functions/emacs.o: core/crypt.h core/run.h core/users.h core/groups.h +./functions/emacs.o: core/image.h core/threadmanager.h +./functions/emacs.o: models/winixmodelconnector.h core/timezones.h +./functions/emacs.o: core/timezone.h core/cur.h core/sessionmanager.h +./functions/emacs.o: core/slog.h templates/templates.h +./functions/emacs.o: templates/patterncacher.h templates/indexpatterns.h +./functions/emacs.o: templates/patterns.h templates/changepatterns.h ./functions/emacs.o: ../../pikotools/src/html/htmlparser.h ./functions/env.o: functions/env.h models/userwrapper.h models/user.h ./functions/env.o: functions/functionbase.h db/db.h db/dbbase.h db/dbconn.h @@ -3346,21 +3520,28 @@ ./functions/env.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./functions/env.o: ../../ezc/src/patternparser.h templates/htmltextstream.h ./functions/env.o: models/winixmodel.h models/winixmodelconnector.h -./functions/env.o: models/group.h core/dircontainer.h core/ugcontainer.h -./functions/env.o: ./core/winixbase.h core/request.h core/system.h -./functions/env.o: notify/notify.h core/winixmodeldeprecated.h +./functions/env.o: models/group.h core/dircontainer.h ./core/winixbase.h +./functions/env.o: models/item.h models/itemcontent.h +./functions/env.o: templates/htmltextstream.h core/ugcontainer.h +./functions/env.o: core/request.h notify/notify.h core/winixmodeldeprecated.h ./functions/env.o: notify/notifypool.h templates/locale.h ./functions/env.o: templates/patterns.h notify/notifythread.h ./functions/env.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/env.o: core/winixrequest.h core/winixsystem.h -./functions/env.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/env.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/env.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/env.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/env.o: models/itemcontent.h templates/htmltextstream.h -./functions/env.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/env.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/env.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/env.o: core/ugcontainer.h ./core/lastcontainer.h ./core/cur.h +./functions/env.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./functions/env.o: ./core/config.h ./core/textstream.h models/winixmodel.h +./functions/env.o: ./core/header.h ./core/compress.h ./core/plugin.h +./functions/env.o: ./core/pluginmsg.h ./core/plugindata.h +./functions/env.o: ./core/winixmodeldeprecated.h ./core/mount.h +./functions/env.o: ./core/mounts.h ./core/mountparser.h ./core/session.h +./functions/env.o: ./core/rebus.h ./core/ipban.h core/winixrequest.h +./functions/env.o: core/winixsystem.h core/system.h core/job.h +./functions/env.o: ./core/basethread.h core/jobtask.h core/loadavg.h +./functions/env.o: core/dirs.h core/dircontainer.h core/crypt.h core/run.h +./functions/env.o: core/users.h core/groups.h core/image.h +./functions/env.o: core/threadmanager.h models/winixmodelconnector.h +./functions/env.o: core/timezones.h core/timezone.h core/cur.h +./functions/env.o: core/sessionmanager.h core/slog.h ./functions/functionbase.o: functions/functionbase.h db/db.h db/dbbase.h ./functions/functionbase.o: db/dbconn.h db/dbtextstream.h core/textstream.h ./functions/functionbase.o: ../../pikotools/src/textstream/textstream.h @@ -3431,25 +3612,33 @@ ./functions/functionbase.o: ../../ezc/src/patternparser.h ./functions/functionbase.o: templates/htmltextstream.h models/winixmodel.h ./functions/functionbase.o: models/winixmodelconnector.h models/group.h -./functions/functionbase.o: core/dircontainer.h core/ugcontainer.h -./functions/functionbase.o: ./core/winixbase.h core/request.h core/system.h -./functions/functionbase.o: notify/notify.h core/winixmodeldeprecated.h -./functions/functionbase.o: notify/notifypool.h templates/locale.h -./functions/functionbase.o: templates/patterns.h notify/notifythread.h -./functions/functionbase.o: core/basethread.h notify/templatesnotify.h -./functions/functionbase.o: core/users.h core/winixrequest.h -./functions/functionbase.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./functions/functionbase.o: ./core/plugin.h ./core/pluginmsg.h -./functions/functionbase.o: ./core/plugindata.h core/cur.h -./functions/functionbase.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/functionbase.o: ./core/request.h ./core/requesttypes.h +./functions/functionbase.o: core/dircontainer.h ./core/winixbase.h ./functions/functionbase.o: models/item.h models/itemcontent.h -./functions/functionbase.o: templates/htmltextstream.h ./core/error.h +./functions/functionbase.o: templates/htmltextstream.h core/ugcontainer.h +./functions/functionbase.o: core/request.h notify/notify.h +./functions/functionbase.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/functionbase.o: templates/locale.h templates/patterns.h +./functions/functionbase.o: notify/notifythread.h core/basethread.h +./functions/functionbase.o: notify/templatesnotify.h core/users.h +./functions/functionbase.o: core/ugcontainer.h ./core/lastcontainer.h +./functions/functionbase.o: ./core/cur.h ./core/request.h +./functions/functionbase.o: ./core/requesttypes.h ./core/error.h ./functions/functionbase.o: ./core/config.h ./core/textstream.h ./functions/functionbase.o: models/winixmodel.h ./core/header.h +./functions/functionbase.o: ./core/compress.h ./core/plugin.h +./functions/functionbase.o: ./core/pluginmsg.h ./core/plugindata.h +./functions/functionbase.o: ./core/winixmodeldeprecated.h ./core/mount.h +./functions/functionbase.o: ./core/mounts.h ./core/mountparser.h ./functions/functionbase.o: ./core/session.h ./core/rebus.h ./core/ipban.h -./functions/functionbase.o: ./core/mount.h templates/templates.h -./functions/functionbase.o: templates/patterncacher.h +./functions/functionbase.o: core/winixrequest.h core/winixsystem.h +./functions/functionbase.o: core/system.h core/job.h ./core/basethread.h +./functions/functionbase.o: core/jobtask.h core/loadavg.h core/dirs.h +./functions/functionbase.o: core/dircontainer.h core/crypt.h core/run.h +./functions/functionbase.o: core/users.h core/groups.h core/image.h +./functions/functionbase.o: core/threadmanager.h models/winixmodelconnector.h +./functions/functionbase.o: core/timezones.h core/timezone.h core/cur.h +./functions/functionbase.o: core/sessionmanager.h core/slog.h +./functions/functionbase.o: templates/templates.h templates/patterncacher.h ./functions/functionbase.o: templates/indexpatterns.h templates/patterns.h ./functions/functionbase.o: templates/changepatterns.h ./functions/functionbase.o: ../../pikotools/src/html/htmlparser.h @@ -3524,10 +3713,10 @@ ./functions/functionparser.o: ../../ezc/src/patternparser.h ./functions/functionparser.o: templates/htmltextstream.h models/winixmodel.h ./functions/functionparser.o: models/winixmodelconnector.h models/group.h -./functions/functionparser.o: core/dircontainer.h core/ugcontainer.h -./functions/functionparser.o: ./core/winixbase.h core/cur.h core/system.h +./functions/functionparser.o: core/dircontainer.h ./core/winixbase.h ./functions/functionparser.o: models/item.h models/itemcontent.h -./functions/functionparser.o: templates/htmltextstream.h +./functions/functionparser.o: templates/htmltextstream.h core/ugcontainer.h +./functions/functionparser.o: core/cur.h core/dirs.h ./functions/functions.o: ../../ezc/src/functions.h ./functions/functions.o: ../../pikotools/src/utf8/utf8.h ./functions/functions.o: ../../pikotools/src/textstream/stream.h @@ -3602,20 +3791,31 @@ ./functions/functions.o: ../../pikotools/src/convert/patternreplacer.h ./functions/functions.o: templates/htmltextstream.h templates/indexpatterns.h ./functions/functions.o: templates/patterns.h templates/changepatterns.h -./functions/functions.o: core/cur.h core/system.h core/sessionmanager.h -./functions/functions.o: ../../pikotools/src/html/htmlparser.h db/db.h -./functions/functions.o: db/dbbase.h db/dbconn.h db/dbtextstream.h +./functions/functions.o: core/cur.h core/system.h core/job.h +./functions/functions.o: ./core/basethread.h ./core/winixmodeldeprecated.h +./functions/functions.o: core/jobtask.h core/request.h ./core/cur.h +./functions/functions.o: ./core/request.h ./core/error.h ./core/config.h +./functions/functions.o: ./core/textstream.h models/winixmodel.h +./functions/functions.o: ./core/header.h ./core/compress.h ./core/winixbase.h +./functions/functions.o: ./core/plugin.h ./core/pluginmsg.h +./functions/functions.o: ./core/plugindata.h ./core/mount.h ./core/mounts.h +./functions/functions.o: db/db.h db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/functions.o: core/textstream.h core/error.h models/user.h ./functions/functions.o: models/group.h core/dircontainer.h -./functions/functions.o: core/ugcontainer.h ./core/winixbase.h -./functions/functions.o: core/winixrequest.h core/winixsystem.h -./functions/functions.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/functions.o: ./core/pluginmsg.h ./core/plugindata.h core/slog.h -./functions/functions.o: ./core/cur.h ./core/request.h ./core/error.h -./functions/functions.o: ./core/config.h ./core/textstream.h -./functions/functions.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/functions.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./functions/functions.o: templates/locale.h +./functions/functions.o: core/ugcontainer.h ./core/mountparser.h +./functions/functions.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/functions.o: core/loadavg.h core/dirs.h core/dircontainer.h +./functions/functions.o: core/crypt.h core/run.h core/users.h core/groups.h +./functions/functions.o: core/ugcontainer.h core/image.h core/threadmanager.h +./functions/functions.o: models/winixmodelconnector.h notify/notify.h +./functions/functions.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/functions.o: templates/locale.h templates/patterns.h +./functions/functions.o: notify/notifythread.h core/basethread.h +./functions/functions.o: notify/templatesnotify.h core/users.h +./functions/functions.o: ./core/lastcontainer.h core/timezones.h +./functions/functions.o: core/timezone.h core/sessionmanager.h +./functions/functions.o: ../../pikotools/src/html/htmlparser.h +./functions/functions.o: core/winixrequest.h core/winixsystem.h core/slog.h ./functions/imgcrop.o: functions/imgcrop.h functions/functionbase.h db/db.h ./functions/imgcrop.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/imgcrop.o: core/textstream.h @@ -3680,21 +3880,28 @@ ./functions/imgcrop.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./functions/imgcrop.o: templates/htmltextstream.h models/winixmodel.h ./functions/imgcrop.o: models/winixmodelconnector.h models/group.h -./functions/imgcrop.o: core/dircontainer.h core/ugcontainer.h -./functions/imgcrop.o: ./core/winixbase.h core/request.h core/system.h -./functions/imgcrop.o: notify/notify.h core/winixmodeldeprecated.h -./functions/imgcrop.o: notify/notifypool.h templates/locale.h -./functions/imgcrop.o: templates/patterns.h notify/notifythread.h -./functions/imgcrop.o: core/basethread.h notify/templatesnotify.h -./functions/imgcrop.o: core/users.h core/winixrequest.h core/winixsystem.h -./functions/imgcrop.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/imgcrop.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/imgcrop.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/imgcrop.o: ./core/request.h ./core/requesttypes.h models/item.h +./functions/imgcrop.o: core/dircontainer.h ./core/winixbase.h models/item.h ./functions/imgcrop.o: models/itemcontent.h templates/htmltextstream.h -./functions/imgcrop.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/imgcrop.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/imgcrop.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/imgcrop.o: core/ugcontainer.h core/request.h notify/notify.h +./functions/imgcrop.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/imgcrop.o: templates/locale.h templates/patterns.h +./functions/imgcrop.o: notify/notifythread.h core/basethread.h +./functions/imgcrop.o: notify/templatesnotify.h core/users.h +./functions/imgcrop.o: core/ugcontainer.h ./core/lastcontainer.h ./core/cur.h +./functions/imgcrop.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./functions/imgcrop.o: ./core/config.h ./core/textstream.h +./functions/imgcrop.o: models/winixmodel.h ./core/header.h ./core/compress.h +./functions/imgcrop.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h +./functions/imgcrop.o: ./core/winixmodeldeprecated.h ./core/mount.h +./functions/imgcrop.o: ./core/mounts.h ./core/mountparser.h ./core/session.h +./functions/imgcrop.o: ./core/rebus.h ./core/ipban.h core/winixrequest.h +./functions/imgcrop.o: core/winixsystem.h core/system.h core/job.h +./functions/imgcrop.o: ./core/basethread.h core/jobtask.h core/loadavg.h +./functions/imgcrop.o: core/dirs.h core/dircontainer.h core/crypt.h +./functions/imgcrop.o: core/run.h core/users.h core/groups.h core/image.h +./functions/imgcrop.o: core/threadmanager.h models/winixmodelconnector.h +./functions/imgcrop.o: core/timezones.h core/timezone.h core/cur.h +./functions/imgcrop.o: core/sessionmanager.h core/slog.h ./functions/ipban.o: ./core/ipban.h ../../ezc/src/functions.h ./functions/ipban.o: ../../pikotools/src/utf8/utf8.h ./functions/ipban.o: ../../pikotools/src/textstream/stream.h @@ -3759,21 +3966,29 @@ ./functions/last.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./functions/last.o: ../../ezc/src/patternparser.h templates/htmltextstream.h ./functions/last.o: models/winixmodel.h models/winixmodelconnector.h -./functions/last.o: models/group.h core/dircontainer.h core/ugcontainer.h -./functions/last.o: ./core/winixbase.h core/request.h core/system.h -./functions/last.o: notify/notify.h core/winixmodeldeprecated.h -./functions/last.o: notify/notifypool.h templates/locale.h -./functions/last.o: templates/patterns.h notify/notifythread.h -./functions/last.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/last.o: core/winixrequest.h core/winixsystem.h -./functions/last.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/last.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/last.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/last.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/last.o: models/itemcontent.h templates/htmltextstream.h -./functions/last.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/last.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/last.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/last.o: models/group.h core/dircontainer.h ./core/winixbase.h +./functions/last.o: models/item.h models/itemcontent.h +./functions/last.o: templates/htmltextstream.h core/ugcontainer.h +./functions/last.o: core/request.h notify/notify.h +./functions/last.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/last.o: templates/locale.h templates/patterns.h +./functions/last.o: notify/notifythread.h core/basethread.h +./functions/last.o: notify/templatesnotify.h core/users.h core/ugcontainer.h +./functions/last.o: ./core/lastcontainer.h ./core/cur.h ./core/request.h +./functions/last.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./functions/last.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./functions/last.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./functions/last.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/last.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/last.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/last.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/last.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/last.o: core/loadavg.h core/dirs.h core/dircontainer.h +./functions/last.o: core/crypt.h core/run.h core/users.h core/groups.h +./functions/last.o: core/image.h core/threadmanager.h +./functions/last.o: models/winixmodelconnector.h core/timezones.h +./functions/last.o: core/timezone.h core/cur.h core/sessionmanager.h +./functions/last.o: core/slog.h ./functions/ln.o: functions/ln.h functions/functionbase.h db/db.h db/dbbase.h ./functions/ln.o: db/dbconn.h db/dbtextstream.h core/textstream.h ./functions/ln.o: ../../pikotools/src/textstream/textstream.h @@ -3830,25 +4045,32 @@ ./functions/ln.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./functions/ln.o: templates/htmltextstream.h models/winixmodel.h ./functions/ln.o: models/winixmodelconnector.h models/group.h -./functions/ln.o: core/dircontainer.h core/ugcontainer.h ./core/winixbase.h -./functions/ln.o: core/request.h core/system.h notify/notify.h +./functions/ln.o: core/dircontainer.h ./core/winixbase.h models/item.h +./functions/ln.o: models/itemcontent.h templates/htmltextstream.h +./functions/ln.o: core/ugcontainer.h core/request.h notify/notify.h ./functions/ln.o: core/winixmodeldeprecated.h notify/notifypool.h ./functions/ln.o: templates/locale.h templates/patterns.h ./functions/ln.o: notify/notifythread.h core/basethread.h -./functions/ln.o: notify/templatesnotify.h core/users.h core/winixrequest.h -./functions/ln.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./functions/ln.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./functions/ln.o: core/cur.h core/sessionmanager.h core/slog.h ./core/cur.h -./functions/ln.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/ln.o: models/itemcontent.h templates/htmltextstream.h -./functions/ln.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/ln.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/ln.o: ./core/rebus.h ./core/ipban.h ./core/mount.h core/misc.h +./functions/ln.o: notify/templatesnotify.h core/users.h core/ugcontainer.h +./functions/ln.o: ./core/lastcontainer.h ./core/cur.h ./core/request.h +./functions/ln.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./functions/ln.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./functions/ln.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./functions/ln.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/ln.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/ln.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/ln.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/ln.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/ln.o: core/loadavg.h core/dirs.h core/dircontainer.h core/crypt.h +./functions/ln.o: core/run.h core/users.h core/groups.h core/image.h +./functions/ln.o: core/threadmanager.h models/winixmodelconnector.h +./functions/ln.o: core/timezones.h core/timezone.h core/cur.h +./functions/ln.o: core/sessionmanager.h core/slog.h core/misc.h ./functions/ln.o: core/winix_const.h ../../pikotools/src/convert/convert.h ./functions/ln.o: ../../pikotools/src/convert/inttostr.h ./functions/ln.o: ../../pikotools/src/convert/patternreplacer.h ./functions/ln.o: ../../pikotools/src/convert/double.h functions/functions.h -./functions/ln.o: functions/functionparser.h functions/account.h +./functions/ln.o: functions/functionparser.h core/dirs.h functions/account.h ./functions/ln.o: functions/adduser.h functions/cat.h functions/chmod.h ./functions/ln.o: functions/privchanger.h functions/chown.h ./functions/ln.o: functions/ckeditor.h functions/cp.h functions/default.h @@ -3859,9 +4081,9 @@ ./functions/ln.o: functions/mkdir.h functions/mv.h functions/nicedit.h ./functions/ln.o: functions/node.h functions/passwd.h functions/priv.h ./functions/ln.o: functions/pw.h functions/reload.h functions/rm.h -./functions/ln.o: functions/rmuser.h ./core/run.h functions/sort.h +./functions/ln.o: functions/rmuser.h functions/sort.h ./functions/ln.o: functions/specialdefault.h functions/stat.h -./functions/ln.o: functions/subject.h functions/template.h ./core/timezone.h +./functions/ln.o: functions/subject.h functions/template.h ./functions/ln.o: functions/tinymce.h functions/uname.h functions/upload.h ./functions/ln.o: functions/uptime.h functions/who.h functions/vim.h ./functions/ln.o: ../../pikotools/src/html/htmlparser.h @@ -3927,19 +4149,30 @@ ./functions/locale.o: templates/localefilter.h templates/htmltextstream.h ./functions/locale.o: templates/indexpatterns.h templates/patterns.h ./functions/locale.o: templates/changepatterns.h core/cur.h core/system.h -./functions/locale.o: core/sessionmanager.h -./functions/locale.o: ../../pikotools/src/html/htmlparser.h db/db.h -./functions/locale.o: db/dbbase.h db/dbconn.h db/dbtextstream.h -./functions/locale.o: core/textstream.h core/error.h models/user.h -./functions/locale.o: models/group.h core/dircontainer.h core/ugcontainer.h -./functions/locale.o: ./core/winixbase.h core/winixrequest.h -./functions/locale.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./functions/locale.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./functions/locale.o: core/slog.h ./core/cur.h ./core/request.h +./functions/locale.o: core/job.h ./core/basethread.h +./functions/locale.o: ./core/winixmodeldeprecated.h core/jobtask.h +./functions/locale.o: core/request.h ./core/cur.h ./core/request.h ./functions/locale.o: ./core/requesttypes.h ./core/error.h ./core/config.h ./functions/locale.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./functions/locale.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./functions/locale.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./functions/locale.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./functions/locale.o: db/dbtextstream.h core/textstream.h core/error.h +./functions/locale.o: models/user.h models/group.h core/dircontainer.h +./functions/locale.o: core/ugcontainer.h ./core/mountparser.h ./functions/locale.o: ./core/session.h ./core/rebus.h ./core/ipban.h -./functions/locale.o: ./core/mount.h templates/locale.h +./functions/locale.o: core/loadavg.h core/dirs.h core/dircontainer.h +./functions/locale.o: core/crypt.h core/run.h core/users.h core/groups.h +./functions/locale.o: core/ugcontainer.h core/image.h core/threadmanager.h +./functions/locale.o: models/winixmodelconnector.h notify/notify.h +./functions/locale.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/locale.o: templates/locale.h templates/patterns.h +./functions/locale.o: notify/notifythread.h core/basethread.h +./functions/locale.o: notify/templatesnotify.h core/users.h +./functions/locale.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./functions/locale.o: core/sessionmanager.h +./functions/locale.o: ../../pikotools/src/html/htmlparser.h +./functions/locale.o: core/winixrequest.h core/winixsystem.h core/slog.h ./functions/login.o: core/sessionmanager.h functions/login.h ./functions/login.o: functions/functionbase.h db/db.h db/dbbase.h db/dbconn.h ./functions/login.o: db/dbtextstream.h core/textstream.h @@ -3999,21 +4232,28 @@ ./functions/login.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./functions/login.o: ../../ezc/src/patternparser.h templates/htmltextstream.h ./functions/login.o: models/winixmodel.h models/winixmodelconnector.h -./functions/login.o: models/group.h core/dircontainer.h core/ugcontainer.h -./functions/login.o: ./core/winixbase.h core/request.h core/system.h -./functions/login.o: notify/notify.h core/winixmodeldeprecated.h -./functions/login.o: notify/notifypool.h templates/locale.h -./functions/login.o: templates/patterns.h notify/notifythread.h -./functions/login.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/login.o: core/winixrequest.h core/winixsystem.h -./functions/login.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/login.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/login.o: core/slog.h ./core/cur.h ./core/request.h -./functions/login.o: ./core/requesttypes.h models/item.h models/itemcontent.h -./functions/login.o: templates/htmltextstream.h ./core/error.h -./functions/login.o: ./core/config.h ./core/textstream.h models/winixmodel.h -./functions/login.o: ./core/header.h ./core/session.h ./core/rebus.h -./functions/login.o: ./core/ipban.h ./core/mount.h +./functions/login.o: models/group.h core/dircontainer.h ./core/winixbase.h +./functions/login.o: models/item.h models/itemcontent.h +./functions/login.o: templates/htmltextstream.h core/ugcontainer.h +./functions/login.o: core/request.h notify/notify.h +./functions/login.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/login.o: templates/locale.h templates/patterns.h +./functions/login.o: notify/notifythread.h core/basethread.h +./functions/login.o: notify/templatesnotify.h core/users.h core/ugcontainer.h +./functions/login.o: ./core/lastcontainer.h ./core/cur.h ./core/request.h +./functions/login.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./functions/login.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./functions/login.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./functions/login.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/login.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/login.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/login.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/login.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/login.o: core/loadavg.h core/dirs.h core/dircontainer.h +./functions/login.o: core/crypt.h core/run.h core/users.h core/groups.h +./functions/login.o: core/image.h core/threadmanager.h +./functions/login.o: models/winixmodelconnector.h core/timezones.h +./functions/login.o: core/timezone.h core/cur.h core/slog.h ./functions/logout.o: functions/logout.h functions/functionbase.h db/db.h ./functions/logout.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/logout.o: core/textstream.h @@ -4074,21 +4314,28 @@ ./functions/logout.o: ../../ezc/src/patternparser.h ./functions/logout.o: templates/htmltextstream.h models/winixmodel.h ./functions/logout.o: models/winixmodelconnector.h models/group.h -./functions/logout.o: core/dircontainer.h core/ugcontainer.h -./functions/logout.o: ./core/winixbase.h core/request.h core/system.h -./functions/logout.o: notify/notify.h core/winixmodeldeprecated.h -./functions/logout.o: notify/notifypool.h templates/locale.h -./functions/logout.o: templates/patterns.h notify/notifythread.h -./functions/logout.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/logout.o: core/winixrequest.h core/winixsystem.h -./functions/logout.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/logout.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/logout.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/logout.o: ./core/request.h ./core/requesttypes.h models/item.h +./functions/logout.o: core/dircontainer.h ./core/winixbase.h models/item.h ./functions/logout.o: models/itemcontent.h templates/htmltextstream.h -./functions/logout.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/logout.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/logout.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/logout.o: core/ugcontainer.h core/request.h notify/notify.h +./functions/logout.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/logout.o: templates/locale.h templates/patterns.h +./functions/logout.o: notify/notifythread.h core/basethread.h +./functions/logout.o: notify/templatesnotify.h core/users.h +./functions/logout.o: core/ugcontainer.h ./core/lastcontainer.h ./core/cur.h +./functions/logout.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./functions/logout.o: ./core/config.h ./core/textstream.h models/winixmodel.h +./functions/logout.o: ./core/header.h ./core/compress.h ./core/plugin.h +./functions/logout.o: ./core/pluginmsg.h ./core/plugindata.h +./functions/logout.o: ./core/winixmodeldeprecated.h ./core/mount.h +./functions/logout.o: ./core/mounts.h ./core/mountparser.h ./core/session.h +./functions/logout.o: ./core/rebus.h ./core/ipban.h core/winixrequest.h +./functions/logout.o: core/winixsystem.h core/system.h core/job.h +./functions/logout.o: ./core/basethread.h core/jobtask.h core/loadavg.h +./functions/logout.o: core/dirs.h core/dircontainer.h core/crypt.h core/run.h +./functions/logout.o: core/users.h core/groups.h core/image.h +./functions/logout.o: core/threadmanager.h models/winixmodelconnector.h +./functions/logout.o: core/timezones.h core/timezone.h core/cur.h +./functions/logout.o: core/sessionmanager.h core/slog.h ./functions/ls.o: functions/ls.h functions/functionbase.h db/db.h db/dbbase.h ./functions/ls.o: db/dbconn.h db/dbtextstream.h core/textstream.h ./functions/ls.o: ../../pikotools/src/textstream/textstream.h @@ -4145,20 +4392,27 @@ ./functions/ls.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./functions/ls.o: templates/htmltextstream.h models/winixmodel.h ./functions/ls.o: models/winixmodelconnector.h models/group.h -./functions/ls.o: core/dircontainer.h core/ugcontainer.h ./core/winixbase.h -./functions/ls.o: core/request.h core/system.h notify/notify.h +./functions/ls.o: core/dircontainer.h ./core/winixbase.h models/item.h +./functions/ls.o: models/itemcontent.h templates/htmltextstream.h +./functions/ls.o: core/ugcontainer.h core/request.h notify/notify.h ./functions/ls.o: core/winixmodeldeprecated.h notify/notifypool.h ./functions/ls.o: templates/locale.h templates/patterns.h ./functions/ls.o: notify/notifythread.h core/basethread.h -./functions/ls.o: notify/templatesnotify.h core/users.h core/winixrequest.h -./functions/ls.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./functions/ls.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./functions/ls.o: core/cur.h core/sessionmanager.h core/slog.h ./core/cur.h -./functions/ls.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/ls.o: models/itemcontent.h templates/htmltextstream.h -./functions/ls.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/ls.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/ls.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/ls.o: notify/templatesnotify.h core/users.h core/ugcontainer.h +./functions/ls.o: ./core/lastcontainer.h ./core/cur.h ./core/request.h +./functions/ls.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./functions/ls.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./functions/ls.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./functions/ls.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/ls.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/ls.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/ls.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/ls.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/ls.o: core/loadavg.h core/dirs.h core/dircontainer.h core/crypt.h +./functions/ls.o: core/run.h core/users.h core/groups.h core/image.h +./functions/ls.o: core/threadmanager.h models/winixmodelconnector.h +./functions/ls.o: core/timezones.h core/timezone.h core/cur.h +./functions/ls.o: core/sessionmanager.h core/slog.h ./functions/man.o: functions/man.h functions/functionbase.h db/db.h ./functions/man.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/man.o: core/textstream.h @@ -4216,21 +4470,28 @@ ./functions/man.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./functions/man.o: ../../ezc/src/patternparser.h templates/htmltextstream.h ./functions/man.o: models/winixmodel.h models/winixmodelconnector.h -./functions/man.o: models/group.h core/dircontainer.h core/ugcontainer.h -./functions/man.o: ./core/winixbase.h core/request.h core/system.h -./functions/man.o: notify/notify.h core/winixmodeldeprecated.h +./functions/man.o: models/group.h core/dircontainer.h ./core/winixbase.h +./functions/man.o: models/item.h models/itemcontent.h +./functions/man.o: templates/htmltextstream.h core/ugcontainer.h +./functions/man.o: core/request.h notify/notify.h core/winixmodeldeprecated.h ./functions/man.o: notify/notifypool.h templates/locale.h ./functions/man.o: templates/patterns.h notify/notifythread.h ./functions/man.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/man.o: core/winixrequest.h core/winixsystem.h -./functions/man.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/man.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/man.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/man.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/man.o: models/itemcontent.h templates/htmltextstream.h -./functions/man.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/man.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/man.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/man.o: core/ugcontainer.h ./core/lastcontainer.h ./core/cur.h +./functions/man.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./functions/man.o: ./core/config.h ./core/textstream.h models/winixmodel.h +./functions/man.o: ./core/header.h ./core/compress.h ./core/plugin.h +./functions/man.o: ./core/pluginmsg.h ./core/plugindata.h +./functions/man.o: ./core/winixmodeldeprecated.h ./core/mount.h +./functions/man.o: ./core/mounts.h ./core/mountparser.h ./core/session.h +./functions/man.o: ./core/rebus.h ./core/ipban.h core/winixrequest.h +./functions/man.o: core/winixsystem.h core/system.h core/job.h +./functions/man.o: ./core/basethread.h core/jobtask.h core/loadavg.h +./functions/man.o: core/dirs.h core/dircontainer.h core/crypt.h core/run.h +./functions/man.o: core/users.h core/groups.h core/image.h +./functions/man.o: core/threadmanager.h models/winixmodelconnector.h +./functions/man.o: core/timezones.h core/timezone.h core/cur.h +./functions/man.o: core/sessionmanager.h core/slog.h ./functions/meta.o: functions/meta.h functions/functionbase.h db/db.h ./functions/meta.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/meta.o: core/textstream.h @@ -4288,21 +4549,29 @@ ./functions/meta.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./functions/meta.o: ../../ezc/src/patternparser.h templates/htmltextstream.h ./functions/meta.o: models/winixmodel.h models/winixmodelconnector.h -./functions/meta.o: models/group.h core/dircontainer.h core/ugcontainer.h -./functions/meta.o: ./core/winixbase.h core/request.h core/system.h -./functions/meta.o: notify/notify.h core/winixmodeldeprecated.h -./functions/meta.o: notify/notifypool.h templates/locale.h -./functions/meta.o: templates/patterns.h notify/notifythread.h -./functions/meta.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/meta.o: core/winixrequest.h core/winixsystem.h -./functions/meta.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/meta.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/meta.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/meta.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/meta.o: models/itemcontent.h templates/htmltextstream.h -./functions/meta.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/meta.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/meta.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/meta.o: models/group.h core/dircontainer.h ./core/winixbase.h +./functions/meta.o: models/item.h models/itemcontent.h +./functions/meta.o: templates/htmltextstream.h core/ugcontainer.h +./functions/meta.o: core/request.h notify/notify.h +./functions/meta.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/meta.o: templates/locale.h templates/patterns.h +./functions/meta.o: notify/notifythread.h core/basethread.h +./functions/meta.o: notify/templatesnotify.h core/users.h core/ugcontainer.h +./functions/meta.o: ./core/lastcontainer.h ./core/cur.h ./core/request.h +./functions/meta.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./functions/meta.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./functions/meta.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./functions/meta.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/meta.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/meta.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/meta.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/meta.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/meta.o: core/loadavg.h core/dirs.h core/dircontainer.h +./functions/meta.o: core/crypt.h core/run.h core/users.h core/groups.h +./functions/meta.o: core/image.h core/threadmanager.h +./functions/meta.o: models/winixmodelconnector.h core/timezones.h +./functions/meta.o: core/timezone.h core/cur.h core/sessionmanager.h +./functions/meta.o: core/slog.h ./functions/mkdir.o: functions/mkdir.h functions/functionbase.h db/db.h ./functions/mkdir.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/mkdir.o: core/textstream.h @@ -4362,21 +4631,29 @@ ./functions/mkdir.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./functions/mkdir.o: ../../ezc/src/patternparser.h templates/htmltextstream.h ./functions/mkdir.o: models/winixmodel.h models/winixmodelconnector.h -./functions/mkdir.o: models/group.h core/dircontainer.h core/ugcontainer.h -./functions/mkdir.o: ./core/winixbase.h core/request.h core/system.h -./functions/mkdir.o: notify/notify.h core/winixmodeldeprecated.h -./functions/mkdir.o: notify/notifypool.h templates/locale.h -./functions/mkdir.o: templates/patterns.h notify/notifythread.h -./functions/mkdir.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/mkdir.o: core/winixrequest.h core/winixsystem.h -./functions/mkdir.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/mkdir.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/mkdir.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/mkdir.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/mkdir.o: models/itemcontent.h templates/htmltextstream.h -./functions/mkdir.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/mkdir.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/mkdir.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/mkdir.o: models/group.h core/dircontainer.h ./core/winixbase.h +./functions/mkdir.o: models/item.h models/itemcontent.h +./functions/mkdir.o: templates/htmltextstream.h core/ugcontainer.h +./functions/mkdir.o: core/request.h notify/notify.h +./functions/mkdir.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/mkdir.o: templates/locale.h templates/patterns.h +./functions/mkdir.o: notify/notifythread.h core/basethread.h +./functions/mkdir.o: notify/templatesnotify.h core/users.h core/ugcontainer.h +./functions/mkdir.o: ./core/lastcontainer.h ./core/cur.h ./core/request.h +./functions/mkdir.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./functions/mkdir.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./functions/mkdir.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./functions/mkdir.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/mkdir.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/mkdir.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/mkdir.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/mkdir.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/mkdir.o: core/loadavg.h core/dirs.h core/dircontainer.h +./functions/mkdir.o: core/crypt.h core/run.h core/users.h core/groups.h +./functions/mkdir.o: core/image.h core/threadmanager.h +./functions/mkdir.o: models/winixmodelconnector.h core/timezones.h +./functions/mkdir.o: core/timezone.h core/cur.h core/sessionmanager.h +./functions/mkdir.o: core/slog.h ./functions/mount.o: ./core/mount.h ../../ezc/src/functions.h ./functions/mount.o: ../../pikotools/src/utf8/utf8.h ./functions/mount.o: ../../pikotools/src/textstream/stream.h @@ -4439,20 +4716,27 @@ ./functions/mv.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./functions/mv.o: templates/htmltextstream.h models/winixmodel.h ./functions/mv.o: models/winixmodelconnector.h models/group.h -./functions/mv.o: core/dircontainer.h core/ugcontainer.h ./core/winixbase.h -./functions/mv.o: core/request.h core/system.h notify/notify.h +./functions/mv.o: core/dircontainer.h ./core/winixbase.h models/item.h +./functions/mv.o: models/itemcontent.h templates/htmltextstream.h +./functions/mv.o: core/ugcontainer.h core/request.h notify/notify.h ./functions/mv.o: core/winixmodeldeprecated.h notify/notifypool.h ./functions/mv.o: templates/locale.h templates/patterns.h ./functions/mv.o: notify/notifythread.h core/basethread.h -./functions/mv.o: notify/templatesnotify.h core/users.h core/winixrequest.h -./functions/mv.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./functions/mv.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./functions/mv.o: core/cur.h core/sessionmanager.h core/slog.h ./core/cur.h -./functions/mv.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/mv.o: models/itemcontent.h templates/htmltextstream.h -./functions/mv.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/mv.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/mv.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/mv.o: notify/templatesnotify.h core/users.h core/ugcontainer.h +./functions/mv.o: ./core/lastcontainer.h ./core/cur.h ./core/request.h +./functions/mv.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./functions/mv.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./functions/mv.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./functions/mv.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/mv.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/mv.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/mv.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/mv.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/mv.o: core/loadavg.h core/dirs.h core/dircontainer.h core/crypt.h +./functions/mv.o: core/run.h core/users.h core/groups.h core/image.h +./functions/mv.o: core/threadmanager.h models/winixmodelconnector.h +./functions/mv.o: core/timezones.h core/timezone.h core/cur.h +./functions/mv.o: core/sessionmanager.h core/slog.h ./functions/nicedit.o: functions/nicedit.h functions/functionbase.h db/db.h ./functions/nicedit.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/nicedit.o: core/textstream.h @@ -4517,21 +4801,28 @@ ./functions/nicedit.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./functions/nicedit.o: templates/htmltextstream.h models/winixmodel.h ./functions/nicedit.o: models/winixmodelconnector.h models/group.h -./functions/nicedit.o: core/dircontainer.h core/ugcontainer.h -./functions/nicedit.o: ./core/winixbase.h core/request.h core/system.h -./functions/nicedit.o: notify/notify.h core/winixmodeldeprecated.h -./functions/nicedit.o: notify/notifypool.h templates/locale.h -./functions/nicedit.o: templates/patterns.h notify/notifythread.h -./functions/nicedit.o: core/basethread.h notify/templatesnotify.h -./functions/nicedit.o: core/users.h core/winixrequest.h core/winixsystem.h -./functions/nicedit.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/nicedit.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/nicedit.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/nicedit.o: ./core/request.h ./core/requesttypes.h models/item.h +./functions/nicedit.o: core/dircontainer.h ./core/winixbase.h models/item.h ./functions/nicedit.o: models/itemcontent.h templates/htmltextstream.h -./functions/nicedit.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/nicedit.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/nicedit.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/nicedit.o: core/ugcontainer.h core/request.h notify/notify.h +./functions/nicedit.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/nicedit.o: templates/locale.h templates/patterns.h +./functions/nicedit.o: notify/notifythread.h core/basethread.h +./functions/nicedit.o: notify/templatesnotify.h core/users.h +./functions/nicedit.o: core/ugcontainer.h ./core/lastcontainer.h ./core/cur.h +./functions/nicedit.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./functions/nicedit.o: ./core/config.h ./core/textstream.h +./functions/nicedit.o: models/winixmodel.h ./core/header.h ./core/compress.h +./functions/nicedit.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h +./functions/nicedit.o: ./core/winixmodeldeprecated.h ./core/mount.h +./functions/nicedit.o: ./core/mounts.h ./core/mountparser.h ./core/session.h +./functions/nicedit.o: ./core/rebus.h ./core/ipban.h core/winixrequest.h +./functions/nicedit.o: core/winixsystem.h core/system.h core/job.h +./functions/nicedit.o: ./core/basethread.h core/jobtask.h core/loadavg.h +./functions/nicedit.o: core/dirs.h core/dircontainer.h core/crypt.h +./functions/nicedit.o: core/run.h core/users.h core/groups.h core/image.h +./functions/nicedit.o: core/threadmanager.h models/winixmodelconnector.h +./functions/nicedit.o: core/timezones.h core/timezone.h core/cur.h +./functions/nicedit.o: core/sessionmanager.h core/slog.h ./functions/node.o: functions/node.h functions/functionbase.h db/db.h ./functions/node.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/node.o: core/textstream.h @@ -4589,21 +4880,29 @@ ./functions/node.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./functions/node.o: ../../ezc/src/patternparser.h templates/htmltextstream.h ./functions/node.o: models/winixmodel.h models/winixmodelconnector.h -./functions/node.o: models/group.h core/dircontainer.h core/ugcontainer.h -./functions/node.o: ./core/winixbase.h core/request.h core/system.h -./functions/node.o: notify/notify.h core/winixmodeldeprecated.h -./functions/node.o: notify/notifypool.h templates/locale.h -./functions/node.o: templates/patterns.h notify/notifythread.h -./functions/node.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/node.o: core/winixrequest.h core/winixsystem.h -./functions/node.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/node.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/node.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/node.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/node.o: models/itemcontent.h templates/htmltextstream.h -./functions/node.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/node.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/node.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/node.o: models/group.h core/dircontainer.h ./core/winixbase.h +./functions/node.o: models/item.h models/itemcontent.h +./functions/node.o: templates/htmltextstream.h core/ugcontainer.h +./functions/node.o: core/request.h notify/notify.h +./functions/node.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/node.o: templates/locale.h templates/patterns.h +./functions/node.o: notify/notifythread.h core/basethread.h +./functions/node.o: notify/templatesnotify.h core/users.h core/ugcontainer.h +./functions/node.o: ./core/lastcontainer.h ./core/cur.h ./core/request.h +./functions/node.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./functions/node.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./functions/node.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./functions/node.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/node.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/node.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/node.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/node.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/node.o: core/loadavg.h core/dirs.h core/dircontainer.h +./functions/node.o: core/crypt.h core/run.h core/users.h core/groups.h +./functions/node.o: core/image.h core/threadmanager.h +./functions/node.o: models/winixmodelconnector.h core/timezones.h +./functions/node.o: core/timezone.h core/cur.h core/sessionmanager.h +./functions/node.o: core/slog.h ./functions/passwd.o: functions/passwd.h functions/functionbase.h db/db.h ./functions/passwd.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/passwd.o: core/textstream.h @@ -4664,22 +4963,29 @@ ./functions/passwd.o: ../../ezc/src/patternparser.h ./functions/passwd.o: templates/htmltextstream.h models/winixmodel.h ./functions/passwd.o: models/winixmodelconnector.h models/group.h -./functions/passwd.o: core/dircontainer.h core/ugcontainer.h -./functions/passwd.o: ./core/winixbase.h core/request.h core/system.h -./functions/passwd.o: notify/notify.h core/winixmodeldeprecated.h -./functions/passwd.o: notify/notifypool.h templates/locale.h -./functions/passwd.o: templates/patterns.h notify/notifythread.h -./functions/passwd.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/passwd.o: core/winixrequest.h core/winixsystem.h -./functions/passwd.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/passwd.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/passwd.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/passwd.o: ./core/request.h ./core/requesttypes.h models/item.h +./functions/passwd.o: core/dircontainer.h ./core/winixbase.h models/item.h ./functions/passwd.o: models/itemcontent.h templates/htmltextstream.h -./functions/passwd.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/passwd.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/passwd.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./functions/passwd.o: functions/functions.h functions/functionparser.h +./functions/passwd.o: core/ugcontainer.h core/request.h notify/notify.h +./functions/passwd.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/passwd.o: templates/locale.h templates/patterns.h +./functions/passwd.o: notify/notifythread.h core/basethread.h +./functions/passwd.o: notify/templatesnotify.h core/users.h +./functions/passwd.o: core/ugcontainer.h ./core/lastcontainer.h ./core/cur.h +./functions/passwd.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./functions/passwd.o: ./core/config.h ./core/textstream.h models/winixmodel.h +./functions/passwd.o: ./core/header.h ./core/compress.h ./core/plugin.h +./functions/passwd.o: ./core/pluginmsg.h ./core/plugindata.h +./functions/passwd.o: ./core/winixmodeldeprecated.h ./core/mount.h +./functions/passwd.o: ./core/mounts.h ./core/mountparser.h ./core/session.h +./functions/passwd.o: ./core/rebus.h ./core/ipban.h core/winixrequest.h +./functions/passwd.o: core/winixsystem.h core/system.h core/job.h +./functions/passwd.o: ./core/basethread.h core/jobtask.h core/loadavg.h +./functions/passwd.o: core/dirs.h core/dircontainer.h core/crypt.h core/run.h +./functions/passwd.o: core/users.h core/groups.h core/image.h +./functions/passwd.o: core/threadmanager.h models/winixmodelconnector.h +./functions/passwd.o: core/timezones.h core/timezone.h core/cur.h +./functions/passwd.o: core/sessionmanager.h core/slog.h functions/functions.h +./functions/passwd.o: functions/functionparser.h core/dirs.h ./functions/passwd.o: functions/account.h functions/adduser.h functions/cat.h ./functions/passwd.o: functions/chmod.h functions/privchanger.h ./functions/passwd.o: functions/chown.h functions/ckeditor.h functions/cp.h @@ -4691,12 +4997,12 @@ ./functions/passwd.o: functions/mkdir.h functions/mv.h functions/nicedit.h ./functions/passwd.o: functions/node.h functions/priv.h functions/pw.h ./functions/passwd.o: functions/reload.h functions/rm.h functions/rmuser.h -./functions/passwd.o: ./core/run.h functions/sort.h -./functions/passwd.o: functions/specialdefault.h functions/stat.h -./functions/passwd.o: functions/subject.h functions/template.h -./functions/passwd.o: ./core/timezone.h functions/tinymce.h functions/uname.h -./functions/passwd.o: functions/upload.h functions/uptime.h functions/who.h -./functions/passwd.o: functions/vim.h ../../pikotools/src/html/htmlparser.h +./functions/passwd.o: functions/sort.h functions/specialdefault.h +./functions/passwd.o: functions/stat.h functions/subject.h +./functions/passwd.o: functions/template.h functions/tinymce.h +./functions/passwd.o: functions/uname.h functions/upload.h functions/uptime.h +./functions/passwd.o: functions/who.h functions/vim.h +./functions/passwd.o: ../../pikotools/src/html/htmlparser.h ./functions/priv.o: functions/priv.h functions/functionbase.h db/db.h ./functions/priv.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/priv.o: core/textstream.h @@ -4754,44 +5060,51 @@ ./functions/priv.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./functions/priv.o: ../../ezc/src/patternparser.h templates/htmltextstream.h ./functions/priv.o: models/winixmodel.h models/winixmodelconnector.h -./functions/priv.o: models/group.h core/dircontainer.h core/ugcontainer.h -./functions/priv.o: ./core/winixbase.h core/request.h core/system.h -./functions/priv.o: notify/notify.h core/winixmodeldeprecated.h -./functions/priv.o: notify/notifypool.h templates/locale.h -./functions/priv.o: templates/patterns.h notify/notifythread.h -./functions/priv.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/priv.o: core/winixrequest.h core/winixsystem.h -./functions/priv.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/priv.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/priv.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/priv.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/priv.o: models/itemcontent.h templates/htmltextstream.h -./functions/priv.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/priv.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/priv.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./functions/priv.o: functions/privchanger.h +./functions/priv.o: models/group.h core/dircontainer.h ./core/winixbase.h +./functions/priv.o: models/item.h models/itemcontent.h +./functions/priv.o: templates/htmltextstream.h core/ugcontainer.h +./functions/priv.o: core/request.h notify/notify.h +./functions/priv.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/priv.o: templates/locale.h templates/patterns.h +./functions/priv.o: notify/notifythread.h core/basethread.h +./functions/priv.o: notify/templatesnotify.h core/users.h core/ugcontainer.h +./functions/priv.o: ./core/lastcontainer.h ./core/cur.h ./core/request.h +./functions/priv.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./functions/priv.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./functions/priv.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./functions/priv.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/priv.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/priv.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/priv.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/priv.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/priv.o: core/loadavg.h core/dirs.h core/dircontainer.h +./functions/priv.o: core/crypt.h core/run.h core/users.h core/groups.h +./functions/priv.o: core/image.h core/threadmanager.h +./functions/priv.o: models/winixmodelconnector.h core/timezones.h +./functions/priv.o: core/timezone.h core/cur.h core/sessionmanager.h +./functions/priv.o: core/slog.h functions/privchanger.h ./functions/privchanger.o: functions/privchanger.h ./functions/privchanger.o: core/winixmodeldeprecated.h core/request.h -./functions/privchanger.o: core/system.h db/db.h db/dbbase.h db/dbconn.h -./functions/privchanger.o: db/dbtextstream.h core/textstream.h -./functions/privchanger.o: ../../pikotools/src/textstream/textstream.h -./functions/privchanger.o: ../../pikotools/src/textstream/stream.h -./functions/privchanger.o: ../../pikotools/src/space/space.h -./functions/privchanger.o: ../../pikotools/src/date/date.h -./functions/privchanger.o: ../../pikotools/src/convert/inttostr.h -./functions/privchanger.o: ../../pikotools/src/membuffer/membuffer.h -./functions/privchanger.o: ../../pikotools/src/textstream/types.h -./functions/privchanger.o: ../../pikotools/src/utf8/utf8.h -./functions/privchanger.o: ../../pikotools/src/textstream/stream.h -./functions/privchanger.o: ../../pikotools/src/utf8/utf8_templates.h -./functions/privchanger.o: ../../pikotools/src/utf8/utf8_private.h -./functions/privchanger.o: ../../pikotools/src/utf8/utf8_stream.h +./functions/privchanger.o: core/system.h core/job.h ./core/basethread.h +./functions/privchanger.o: ./core/synchro.h ./core/winixmodeldeprecated.h ./functions/privchanger.o: core/winixbase.h core/config.h ./functions/privchanger.o: ../../pikotools/src/space/spaceparser.h ./functions/privchanger.o: ../../pikotools/src/space/space.h ./functions/privchanger.o: ../../pikotools/src/textstream/types.h +./functions/privchanger.o: ../../pikotools/src/convert/inttostr.h +./functions/privchanger.o: ../../pikotools/src/utf8/utf8.h +./functions/privchanger.o: ../../pikotools/src/textstream/stream.h +./functions/privchanger.o: ../../pikotools/src/utf8/utf8_templates.h +./functions/privchanger.o: ../../pikotools/src/utf8/utf8_private.h ./functions/privchanger.o: ../../pikotools/src/convert/baseparser.h -./functions/privchanger.o: core/log.h core/logmanipulators.h +./functions/privchanger.o: ../../pikotools/src/textstream/textstream.h +./functions/privchanger.o: ../../pikotools/src/textstream/stream.h +./functions/privchanger.o: ../../pikotools/src/space/space.h +./functions/privchanger.o: ../../pikotools/src/date/date.h +./functions/privchanger.o: ../../pikotools/src/membuffer/membuffer.h +./functions/privchanger.o: ../../pikotools/src/textstream/types.h +./functions/privchanger.o: ../../pikotools/src/utf8/utf8_stream.h core/log.h +./functions/privchanger.o: core/logmanipulators.h ./functions/privchanger.o: ../../pikotools/src/log/log.h ./functions/privchanger.o: ../../pikotools/src/log/filelog.h ./functions/privchanger.o: ../../morm/src/morm.h ../../morm/src/version.h @@ -4824,7 +5137,10 @@ ./functions/privchanger.o: ../../morm/src/postgresqlqueryresult.h ./functions/privchanger.o: ../../morm/src/transaction.h core/log.h ./functions/privchanger.o: core/synchro.h core/filelog.h core/lock.h -./functions/privchanger.o: ./core/synchro.h core/error.h models/user.h +./functions/privchanger.o: core/jobtask.h ./core/cur.h ./core/request.h +./functions/privchanger.o: ./core/requesttypes.h models/item.h +./functions/privchanger.o: models/winixmodel.h models/winixmodelconnector.h +./functions/privchanger.o: models/itemcontent.h templates/htmltextstream.h ./functions/privchanger.o: templates/misc.h templates/localefilter.h ./functions/privchanger.o: templates/locale.h ./functions/privchanger.o: ../../pikotools/src/convert/patternreplacer.h @@ -4838,10 +5154,27 @@ ./functions/privchanger.o: ../../ezc/src/expressionparser.h ./functions/privchanger.o: ../../ezc/src/models.h ./functions/privchanger.o: ../../ezc/src/patternparser.h -./functions/privchanger.o: templates/htmltextstream.h models/winixmodel.h -./functions/privchanger.o: models/winixmodelconnector.h models/group.h -./functions/privchanger.o: core/dircontainer.h core/ugcontainer.h -./functions/privchanger.o: ./core/winixbase.h +./functions/privchanger.o: templates/htmltextstream.h ./core/error.h +./functions/privchanger.o: ./core/config.h ./core/textstream.h +./functions/privchanger.o: models/winixmodel.h ./core/header.h +./functions/privchanger.o: ./core/compress.h ./core/winixbase.h +./functions/privchanger.o: ./core/plugin.h ./core/pluginmsg.h +./functions/privchanger.o: ./core/plugindata.h ./core/mount.h ./core/mounts.h +./functions/privchanger.o: db/db.h db/dbbase.h db/dbconn.h db/dbtextstream.h +./functions/privchanger.o: core/textstream.h core/error.h models/user.h +./functions/privchanger.o: models/group.h core/dircontainer.h +./functions/privchanger.o: core/ugcontainer.h ./core/mountparser.h +./functions/privchanger.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/privchanger.o: core/loadavg.h core/dirs.h core/dircontainer.h +./functions/privchanger.o: core/crypt.h core/run.h core/users.h core/groups.h +./functions/privchanger.o: core/ugcontainer.h core/image.h +./functions/privchanger.o: core/threadmanager.h models/winixmodelconnector.h +./functions/privchanger.o: notify/notify.h notify/notifypool.h +./functions/privchanger.o: templates/locale.h templates/patterns.h +./functions/privchanger.o: notify/notifythread.h core/basethread.h +./functions/privchanger.o: notify/templatesnotify.h core/users.h +./functions/privchanger.o: ./core/lastcontainer.h core/timezones.h +./functions/privchanger.o: core/timezone.h ./functions/pw.o: functions/pw.h functions/functionbase.h db/db.h db/dbbase.h ./functions/pw.o: db/dbconn.h db/dbtextstream.h core/textstream.h ./functions/pw.o: ../../pikotools/src/textstream/textstream.h @@ -4898,20 +5231,27 @@ ./functions/pw.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./functions/pw.o: templates/htmltextstream.h models/winixmodel.h ./functions/pw.o: models/winixmodelconnector.h models/group.h -./functions/pw.o: core/dircontainer.h core/ugcontainer.h ./core/winixbase.h -./functions/pw.o: core/request.h core/system.h notify/notify.h +./functions/pw.o: core/dircontainer.h ./core/winixbase.h models/item.h +./functions/pw.o: models/itemcontent.h templates/htmltextstream.h +./functions/pw.o: core/ugcontainer.h core/request.h notify/notify.h ./functions/pw.o: core/winixmodeldeprecated.h notify/notifypool.h ./functions/pw.o: templates/locale.h templates/patterns.h ./functions/pw.o: notify/notifythread.h core/basethread.h -./functions/pw.o: notify/templatesnotify.h core/users.h core/winixrequest.h -./functions/pw.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./functions/pw.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./functions/pw.o: core/cur.h core/sessionmanager.h core/slog.h ./core/cur.h -./functions/pw.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/pw.o: models/itemcontent.h templates/htmltextstream.h -./functions/pw.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/pw.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/pw.o: ./core/rebus.h ./core/ipban.h ./core/mount.h core/misc.h +./functions/pw.o: notify/templatesnotify.h core/users.h core/ugcontainer.h +./functions/pw.o: ./core/lastcontainer.h ./core/cur.h ./core/request.h +./functions/pw.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./functions/pw.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./functions/pw.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./functions/pw.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/pw.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/pw.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/pw.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/pw.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/pw.o: core/loadavg.h core/dirs.h core/dircontainer.h core/crypt.h +./functions/pw.o: core/run.h core/users.h core/groups.h core/image.h +./functions/pw.o: core/threadmanager.h models/winixmodelconnector.h +./functions/pw.o: core/timezones.h core/timezone.h core/cur.h +./functions/pw.o: core/sessionmanager.h core/slog.h core/misc.h ./functions/pw.o: core/winix_const.h ../../pikotools/src/convert/convert.h ./functions/pw.o: ../../pikotools/src/convert/inttostr.h ./functions/pw.o: ../../pikotools/src/convert/patternreplacer.h @@ -4976,24 +5316,30 @@ ./functions/reload.o: ../../ezc/src/patternparser.h ./functions/reload.o: templates/htmltextstream.h models/winixmodel.h ./functions/reload.o: models/winixmodelconnector.h models/group.h -./functions/reload.o: core/dircontainer.h core/ugcontainer.h -./functions/reload.o: ./core/winixbase.h core/request.h core/system.h -./functions/reload.o: notify/notify.h core/winixmodeldeprecated.h -./functions/reload.o: notify/notifypool.h templates/locale.h -./functions/reload.o: templates/patterns.h notify/notifythread.h -./functions/reload.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/reload.o: core/winixrequest.h core/winixsystem.h -./functions/reload.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/reload.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/reload.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/reload.o: ./core/request.h ./core/requesttypes.h models/item.h +./functions/reload.o: core/dircontainer.h ./core/winixbase.h models/item.h ./functions/reload.o: models/itemcontent.h templates/htmltextstream.h -./functions/reload.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/reload.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/reload.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./functions/reload.o: templates/templates.h templates/patterncacher.h -./functions/reload.o: templates/indexpatterns.h templates/patterns.h -./functions/reload.o: templates/changepatterns.h +./functions/reload.o: core/ugcontainer.h core/request.h notify/notify.h +./functions/reload.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/reload.o: templates/locale.h templates/patterns.h +./functions/reload.o: notify/notifythread.h core/basethread.h +./functions/reload.o: notify/templatesnotify.h core/users.h +./functions/reload.o: core/ugcontainer.h ./core/lastcontainer.h ./core/cur.h +./functions/reload.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./functions/reload.o: ./core/config.h ./core/textstream.h models/winixmodel.h +./functions/reload.o: ./core/header.h ./core/compress.h ./core/plugin.h +./functions/reload.o: ./core/pluginmsg.h ./core/plugindata.h +./functions/reload.o: ./core/winixmodeldeprecated.h ./core/mount.h +./functions/reload.o: ./core/mounts.h ./core/mountparser.h ./core/session.h +./functions/reload.o: ./core/rebus.h ./core/ipban.h core/winixrequest.h +./functions/reload.o: core/winixsystem.h core/system.h core/job.h +./functions/reload.o: ./core/basethread.h core/jobtask.h core/loadavg.h +./functions/reload.o: core/dirs.h core/dircontainer.h core/crypt.h core/run.h +./functions/reload.o: core/users.h core/groups.h core/image.h +./functions/reload.o: core/threadmanager.h models/winixmodelconnector.h +./functions/reload.o: core/timezones.h core/timezone.h core/cur.h +./functions/reload.o: core/sessionmanager.h core/slog.h templates/templates.h +./functions/reload.o: templates/patterncacher.h templates/indexpatterns.h +./functions/reload.o: templates/patterns.h templates/changepatterns.h ./functions/reload.o: ../../pikotools/src/html/htmlparser.h ./functions/rm.o: functions/rm.h functions/functionbase.h db/db.h db/dbbase.h ./functions/rm.o: db/dbconn.h db/dbtextstream.h core/textstream.h @@ -5051,20 +5397,27 @@ ./functions/rm.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./functions/rm.o: templates/htmltextstream.h models/winixmodel.h ./functions/rm.o: models/winixmodelconnector.h models/group.h -./functions/rm.o: core/dircontainer.h core/ugcontainer.h ./core/winixbase.h -./functions/rm.o: core/request.h core/system.h notify/notify.h +./functions/rm.o: core/dircontainer.h ./core/winixbase.h models/item.h +./functions/rm.o: models/itemcontent.h templates/htmltextstream.h +./functions/rm.o: core/ugcontainer.h core/request.h notify/notify.h ./functions/rm.o: core/winixmodeldeprecated.h notify/notifypool.h ./functions/rm.o: templates/locale.h templates/patterns.h ./functions/rm.o: notify/notifythread.h core/basethread.h -./functions/rm.o: notify/templatesnotify.h core/users.h core/winixrequest.h -./functions/rm.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./functions/rm.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./functions/rm.o: core/cur.h core/sessionmanager.h core/slog.h ./core/cur.h -./functions/rm.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/rm.o: models/itemcontent.h templates/htmltextstream.h -./functions/rm.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/rm.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/rm.o: ./core/rebus.h ./core/ipban.h ./core/mount.h core/misc.h +./functions/rm.o: notify/templatesnotify.h core/users.h core/ugcontainer.h +./functions/rm.o: ./core/lastcontainer.h ./core/cur.h ./core/request.h +./functions/rm.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./functions/rm.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./functions/rm.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./functions/rm.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/rm.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/rm.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/rm.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/rm.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/rm.o: core/loadavg.h core/dirs.h core/dircontainer.h core/crypt.h +./functions/rm.o: core/run.h core/users.h core/groups.h core/image.h +./functions/rm.o: core/threadmanager.h models/winixmodelconnector.h +./functions/rm.o: core/timezones.h core/timezone.h core/cur.h +./functions/rm.o: core/sessionmanager.h core/slog.h core/misc.h ./functions/rm.o: core/winix_const.h ../../pikotools/src/convert/convert.h ./functions/rm.o: ../../pikotools/src/convert/inttostr.h ./functions/rm.o: ../../pikotools/src/convert/patternreplacer.h @@ -5132,45 +5485,52 @@ ./functions/rmuser.o: ../../ezc/src/patternparser.h ./functions/rmuser.o: templates/htmltextstream.h models/winixmodel.h ./functions/rmuser.o: models/winixmodelconnector.h models/group.h -./functions/rmuser.o: core/dircontainer.h core/ugcontainer.h -./functions/rmuser.o: ./core/winixbase.h core/request.h core/system.h -./functions/rmuser.o: notify/notify.h core/winixmodeldeprecated.h -./functions/rmuser.o: notify/notifypool.h templates/locale.h -./functions/rmuser.o: templates/patterns.h notify/notifythread.h -./functions/rmuser.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/rmuser.o: core/winixrequest.h core/winixsystem.h -./functions/rmuser.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/rmuser.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/rmuser.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/rmuser.o: ./core/request.h ./core/requesttypes.h models/item.h +./functions/rmuser.o: core/dircontainer.h ./core/winixbase.h models/item.h ./functions/rmuser.o: models/itemcontent.h templates/htmltextstream.h -./functions/rmuser.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/rmuser.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/rmuser.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./functions/rmuser.o: core/misc.h core/winix_const.h +./functions/rmuser.o: core/ugcontainer.h core/request.h notify/notify.h +./functions/rmuser.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/rmuser.o: templates/locale.h templates/patterns.h +./functions/rmuser.o: notify/notifythread.h core/basethread.h +./functions/rmuser.o: notify/templatesnotify.h core/users.h +./functions/rmuser.o: core/ugcontainer.h ./core/lastcontainer.h ./core/cur.h +./functions/rmuser.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./functions/rmuser.o: ./core/config.h ./core/textstream.h models/winixmodel.h +./functions/rmuser.o: ./core/header.h ./core/compress.h ./core/plugin.h +./functions/rmuser.o: ./core/pluginmsg.h ./core/plugindata.h +./functions/rmuser.o: ./core/winixmodeldeprecated.h ./core/mount.h +./functions/rmuser.o: ./core/mounts.h ./core/mountparser.h ./core/session.h +./functions/rmuser.o: ./core/rebus.h ./core/ipban.h core/winixrequest.h +./functions/rmuser.o: core/winixsystem.h core/system.h core/job.h +./functions/rmuser.o: ./core/basethread.h core/jobtask.h core/loadavg.h +./functions/rmuser.o: core/dirs.h core/dircontainer.h core/crypt.h core/run.h +./functions/rmuser.o: core/users.h core/groups.h core/image.h +./functions/rmuser.o: core/threadmanager.h models/winixmodelconnector.h +./functions/rmuser.o: core/timezones.h core/timezone.h core/cur.h +./functions/rmuser.o: core/sessionmanager.h core/slog.h core/misc.h +./functions/rmuser.o: core/winix_const.h ./functions/rmuser.o: ../../pikotools/src/convert/convert.h ./functions/rmuser.o: ../../pikotools/src/convert/inttostr.h ./functions/rmuser.o: ../../pikotools/src/convert/patternreplacer.h ./functions/rmuser.o: ../../pikotools/src/convert/double.h core/plugin.h ./functions/rmuser.o: functions/functions.h functions/functionparser.h -./functions/rmuser.o: functions/account.h functions/adduser.h functions/cat.h -./functions/rmuser.o: functions/chmod.h functions/privchanger.h -./functions/rmuser.o: functions/chown.h functions/ckeditor.h functions/cp.h -./functions/rmuser.o: functions/default.h functions/download.h -./functions/rmuser.o: functions/emacs.h functions/env.h models/userwrapper.h -./functions/rmuser.o: models/user.h functions/imgcrop.h functions/last.h -./functions/rmuser.o: functions/login.h functions/logout.h functions/ln.h -./functions/rmuser.o: functions/ls.h functions/man.h functions/meta.h -./functions/rmuser.o: functions/mkdir.h functions/mv.h functions/nicedit.h -./functions/rmuser.o: functions/node.h functions/passwd.h functions/priv.h -./functions/rmuser.o: functions/pw.h functions/reload.h functions/rm.h -./functions/rmuser.o: ./core/run.h functions/sort.h +./functions/rmuser.o: core/dirs.h functions/account.h functions/adduser.h +./functions/rmuser.o: functions/cat.h functions/chmod.h +./functions/rmuser.o: functions/privchanger.h functions/chown.h +./functions/rmuser.o: functions/ckeditor.h functions/cp.h functions/default.h +./functions/rmuser.o: functions/download.h functions/emacs.h functions/env.h +./functions/rmuser.o: models/userwrapper.h models/user.h functions/imgcrop.h +./functions/rmuser.o: functions/last.h functions/login.h functions/logout.h +./functions/rmuser.o: functions/ln.h functions/ls.h functions/man.h +./functions/rmuser.o: functions/meta.h functions/mkdir.h functions/mv.h +./functions/rmuser.o: functions/nicedit.h functions/node.h functions/passwd.h +./functions/rmuser.o: functions/priv.h functions/pw.h functions/reload.h +./functions/rmuser.o: functions/rm.h functions/sort.h ./functions/rmuser.o: functions/specialdefault.h functions/stat.h ./functions/rmuser.o: functions/subject.h functions/template.h -./functions/rmuser.o: ./core/timezone.h functions/tinymce.h functions/uname.h +./functions/rmuser.o: functions/tinymce.h functions/uname.h ./functions/rmuser.o: functions/upload.h functions/uptime.h functions/who.h ./functions/rmuser.o: functions/vim.h ../../pikotools/src/html/htmlparser.h -./functions/run.o: ./core/run.h ./core/winixbase.h +./functions/run.o: core/run.h ./core/winixbase.h ./functions/sort.o: functions/sort.h functions/functionbase.h db/db.h ./functions/sort.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/sort.o: core/textstream.h @@ -5228,22 +5588,29 @@ ./functions/sort.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./functions/sort.o: ../../ezc/src/patternparser.h templates/htmltextstream.h ./functions/sort.o: models/winixmodel.h models/winixmodelconnector.h -./functions/sort.o: models/group.h core/dircontainer.h core/ugcontainer.h -./functions/sort.o: ./core/winixbase.h core/request.h core/system.h -./functions/sort.o: notify/notify.h core/winixmodeldeprecated.h -./functions/sort.o: notify/notifypool.h templates/locale.h -./functions/sort.o: templates/patterns.h notify/notifythread.h -./functions/sort.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/sort.o: core/winixrequest.h core/winixsystem.h -./functions/sort.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/sort.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/sort.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/sort.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/sort.o: models/itemcontent.h templates/htmltextstream.h -./functions/sort.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/sort.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/sort.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./functions/sort.o: core/plugin.h +./functions/sort.o: models/group.h core/dircontainer.h ./core/winixbase.h +./functions/sort.o: models/item.h models/itemcontent.h +./functions/sort.o: templates/htmltextstream.h core/ugcontainer.h +./functions/sort.o: core/request.h notify/notify.h +./functions/sort.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/sort.o: templates/locale.h templates/patterns.h +./functions/sort.o: notify/notifythread.h core/basethread.h +./functions/sort.o: notify/templatesnotify.h core/users.h core/ugcontainer.h +./functions/sort.o: ./core/lastcontainer.h ./core/cur.h ./core/request.h +./functions/sort.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./functions/sort.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./functions/sort.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./functions/sort.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/sort.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/sort.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/sort.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/sort.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/sort.o: core/loadavg.h core/dirs.h core/dircontainer.h +./functions/sort.o: core/crypt.h core/run.h core/users.h core/groups.h +./functions/sort.o: core/image.h core/threadmanager.h +./functions/sort.o: models/winixmodelconnector.h core/timezones.h +./functions/sort.o: core/timezone.h core/cur.h core/sessionmanager.h +./functions/sort.o: core/slog.h core/plugin.h ./functions/specialdefault.o: functions/specialdefault.h ./functions/specialdefault.o: functions/functionbase.h db/db.h db/dbbase.h ./functions/specialdefault.o: db/dbconn.h db/dbtextstream.h core/textstream.h @@ -5315,24 +5682,33 @@ ./functions/specialdefault.o: ../../ezc/src/patternparser.h ./functions/specialdefault.o: templates/htmltextstream.h models/winixmodel.h ./functions/specialdefault.o: models/winixmodelconnector.h models/group.h -./functions/specialdefault.o: core/dircontainer.h core/ugcontainer.h -./functions/specialdefault.o: ./core/winixbase.h core/request.h core/system.h -./functions/specialdefault.o: notify/notify.h core/winixmodeldeprecated.h -./functions/specialdefault.o: notify/notifypool.h templates/locale.h -./functions/specialdefault.o: templates/patterns.h notify/notifythread.h -./functions/specialdefault.o: core/basethread.h notify/templatesnotify.h -./functions/specialdefault.o: core/users.h core/winixrequest.h -./functions/specialdefault.o: core/winixsystem.h -./functions/specialdefault.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/specialdefault.o: ./core/pluginmsg.h ./core/plugindata.h -./functions/specialdefault.o: core/cur.h core/sessionmanager.h core/slog.h +./functions/specialdefault.o: core/dircontainer.h ./core/winixbase.h +./functions/specialdefault.o: models/item.h models/itemcontent.h +./functions/specialdefault.o: templates/htmltextstream.h core/ugcontainer.h +./functions/specialdefault.o: core/request.h notify/notify.h +./functions/specialdefault.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/specialdefault.o: templates/locale.h templates/patterns.h +./functions/specialdefault.o: notify/notifythread.h core/basethread.h +./functions/specialdefault.o: notify/templatesnotify.h core/users.h +./functions/specialdefault.o: core/ugcontainer.h ./core/lastcontainer.h ./functions/specialdefault.o: ./core/cur.h ./core/request.h -./functions/specialdefault.o: ./core/requesttypes.h models/item.h -./functions/specialdefault.o: models/itemcontent.h templates/htmltextstream.h -./functions/specialdefault.o: ./core/error.h ./core/config.h -./functions/specialdefault.o: ./core/textstream.h models/winixmodel.h -./functions/specialdefault.o: ./core/header.h ./core/session.h ./core/rebus.h -./functions/specialdefault.o: ./core/ipban.h ./core/mount.h +./functions/specialdefault.o: ./core/requesttypes.h ./core/error.h +./functions/specialdefault.o: ./core/config.h ./core/textstream.h +./functions/specialdefault.o: models/winixmodel.h ./core/header.h +./functions/specialdefault.o: ./core/compress.h ./core/plugin.h +./functions/specialdefault.o: ./core/pluginmsg.h ./core/plugindata.h +./functions/specialdefault.o: ./core/winixmodeldeprecated.h ./core/mount.h +./functions/specialdefault.o: ./core/mounts.h ./core/mountparser.h +./functions/specialdefault.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/specialdefault.o: core/winixrequest.h core/winixsystem.h +./functions/specialdefault.o: core/system.h core/job.h ./core/basethread.h +./functions/specialdefault.o: core/jobtask.h core/loadavg.h core/dirs.h +./functions/specialdefault.o: core/dircontainer.h core/crypt.h core/run.h +./functions/specialdefault.o: core/users.h core/groups.h core/image.h +./functions/specialdefault.o: core/threadmanager.h +./functions/specialdefault.o: models/winixmodelconnector.h core/timezones.h +./functions/specialdefault.o: core/timezone.h core/cur.h +./functions/specialdefault.o: core/sessionmanager.h core/slog.h ./functions/stat.o: functions/stat.h functions/functionbase.h db/db.h ./functions/stat.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/stat.o: core/textstream.h @@ -5390,21 +5766,29 @@ ./functions/stat.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./functions/stat.o: ../../ezc/src/patternparser.h templates/htmltextstream.h ./functions/stat.o: models/winixmodel.h models/winixmodelconnector.h -./functions/stat.o: models/group.h core/dircontainer.h core/ugcontainer.h -./functions/stat.o: ./core/winixbase.h core/request.h core/system.h -./functions/stat.o: notify/notify.h core/winixmodeldeprecated.h -./functions/stat.o: notify/notifypool.h templates/locale.h -./functions/stat.o: templates/patterns.h notify/notifythread.h -./functions/stat.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/stat.o: core/winixrequest.h core/winixsystem.h -./functions/stat.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/stat.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/stat.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/stat.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/stat.o: models/itemcontent.h templates/htmltextstream.h -./functions/stat.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/stat.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/stat.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/stat.o: models/group.h core/dircontainer.h ./core/winixbase.h +./functions/stat.o: models/item.h models/itemcontent.h +./functions/stat.o: templates/htmltextstream.h core/ugcontainer.h +./functions/stat.o: core/request.h notify/notify.h +./functions/stat.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/stat.o: templates/locale.h templates/patterns.h +./functions/stat.o: notify/notifythread.h core/basethread.h +./functions/stat.o: notify/templatesnotify.h core/users.h core/ugcontainer.h +./functions/stat.o: ./core/lastcontainer.h ./core/cur.h ./core/request.h +./functions/stat.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./functions/stat.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./functions/stat.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./functions/stat.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/stat.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/stat.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/stat.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/stat.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/stat.o: core/loadavg.h core/dirs.h core/dircontainer.h +./functions/stat.o: core/crypt.h core/run.h core/users.h core/groups.h +./functions/stat.o: core/image.h core/threadmanager.h +./functions/stat.o: models/winixmodelconnector.h core/timezones.h +./functions/stat.o: core/timezone.h core/cur.h core/sessionmanager.h +./functions/stat.o: core/slog.h ./functions/subject.o: functions/subject.h functions/functionbase.h db/db.h ./functions/subject.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/subject.o: core/textstream.h @@ -5469,21 +5853,28 @@ ./functions/subject.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./functions/subject.o: templates/htmltextstream.h models/winixmodel.h ./functions/subject.o: models/winixmodelconnector.h models/group.h -./functions/subject.o: core/dircontainer.h core/ugcontainer.h -./functions/subject.o: ./core/winixbase.h core/request.h core/system.h -./functions/subject.o: notify/notify.h core/winixmodeldeprecated.h -./functions/subject.o: notify/notifypool.h templates/locale.h -./functions/subject.o: templates/patterns.h notify/notifythread.h -./functions/subject.o: core/basethread.h notify/templatesnotify.h -./functions/subject.o: core/users.h core/winixrequest.h core/winixsystem.h -./functions/subject.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/subject.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/subject.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/subject.o: ./core/request.h ./core/requesttypes.h models/item.h +./functions/subject.o: core/dircontainer.h ./core/winixbase.h models/item.h ./functions/subject.o: models/itemcontent.h templates/htmltextstream.h -./functions/subject.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/subject.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/subject.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/subject.o: core/ugcontainer.h core/request.h notify/notify.h +./functions/subject.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/subject.o: templates/locale.h templates/patterns.h +./functions/subject.o: notify/notifythread.h core/basethread.h +./functions/subject.o: notify/templatesnotify.h core/users.h +./functions/subject.o: core/ugcontainer.h ./core/lastcontainer.h ./core/cur.h +./functions/subject.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./functions/subject.o: ./core/config.h ./core/textstream.h +./functions/subject.o: models/winixmodel.h ./core/header.h ./core/compress.h +./functions/subject.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h +./functions/subject.o: ./core/winixmodeldeprecated.h ./core/mount.h +./functions/subject.o: ./core/mounts.h ./core/mountparser.h ./core/session.h +./functions/subject.o: ./core/rebus.h ./core/ipban.h core/winixrequest.h +./functions/subject.o: core/winixsystem.h core/system.h core/job.h +./functions/subject.o: ./core/basethread.h core/jobtask.h core/loadavg.h +./functions/subject.o: core/dirs.h core/dircontainer.h core/crypt.h +./functions/subject.o: core/run.h core/users.h core/groups.h core/image.h +./functions/subject.o: core/threadmanager.h models/winixmodelconnector.h +./functions/subject.o: core/timezones.h core/timezone.h core/cur.h +./functions/subject.o: core/sessionmanager.h core/slog.h ./functions/template.o: functions/template.h functions/functionbase.h db/db.h ./functions/template.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/template.o: core/textstream.h @@ -5550,27 +5941,34 @@ ./functions/template.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./functions/template.o: templates/htmltextstream.h models/winixmodel.h ./functions/template.o: models/winixmodelconnector.h models/group.h -./functions/template.o: core/dircontainer.h core/ugcontainer.h -./functions/template.o: ./core/winixbase.h core/request.h core/system.h -./functions/template.o: notify/notify.h core/winixmodeldeprecated.h -./functions/template.o: notify/notifypool.h templates/locale.h -./functions/template.o: templates/patterns.h notify/notifythread.h -./functions/template.o: core/basethread.h notify/templatesnotify.h -./functions/template.o: core/users.h core/winixrequest.h core/winixsystem.h -./functions/template.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/template.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/template.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/template.o: ./core/request.h ./core/requesttypes.h models/item.h +./functions/template.o: core/dircontainer.h ./core/winixbase.h models/item.h ./functions/template.o: models/itemcontent.h templates/htmltextstream.h +./functions/template.o: core/ugcontainer.h core/request.h notify/notify.h +./functions/template.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/template.o: templates/locale.h templates/patterns.h +./functions/template.o: notify/notifythread.h core/basethread.h +./functions/template.o: notify/templatesnotify.h core/users.h +./functions/template.o: core/ugcontainer.h ./core/lastcontainer.h +./functions/template.o: ./core/cur.h ./core/request.h ./core/requesttypes.h ./functions/template.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/template.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/template.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./functions/template.o: core/misc.h core/winix_const.h +./functions/template.o: models/winixmodel.h ./core/header.h ./core/compress.h +./functions/template.o: ./core/plugin.h ./core/pluginmsg.h +./functions/template.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/template.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/template.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/template.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/template.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/template.o: core/loadavg.h core/dirs.h core/dircontainer.h +./functions/template.o: core/crypt.h core/run.h core/users.h core/groups.h +./functions/template.o: core/image.h core/threadmanager.h +./functions/template.o: models/winixmodelconnector.h core/timezones.h +./functions/template.o: core/timezone.h core/cur.h core/sessionmanager.h +./functions/template.o: core/slog.h core/misc.h core/winix_const.h ./functions/template.o: ../../pikotools/src/convert/convert.h ./functions/template.o: ../../pikotools/src/convert/inttostr.h ./functions/template.o: ../../pikotools/src/convert/patternreplacer.h ./functions/template.o: ../../pikotools/src/convert/double.h -./functions/timezone.o: ./core/timezone.h ../../pikotools/src/date/date.h +./functions/timezone.o: core/timezone.h ../../pikotools/src/date/date.h ./functions/timezone.o: ../../pikotools/src/convert/inttostr.h ./functions/timezone.o: ../../pikotools/src/space/space.h ./functions/tinymce.o: functions/tinymce.h functions/functionbase.h db/db.h @@ -5637,21 +6035,28 @@ ./functions/tinymce.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h ./functions/tinymce.o: templates/htmltextstream.h models/winixmodel.h ./functions/tinymce.o: models/winixmodelconnector.h models/group.h -./functions/tinymce.o: core/dircontainer.h core/ugcontainer.h -./functions/tinymce.o: ./core/winixbase.h core/request.h core/system.h -./functions/tinymce.o: notify/notify.h core/winixmodeldeprecated.h -./functions/tinymce.o: notify/notifypool.h templates/locale.h -./functions/tinymce.o: templates/patterns.h notify/notifythread.h -./functions/tinymce.o: core/basethread.h notify/templatesnotify.h -./functions/tinymce.o: core/users.h core/winixrequest.h core/winixsystem.h -./functions/tinymce.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/tinymce.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/tinymce.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/tinymce.o: ./core/request.h ./core/requesttypes.h models/item.h +./functions/tinymce.o: core/dircontainer.h ./core/winixbase.h models/item.h ./functions/tinymce.o: models/itemcontent.h templates/htmltextstream.h -./functions/tinymce.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/tinymce.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/tinymce.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/tinymce.o: core/ugcontainer.h core/request.h notify/notify.h +./functions/tinymce.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/tinymce.o: templates/locale.h templates/patterns.h +./functions/tinymce.o: notify/notifythread.h core/basethread.h +./functions/tinymce.o: notify/templatesnotify.h core/users.h +./functions/tinymce.o: core/ugcontainer.h ./core/lastcontainer.h ./core/cur.h +./functions/tinymce.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./functions/tinymce.o: ./core/config.h ./core/textstream.h +./functions/tinymce.o: models/winixmodel.h ./core/header.h ./core/compress.h +./functions/tinymce.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h +./functions/tinymce.o: ./core/winixmodeldeprecated.h ./core/mount.h +./functions/tinymce.o: ./core/mounts.h ./core/mountparser.h ./core/session.h +./functions/tinymce.o: ./core/rebus.h ./core/ipban.h core/winixrequest.h +./functions/tinymce.o: core/winixsystem.h core/system.h core/job.h +./functions/tinymce.o: ./core/basethread.h core/jobtask.h core/loadavg.h +./functions/tinymce.o: core/dirs.h core/dircontainer.h core/crypt.h +./functions/tinymce.o: core/run.h core/users.h core/groups.h core/image.h +./functions/tinymce.o: core/threadmanager.h models/winixmodelconnector.h +./functions/tinymce.o: core/timezones.h core/timezone.h core/cur.h +./functions/tinymce.o: core/sessionmanager.h core/slog.h ./functions/uname.o: functions/uname.h functions/functionbase.h db/db.h ./functions/uname.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/uname.o: core/textstream.h @@ -5711,21 +6116,29 @@ ./functions/uname.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./functions/uname.o: ../../ezc/src/patternparser.h templates/htmltextstream.h ./functions/uname.o: models/winixmodel.h models/winixmodelconnector.h -./functions/uname.o: models/group.h core/dircontainer.h core/ugcontainer.h -./functions/uname.o: ./core/winixbase.h core/request.h core/system.h -./functions/uname.o: notify/notify.h core/winixmodeldeprecated.h -./functions/uname.o: notify/notifypool.h templates/locale.h -./functions/uname.o: templates/patterns.h notify/notifythread.h -./functions/uname.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/uname.o: core/winixrequest.h core/winixsystem.h -./functions/uname.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/uname.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/uname.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/uname.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/uname.o: models/itemcontent.h templates/htmltextstream.h -./functions/uname.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/uname.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/uname.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/uname.o: models/group.h core/dircontainer.h ./core/winixbase.h +./functions/uname.o: models/item.h models/itemcontent.h +./functions/uname.o: templates/htmltextstream.h core/ugcontainer.h +./functions/uname.o: core/request.h notify/notify.h +./functions/uname.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/uname.o: templates/locale.h templates/patterns.h +./functions/uname.o: notify/notifythread.h core/basethread.h +./functions/uname.o: notify/templatesnotify.h core/users.h core/ugcontainer.h +./functions/uname.o: ./core/lastcontainer.h ./core/cur.h ./core/request.h +./functions/uname.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./functions/uname.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./functions/uname.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./functions/uname.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./functions/uname.o: ./core/mount.h ./core/mounts.h ./core/mountparser.h +./functions/uname.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./functions/uname.o: core/winixrequest.h core/winixsystem.h core/system.h +./functions/uname.o: core/job.h ./core/basethread.h core/jobtask.h +./functions/uname.o: core/loadavg.h core/dirs.h core/dircontainer.h +./functions/uname.o: core/crypt.h core/run.h core/users.h core/groups.h +./functions/uname.o: core/image.h core/threadmanager.h +./functions/uname.o: models/winixmodelconnector.h core/timezones.h +./functions/uname.o: core/timezone.h core/cur.h core/sessionmanager.h +./functions/uname.o: core/slog.h ./functions/upload.o: functions/upload.h functions/functionbase.h db/db.h ./functions/upload.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/upload.o: core/textstream.h @@ -5786,42 +6199,49 @@ ./functions/upload.o: ../../ezc/src/patternparser.h ./functions/upload.o: templates/htmltextstream.h models/winixmodel.h ./functions/upload.o: models/winixmodelconnector.h models/group.h -./functions/upload.o: core/dircontainer.h core/ugcontainer.h -./functions/upload.o: ./core/winixbase.h core/request.h core/system.h -./functions/upload.o: notify/notify.h core/winixmodeldeprecated.h -./functions/upload.o: notify/notifypool.h templates/locale.h -./functions/upload.o: templates/patterns.h notify/notifythread.h -./functions/upload.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/upload.o: core/winixrequest.h core/winixsystem.h -./functions/upload.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/upload.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/upload.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/upload.o: ./core/request.h ./core/requesttypes.h models/item.h +./functions/upload.o: core/dircontainer.h ./core/winixbase.h models/item.h ./functions/upload.o: models/itemcontent.h templates/htmltextstream.h -./functions/upload.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/upload.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/upload.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./functions/upload.o: core/misc.h core/winix_const.h +./functions/upload.o: core/ugcontainer.h core/request.h notify/notify.h +./functions/upload.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/upload.o: templates/locale.h templates/patterns.h +./functions/upload.o: notify/notifythread.h core/basethread.h +./functions/upload.o: notify/templatesnotify.h core/users.h +./functions/upload.o: core/ugcontainer.h ./core/lastcontainer.h ./core/cur.h +./functions/upload.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./functions/upload.o: ./core/config.h ./core/textstream.h models/winixmodel.h +./functions/upload.o: ./core/header.h ./core/compress.h ./core/plugin.h +./functions/upload.o: ./core/pluginmsg.h ./core/plugindata.h +./functions/upload.o: ./core/winixmodeldeprecated.h ./core/mount.h +./functions/upload.o: ./core/mounts.h ./core/mountparser.h ./core/session.h +./functions/upload.o: ./core/rebus.h ./core/ipban.h core/winixrequest.h +./functions/upload.o: core/winixsystem.h core/system.h core/job.h +./functions/upload.o: ./core/basethread.h core/jobtask.h core/loadavg.h +./functions/upload.o: core/dirs.h core/dircontainer.h core/crypt.h core/run.h +./functions/upload.o: core/users.h core/groups.h core/image.h +./functions/upload.o: core/threadmanager.h models/winixmodelconnector.h +./functions/upload.o: core/timezones.h core/timezone.h core/cur.h +./functions/upload.o: core/sessionmanager.h core/slog.h core/misc.h +./functions/upload.o: core/winix_const.h ./functions/upload.o: ../../pikotools/src/convert/convert.h ./functions/upload.o: ../../pikotools/src/convert/inttostr.h ./functions/upload.o: ../../pikotools/src/convert/patternreplacer.h ./functions/upload.o: ../../pikotools/src/convert/double.h ./functions/upload.o: functions/functions.h functions/functionparser.h -./functions/upload.o: functions/account.h functions/adduser.h functions/cat.h -./functions/upload.o: functions/chmod.h functions/privchanger.h -./functions/upload.o: functions/chown.h functions/ckeditor.h functions/cp.h -./functions/upload.o: functions/default.h functions/download.h -./functions/upload.o: functions/emacs.h functions/env.h models/userwrapper.h -./functions/upload.o: models/user.h functions/imgcrop.h functions/last.h -./functions/upload.o: functions/login.h functions/logout.h functions/ln.h -./functions/upload.o: functions/ls.h functions/man.h functions/meta.h -./functions/upload.o: functions/mkdir.h functions/mv.h functions/nicedit.h -./functions/upload.o: functions/node.h functions/passwd.h functions/priv.h -./functions/upload.o: functions/pw.h functions/reload.h functions/rm.h -./functions/upload.o: functions/rmuser.h ./core/run.h functions/sort.h +./functions/upload.o: core/dirs.h functions/account.h functions/adduser.h +./functions/upload.o: functions/cat.h functions/chmod.h +./functions/upload.o: functions/privchanger.h functions/chown.h +./functions/upload.o: functions/ckeditor.h functions/cp.h functions/default.h +./functions/upload.o: functions/download.h functions/emacs.h functions/env.h +./functions/upload.o: models/userwrapper.h models/user.h functions/imgcrop.h +./functions/upload.o: functions/last.h functions/login.h functions/logout.h +./functions/upload.o: functions/ln.h functions/ls.h functions/man.h +./functions/upload.o: functions/meta.h functions/mkdir.h functions/mv.h +./functions/upload.o: functions/nicedit.h functions/node.h functions/passwd.h +./functions/upload.o: functions/priv.h functions/pw.h functions/reload.h +./functions/upload.o: functions/rm.h functions/rmuser.h functions/sort.h ./functions/upload.o: functions/specialdefault.h functions/stat.h ./functions/upload.o: functions/subject.h functions/template.h -./functions/upload.o: ./core/timezone.h functions/tinymce.h functions/uname.h +./functions/upload.o: functions/tinymce.h functions/uname.h ./functions/upload.o: functions/uptime.h functions/who.h functions/vim.h ./functions/upload.o: ../../pikotools/src/html/htmlparser.h ./functions/upload.o: templates/templates.h templates/patterncacher.h @@ -5887,21 +6307,28 @@ ./functions/uptime.o: ../../ezc/src/patternparser.h ./functions/uptime.o: templates/htmltextstream.h models/winixmodel.h ./functions/uptime.o: models/winixmodelconnector.h models/group.h -./functions/uptime.o: core/dircontainer.h core/ugcontainer.h -./functions/uptime.o: ./core/winixbase.h core/request.h core/system.h -./functions/uptime.o: notify/notify.h core/winixmodeldeprecated.h -./functions/uptime.o: notify/notifypool.h templates/locale.h -./functions/uptime.o: templates/patterns.h notify/notifythread.h -./functions/uptime.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/uptime.o: core/winixrequest.h core/winixsystem.h -./functions/uptime.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/uptime.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/uptime.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/uptime.o: ./core/request.h ./core/requesttypes.h models/item.h +./functions/uptime.o: core/dircontainer.h ./core/winixbase.h models/item.h ./functions/uptime.o: models/itemcontent.h templates/htmltextstream.h -./functions/uptime.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/uptime.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/uptime.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/uptime.o: core/ugcontainer.h core/request.h notify/notify.h +./functions/uptime.o: core/winixmodeldeprecated.h notify/notifypool.h +./functions/uptime.o: templates/locale.h templates/patterns.h +./functions/uptime.o: notify/notifythread.h core/basethread.h +./functions/uptime.o: notify/templatesnotify.h core/users.h +./functions/uptime.o: core/ugcontainer.h ./core/lastcontainer.h ./core/cur.h +./functions/uptime.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./functions/uptime.o: ./core/config.h ./core/textstream.h models/winixmodel.h +./functions/uptime.o: ./core/header.h ./core/compress.h ./core/plugin.h +./functions/uptime.o: ./core/pluginmsg.h ./core/plugindata.h +./functions/uptime.o: ./core/winixmodeldeprecated.h ./core/mount.h +./functions/uptime.o: ./core/mounts.h ./core/mountparser.h ./core/session.h +./functions/uptime.o: ./core/rebus.h ./core/ipban.h core/winixrequest.h +./functions/uptime.o: core/winixsystem.h core/system.h core/job.h +./functions/uptime.o: ./core/basethread.h core/jobtask.h core/loadavg.h +./functions/uptime.o: core/dirs.h core/dircontainer.h core/crypt.h core/run.h +./functions/uptime.o: core/users.h core/groups.h core/image.h +./functions/uptime.o: core/threadmanager.h models/winixmodelconnector.h +./functions/uptime.o: core/timezones.h core/timezone.h core/cur.h +./functions/uptime.o: core/sessionmanager.h core/slog.h ./functions/vim.o: functions/vim.h functions/functionbase.h db/db.h ./functions/vim.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/vim.o: core/textstream.h @@ -5959,21 +6386,28 @@ ./functions/vim.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./functions/vim.o: ../../ezc/src/patternparser.h templates/htmltextstream.h ./functions/vim.o: models/winixmodel.h models/winixmodelconnector.h -./functions/vim.o: models/group.h core/dircontainer.h core/ugcontainer.h -./functions/vim.o: ./core/winixbase.h core/request.h core/system.h -./functions/vim.o: notify/notify.h core/winixmodeldeprecated.h +./functions/vim.o: models/group.h core/dircontainer.h ./core/winixbase.h +./functions/vim.o: models/item.h models/itemcontent.h +./functions/vim.o: templates/htmltextstream.h core/ugcontainer.h +./functions/vim.o: core/request.h notify/notify.h core/winixmodeldeprecated.h ./functions/vim.o: notify/notifypool.h templates/locale.h ./functions/vim.o: templates/patterns.h notify/notifythread.h ./functions/vim.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/vim.o: core/winixrequest.h core/winixsystem.h -./functions/vim.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/vim.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/vim.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/vim.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/vim.o: models/itemcontent.h templates/htmltextstream.h -./functions/vim.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/vim.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/vim.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/vim.o: core/ugcontainer.h ./core/lastcontainer.h ./core/cur.h +./functions/vim.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./functions/vim.o: ./core/config.h ./core/textstream.h models/winixmodel.h +./functions/vim.o: ./core/header.h ./core/compress.h ./core/plugin.h +./functions/vim.o: ./core/pluginmsg.h ./core/plugindata.h +./functions/vim.o: ./core/winixmodeldeprecated.h ./core/mount.h +./functions/vim.o: ./core/mounts.h ./core/mountparser.h ./core/session.h +./functions/vim.o: ./core/rebus.h ./core/ipban.h core/winixrequest.h +./functions/vim.o: core/winixsystem.h core/system.h core/job.h +./functions/vim.o: ./core/basethread.h core/jobtask.h core/loadavg.h +./functions/vim.o: core/dirs.h core/dircontainer.h core/crypt.h core/run.h +./functions/vim.o: core/users.h core/groups.h core/image.h +./functions/vim.o: core/threadmanager.h models/winixmodelconnector.h +./functions/vim.o: core/timezones.h core/timezone.h core/cur.h +./functions/vim.o: core/sessionmanager.h core/slog.h ./functions/who.o: functions/who.h functions/functionbase.h db/db.h ./functions/who.o: db/dbbase.h db/dbconn.h db/dbtextstream.h ./functions/who.o: core/textstream.h @@ -6031,21 +6465,28 @@ ./functions/who.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./functions/who.o: ../../ezc/src/patternparser.h templates/htmltextstream.h ./functions/who.o: models/winixmodel.h models/winixmodelconnector.h -./functions/who.o: models/group.h core/dircontainer.h core/ugcontainer.h -./functions/who.o: ./core/winixbase.h core/request.h core/system.h -./functions/who.o: notify/notify.h core/winixmodeldeprecated.h +./functions/who.o: models/group.h core/dircontainer.h ./core/winixbase.h +./functions/who.o: models/item.h models/itemcontent.h +./functions/who.o: templates/htmltextstream.h core/ugcontainer.h +./functions/who.o: core/request.h notify/notify.h core/winixmodeldeprecated.h ./functions/who.o: notify/notifypool.h templates/locale.h ./functions/who.o: templates/patterns.h notify/notifythread.h ./functions/who.o: core/basethread.h notify/templatesnotify.h core/users.h -./functions/who.o: core/winixrequest.h core/winixsystem.h -./functions/who.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./functions/who.o: ./core/pluginmsg.h ./core/plugindata.h core/cur.h -./functions/who.o: core/sessionmanager.h core/slog.h ./core/cur.h -./functions/who.o: ./core/request.h ./core/requesttypes.h models/item.h -./functions/who.o: models/itemcontent.h templates/htmltextstream.h -./functions/who.o: ./core/error.h ./core/config.h ./core/textstream.h -./functions/who.o: models/winixmodel.h ./core/header.h ./core/session.h -./functions/who.o: ./core/rebus.h ./core/ipban.h ./core/mount.h +./functions/who.o: core/ugcontainer.h ./core/lastcontainer.h ./core/cur.h +./functions/who.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./functions/who.o: ./core/config.h ./core/textstream.h models/winixmodel.h +./functions/who.o: ./core/header.h ./core/compress.h ./core/plugin.h +./functions/who.o: ./core/pluginmsg.h ./core/plugindata.h +./functions/who.o: ./core/winixmodeldeprecated.h ./core/mount.h +./functions/who.o: ./core/mounts.h ./core/mountparser.h ./core/session.h +./functions/who.o: ./core/rebus.h ./core/ipban.h core/winixrequest.h +./functions/who.o: core/winixsystem.h core/system.h core/job.h +./functions/who.o: ./core/basethread.h core/jobtask.h core/loadavg.h +./functions/who.o: core/dirs.h core/dircontainer.h core/crypt.h core/run.h +./functions/who.o: core/users.h core/groups.h core/image.h +./functions/who.o: core/threadmanager.h models/winixmodelconnector.h +./functions/who.o: core/timezones.h core/timezone.h core/cur.h +./functions/who.o: core/sessionmanager.h core/slog.h ./main/main.o: core/app.h ./core/sessionmanager.h ./core/sessioncontainer.h ./main/main.o: ./core/session.h ./core/error.h models/user.h ./main/main.o: ../../morm/src/model.h @@ -6106,26 +6547,26 @@ ./main/main.o: ./core/ipban.h ./core/cur.h ./core/request.h ./main/main.o: ./core/requesttypes.h models/item.h models/itemcontent.h ./main/main.o: templates/htmltextstream.h ./core/config.h models/winixmodel.h -./main/main.o: ./core/header.h ./core/mount.h ./core/winixmodeldeprecated.h -./main/main.o: ./core/plugin.h ./core/pluginmsg.h ./core/ipbancontainer.h -./main/main.o: ./core/lastcontainer.h ./core/system.h ./core/job.h -./main/main.o: ./core/basethread.h ./core/dirs.h ./core/dircontainer.h -./main/main.o: db/db.h db/dbbase.h db/dbconn.h db/dbtextstream.h -./main/main.o: core/textstream.h core/error.h models/group.h -./main/main.o: core/dircontainer.h core/ugcontainer.h ./core/mounts.h -./main/main.o: ./core/mountparser.h ./core/crypt.h ./core/run.h -./main/main.o: ./core/users.h ./core/ugcontainer.h ./core/groups.h -./main/main.o: ./core/loadavg.h ./core/image.h ./core/threadmanager.h -./main/main.o: models/winixmodelconnector.h notify/notify.h +./main/main.o: ./core/header.h ./core/compress.h ./core/plugin.h +./main/main.o: ./core/pluginmsg.h ./core/winixmodeldeprecated.h +./main/main.o: ./core/mount.h ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./main/main.o: db/dbtextstream.h core/textstream.h core/error.h +./main/main.o: models/group.h core/dircontainer.h core/ugcontainer.h +./main/main.o: ./core/mountparser.h ./core/ipbancontainer.h +./main/main.o: ./core/lastcontainer.h ./core/basethread.h +./main/main.o: ./core/sessionidmanager.h ../../tito/src/base64.h +./main/main.o: ../../tito/src/aes.h functions/functions.h +./main/main.o: functions/functionbase.h core/request.h notify/notify.h ./main/main.o: core/winixmodeldeprecated.h notify/notifypool.h ./main/main.o: templates/locale.h templates/patterns.h notify/notifythread.h ./main/main.o: core/basethread.h notify/templatesnotify.h core/users.h -./main/main.o: ./core/timezones.h ./core/timezone.h ./core/sessionidmanager.h -./main/main.o: ../../tito/src/base64.h ../../tito/src/aes.h -./main/main.o: functions/functions.h functions/functionbase.h core/request.h -./main/main.o: core/system.h core/winixrequest.h core/winixsystem.h +./main/main.o: core/ugcontainer.h core/winixrequest.h core/winixsystem.h +./main/main.o: core/system.h core/job.h core/jobtask.h core/loadavg.h +./main/main.o: core/dirs.h core/dircontainer.h core/crypt.h core/run.h +./main/main.o: core/users.h core/groups.h core/image.h core/threadmanager.h +./main/main.o: models/winixmodelconnector.h core/timezones.h core/timezone.h ./main/main.o: core/cur.h core/sessionmanager.h core/slog.h -./main/main.o: functions/functionparser.h functions/account.h +./main/main.o: functions/functionparser.h core/dirs.h functions/account.h ./main/main.o: functions/adduser.h functions/cat.h functions/chmod.h ./main/main.o: functions/privchanger.h functions/chown.h functions/ckeditor.h ./main/main.o: functions/cp.h functions/default.h functions/download.h @@ -6143,13 +6584,13 @@ ./main/main.o: ../../pikotools/src/html/htmlparser.h templates/templates.h ./main/main.o: templates/patterncacher.h templates/indexpatterns.h ./main/main.o: templates/patterns.h templates/changepatterns.h -./main/main.o: ./core/compress.h ./core/postparser.h -./main/main.o: ./core/httpsimpleparser.h ./core/cookieparser.h -./main/main.o: ./core/postmultiparser.h utils/acceptencodingparser.h -./main/main.o: utils/acceptbaseparser.h core/header.h ./core/winixrequest.h -./main/main.o: core/version.h +./main/main.o: ./core/postparser.h ./core/httpsimpleparser.h +./main/main.o: ./core/cookieparser.h ./core/postmultiparser.h +./main/main.o: utils/acceptencodingparser.h utils/acceptbaseparser.h +./main/main.o: core/header.h ./core/winixrequest.h core/version.h core/lock.h ./main/main.o: ../../pikotools/src/mainoptions/mainoptionsparser.h ./main/main.o: ../../pikotools/src/pikotools/version.h ../../tito/src/tito.h +./main/main.o: ./main/runstatus.h ./models/group.o: ./models/group.h ../../morm/src/model.h ./models/group.o: ../../pikotools/src/textstream/textstream.h ./models/group.o: ../../pikotools/src/textstream/stream.h @@ -6242,17 +6683,26 @@ ./models/item.o: templates/templates.h templates/patterncacher.h ./models/item.o: templates/indexpatterns.h templates/patterns.h ./models/item.o: templates/changepatterns.h core/cur.h core/system.h -./models/item.o: core/sessionmanager.h ../../pikotools/src/html/htmlparser.h -./models/item.o: db/db.h db/dbbase.h db/dbconn.h db/dbtextstream.h -./models/item.o: core/textstream.h core/error.h models/user.h models/group.h -./models/item.o: core/dircontainer.h core/ugcontainer.h ./core/winixbase.h -./models/item.o: core/winixrequest.h core/winixsystem.h -./models/item.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./models/item.o: ./core/pluginmsg.h ./core/plugindata.h core/slog.h -./models/item.o: ./core/cur.h ./core/request.h ./core/error.h ./core/config.h -./models/item.o: ./core/textstream.h models/winixmodel.h ./core/header.h -./models/item.o: ./core/session.h ./core/rebus.h ./core/ipban.h -./models/item.o: ./core/mount.h templates/locale.h core/session.h +./models/item.o: core/job.h ./core/basethread.h ./core/winixmodeldeprecated.h +./models/item.o: core/jobtask.h ./core/cur.h ./core/request.h ./core/error.h +./models/item.o: ./core/config.h ./core/textstream.h models/winixmodel.h +./models/item.o: ./core/header.h ./core/compress.h ./core/winixbase.h +./models/item.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h +./models/item.o: ./core/mount.h ./core/mounts.h db/db.h db/dbbase.h +./models/item.o: db/dbconn.h db/dbtextstream.h core/textstream.h core/error.h +./models/item.o: models/user.h models/group.h core/dircontainer.h +./models/item.o: core/ugcontainer.h ./core/mountparser.h ./core/session.h +./models/item.o: ./core/rebus.h ./core/ipban.h core/loadavg.h core/dirs.h +./models/item.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./models/item.o: core/groups.h core/ugcontainer.h core/image.h +./models/item.o: core/threadmanager.h models/winixmodelconnector.h +./models/item.o: notify/notify.h core/winixmodeldeprecated.h +./models/item.o: notify/notifypool.h templates/locale.h templates/patterns.h +./models/item.o: notify/notifythread.h core/basethread.h +./models/item.o: notify/templatesnotify.h core/users.h ./core/lastcontainer.h +./models/item.o: core/timezones.h core/timezone.h core/sessionmanager.h +./models/item.o: ../../pikotools/src/html/htmlparser.h core/winixrequest.h +./models/item.o: core/winixsystem.h core/slog.h core/session.h ./models/itemcontent.o: models/itemcontent.h models/winixmodel.h ./models/itemcontent.o: ../../morm/src/model.h ./models/itemcontent.o: ../../pikotools/src/textstream/textstream.h @@ -6317,7 +6767,7 @@ ./models/itemcontent.o: ../../ezc/src/pattern.h ../../ezc/src/outstreams.h ./models/itemcontent.o: ../../ezc/src/expressionparser.h ./models/itemcontent.o: ../../ezc/src/models.h ../../ezc/src/patternparser.h -./models/itemcontent.o: templates/htmltextstream.h core/crypt.h ./core/run.h +./models/itemcontent.o: templates/htmltextstream.h core/crypt.h core/run.h ./models/itemcontent.o: ./core/winixbase.h ./core/config.h models/user.h ./models/itemcontent.o: core/misc.h ./core/requesttypes.h core/winix_const.h ./models/itemcontent.o: ../../pikotools/src/convert/convert.h @@ -6326,12 +6776,18 @@ ./models/itemcontent.o: ../../pikotools/src/convert/double.h ./models/itemcontent.o: ../../pikotools/src/html/bbcodeparser.h ./models/itemcontent.o: ../../pikotools/src/html/htmlparser.h core/request.h -./models/itemcontent.o: core/users.h core/groups.h models/group.h -./models/itemcontent.o: ./core/ugcontainer.h db/db.h db/dbbase.h db/dbconn.h -./models/itemcontent.o: db/dbtextstream.h core/textstream.h core/error.h -./models/itemcontent.o: core/dircontainer.h core/ugcontainer.h -./models/itemcontent.o: ./core/winixmodeldeprecated.h ./core/plugin.h +./models/itemcontent.o: core/users.h core/ugcontainer.h +./models/itemcontent.o: ./core/lastcontainer.h ./core/cur.h ./core/request.h +./models/itemcontent.o: models/item.h models/itemcontent.h ./core/error.h +./models/itemcontent.o: ./core/textstream.h models/winixmodel.h +./models/itemcontent.o: ./core/header.h ./core/compress.h ./core/plugin.h ./models/itemcontent.o: ./core/pluginmsg.h ./core/plugindata.h +./models/itemcontent.o: ./core/winixmodeldeprecated.h ./core/mount.h +./models/itemcontent.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./models/itemcontent.o: db/dbtextstream.h core/textstream.h core/error.h +./models/itemcontent.o: models/group.h core/dircontainer.h core/ugcontainer.h +./models/itemcontent.o: ./core/mountparser.h ./core/session.h ./core/rebus.h +./models/itemcontent.o: ./core/ipban.h core/groups.h ./models/migration.o: ./models/migration.h ../../morm/src/model.h ./models/migration.o: ../../pikotools/src/textstream/textstream.h ./models/migration.o: ../../pikotools/src/textstream/stream.h @@ -6429,17 +6885,27 @@ ./models/user.o: ../../pikotools/src/convert/patternreplacer.h ./models/user.o: templates/htmltextstream.h templates/indexpatterns.h ./models/user.o: templates/patterns.h templates/changepatterns.h core/cur.h -./models/user.o: core/system.h core/sessionmanager.h -./models/user.o: ../../pikotools/src/html/htmlparser.h db/db.h db/dbbase.h -./models/user.o: db/dbconn.h db/dbtextstream.h core/textstream.h core/error.h +./models/user.o: core/system.h core/job.h ./core/basethread.h +./models/user.o: ./core/winixmodeldeprecated.h core/jobtask.h core/request.h +./models/user.o: ./core/cur.h ./core/request.h ./core/error.h ./core/config.h +./models/user.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./models/user.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./models/user.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./models/user.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./models/user.o: db/dbtextstream.h core/textstream.h core/error.h ./models/user.o: models/user.h models/group.h core/dircontainer.h -./models/user.o: core/ugcontainer.h ./core/winixbase.h core/winixrequest.h -./models/user.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./models/user.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./models/user.o: core/slog.h ./core/cur.h ./core/request.h ./core/error.h -./models/user.o: ./core/config.h ./core/textstream.h models/winixmodel.h -./models/user.o: ./core/header.h ./core/session.h ./core/rebus.h -./models/user.o: ./core/ipban.h ./core/mount.h templates/locale.h +./models/user.o: core/ugcontainer.h ./core/mountparser.h ./core/session.h +./models/user.o: ./core/rebus.h ./core/ipban.h core/loadavg.h core/dirs.h +./models/user.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./models/user.o: core/groups.h core/ugcontainer.h core/image.h +./models/user.o: core/threadmanager.h models/winixmodelconnector.h +./models/user.o: notify/notify.h core/winixmodeldeprecated.h +./models/user.o: notify/notifypool.h templates/locale.h templates/patterns.h +./models/user.o: notify/notifythread.h core/basethread.h +./models/user.o: notify/templatesnotify.h core/users.h ./core/lastcontainer.h +./models/user.o: core/timezones.h core/timezone.h core/sessionmanager.h +./models/user.o: ../../pikotools/src/html/htmlparser.h core/winixrequest.h +./models/user.o: core/winixsystem.h core/slog.h ./models/winixmodel.o: models/winixmodel.h ../../morm/src/model.h ./models/winixmodel.o: ../../pikotools/src/textstream/textstream.h ./models/winixmodel.o: ../../pikotools/src/textstream/stream.h @@ -6553,26 +7019,31 @@ ./notify/notify.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./notify/notify.o: ../../ezc/src/patternparser.h notify/notifythread.h ./notify/notify.o: core/basethread.h notify/templatesnotify.h -./notify/notify.o: core/textstream.h core/users.h templates/templates.h -./notify/notify.o: templates/patterncacher.h models/item.h -./notify/notify.o: models/winixmodel.h models/winixmodelconnector.h -./notify/notify.o: models/itemcontent.h templates/htmltextstream.h +./notify/notify.o: core/textstream.h core/users.h models/user.h ./notify/notify.o: templates/misc.h templates/htmltextstream.h -./notify/notify.o: templates/indexpatterns.h templates/patterns.h -./notify/notify.o: templates/changepatterns.h core/cur.h core/system.h -./notify/notify.o: core/sessionmanager.h -./notify/notify.o: ../../pikotools/src/html/htmlparser.h db/db.h db/dbbase.h -./notify/notify.o: db/dbconn.h db/dbtextstream.h core/error.h models/user.h -./notify/notify.o: models/group.h core/dircontainer.h core/ugcontainer.h -./notify/notify.o: ./core/winixbase.h core/winixrequest.h core/winixsystem.h -./notify/notify.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./notify/notify.o: ./core/pluginmsg.h ./core/plugindata.h core/slog.h -./notify/notify.o: ./core/cur.h ./core/request.h ./core/requesttypes.h -./notify/notify.o: ./core/error.h ./core/config.h ./core/textstream.h -./notify/notify.o: models/winixmodel.h ./core/header.h ./core/session.h -./notify/notify.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./notify/notify.o: core/request.h core/dirs.h ./core/dircontainer.h -./notify/notify.o: core/plugin.h +./notify/notify.o: models/winixmodel.h models/winixmodelconnector.h +./notify/notify.o: core/ugcontainer.h ./core/lastcontainer.h +./notify/notify.o: ./core/winixbase.h ./core/cur.h ./core/request.h +./notify/notify.o: ./core/requesttypes.h models/item.h models/itemcontent.h +./notify/notify.o: templates/htmltextstream.h ./core/error.h ./core/config.h +./notify/notify.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./notify/notify.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./notify/notify.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./notify/notify.o: ./core/mount.h ./core/mounts.h db/db.h db/dbbase.h +./notify/notify.o: db/dbconn.h db/dbtextstream.h core/error.h models/group.h +./notify/notify.o: core/dircontainer.h core/ugcontainer.h +./notify/notify.o: ./core/mountparser.h ./core/session.h ./core/rebus.h +./notify/notify.o: ./core/ipban.h templates/templates.h +./notify/notify.o: templates/patterncacher.h templates/indexpatterns.h +./notify/notify.o: templates/patterns.h templates/changepatterns.h core/cur.h +./notify/notify.o: core/system.h core/job.h ./core/basethread.h +./notify/notify.o: core/jobtask.h core/request.h core/loadavg.h core/dirs.h +./notify/notify.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./notify/notify.o: core/groups.h core/image.h core/threadmanager.h +./notify/notify.o: models/winixmodelconnector.h notify/notify.h +./notify/notify.o: core/timezones.h core/timezone.h core/sessionmanager.h +./notify/notify.o: ../../pikotools/src/html/htmlparser.h core/winixrequest.h +./notify/notify.o: core/winixsystem.h core/slog.h core/dirs.h core/plugin.h ./notify/notifypool.o: notify/notifypool.h templates/locale.h ./notify/notifythread.o: notify/notifythread.h core/basethread.h ./notify/notifythread.o: notify/templatesnotify.h ../../ezc/src/ezc.h @@ -6630,14 +7101,30 @@ ./notify/notifythread.o: ../../morm/src/postgresqlconnector.h ./notify/notifythread.o: ../../morm/src/postgresqlqueryresult.h ./notify/notifythread.o: ../../morm/src/transaction.h core/users.h -./notify/notifythread.o: templates/patterns.h templates/locale.h +./notify/notifythread.o: models/user.h templates/misc.h +./notify/notifythread.o: templates/localefilter.h templates/locale.h ./notify/notifythread.o: core/winixbase.h core/log.h core/synchro.h ./notify/notifythread.o: core/filelog.h core/lock.h ./core/synchro.h ./notify/notifythread.o: ../../pikotools/src/convert/patternreplacer.h ./notify/notifythread.o: ../../pikotools/src/convert/strtoint.h ./notify/notifythread.o: ../../pikotools/src/convert/text.h ./notify/notifythread.o: ../../pikotools/src/convert/misc.h -./notify/notifythread.o: templates/localefilter.h +./notify/notifythread.o: templates/htmltextstream.h models/winixmodel.h +./notify/notifythread.o: models/winixmodelconnector.h core/ugcontainer.h +./notify/notifythread.o: ./core/lastcontainer.h ./core/winixbase.h +./notify/notifythread.o: ./core/cur.h ./core/request.h ./core/requesttypes.h +./notify/notifythread.o: models/item.h models/itemcontent.h +./notify/notifythread.o: templates/htmltextstream.h ./core/error.h +./notify/notifythread.o: ./core/config.h ./core/textstream.h +./notify/notifythread.o: models/winixmodel.h ./core/header.h +./notify/notifythread.o: ./core/compress.h ./core/plugin.h ./core/pluginmsg.h +./notify/notifythread.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./notify/notifythread.o: ./core/mount.h ./core/mounts.h db/db.h db/dbbase.h +./notify/notifythread.o: db/dbconn.h db/dbtextstream.h core/error.h +./notify/notifythread.o: models/group.h core/dircontainer.h +./notify/notifythread.o: core/ugcontainer.h ./core/mountparser.h +./notify/notifythread.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./notify/notifythread.o: templates/patterns.h ./notify/templatesnotify.o: notify/templatesnotify.h ../../ezc/src/ezc.h ./notify/templatesnotify.o: ../../morm/src/version.h ./notify/templatesnotify.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h @@ -6759,20 +7246,31 @@ ./templates/adduser.o: ../../pikotools/src/convert/strtoint.h ./templates/adduser.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/adduser.o: templates/patterns.h templates/changepatterns.h -./templates/adduser.o: core/cur.h core/system.h core/sessionmanager.h -./templates/adduser.o: ../../pikotools/src/html/htmlparser.h db/db.h -./templates/adduser.o: db/dbbase.h db/dbconn.h db/dbtextstream.h +./templates/adduser.o: core/cur.h core/system.h core/job.h +./templates/adduser.o: ./core/basethread.h ./core/winixmodeldeprecated.h +./templates/adduser.o: core/jobtask.h core/request.h ./core/cur.h +./templates/adduser.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./templates/adduser.o: ./core/config.h ./core/textstream.h +./templates/adduser.o: models/winixmodel.h ./core/header.h ./core/compress.h +./templates/adduser.o: ./core/winixbase.h ./core/plugin.h ./core/pluginmsg.h +./templates/adduser.o: ./core/plugindata.h ./core/mount.h ./core/mounts.h +./templates/adduser.o: db/db.h db/dbbase.h db/dbconn.h db/dbtextstream.h ./templates/adduser.o: core/textstream.h core/error.h models/user.h ./templates/adduser.o: models/group.h core/dircontainer.h core/ugcontainer.h -./templates/adduser.o: ./core/winixbase.h core/winixrequest.h -./templates/adduser.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./templates/adduser.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./templates/adduser.o: core/slog.h ./core/cur.h ./core/request.h -./templates/adduser.o: ./core/requesttypes.h ./core/error.h ./core/config.h -./templates/adduser.o: ./core/textstream.h models/winixmodel.h -./templates/adduser.o: ./core/header.h ./core/session.h ./core/rebus.h -./templates/adduser.o: ./core/ipban.h ./core/mount.h templates/locale.h -./templates/adduser.o: core/request.h +./templates/adduser.o: ./core/mountparser.h ./core/session.h ./core/rebus.h +./templates/adduser.o: ./core/ipban.h core/loadavg.h core/dirs.h +./templates/adduser.o: core/dircontainer.h core/crypt.h core/run.h +./templates/adduser.o: core/users.h core/groups.h core/ugcontainer.h +./templates/adduser.o: core/image.h core/threadmanager.h +./templates/adduser.o: models/winixmodelconnector.h notify/notify.h +./templates/adduser.o: core/winixmodeldeprecated.h notify/notifypool.h +./templates/adduser.o: templates/locale.h templates/patterns.h +./templates/adduser.o: notify/notifythread.h core/basethread.h +./templates/adduser.o: notify/templatesnotify.h core/users.h +./templates/adduser.o: ./core/lastcontainer.h core/timezones.h +./templates/adduser.o: core/timezone.h core/sessionmanager.h +./templates/adduser.o: ../../pikotools/src/html/htmlparser.h +./templates/adduser.o: core/winixrequest.h core/winixsystem.h core/slog.h ./templates/antispam.o: ./templates/templates.h ../../ezc/src/ezc.h ./templates/antispam.o: ../../morm/src/version.h ../../ezc/src/generator.h ./templates/antispam.o: ../../ezc/src/blocks.h ../../ezc/src/item.h @@ -6839,21 +7337,32 @@ ./templates/antispam.o: ../../pikotools/src/convert/strtoint.h ./templates/antispam.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/antispam.o: templates/patterns.h templates/changepatterns.h -./templates/antispam.o: core/cur.h core/system.h core/sessionmanager.h -./templates/antispam.o: ../../pikotools/src/html/htmlparser.h db/db.h -./templates/antispam.o: db/dbbase.h db/dbconn.h db/dbtextstream.h -./templates/antispam.o: core/textstream.h core/error.h models/user.h -./templates/antispam.o: models/group.h core/dircontainer.h core/ugcontainer.h -./templates/antispam.o: ./core/winixbase.h core/winixrequest.h -./templates/antispam.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./templates/antispam.o: ./core/plugin.h ./core/pluginmsg.h -./templates/antispam.o: ./core/plugindata.h core/slog.h ./core/cur.h +./templates/antispam.o: core/cur.h core/system.h core/job.h +./templates/antispam.o: ./core/basethread.h ./core/winixmodeldeprecated.h +./templates/antispam.o: core/jobtask.h core/request.h ./core/cur.h ./templates/antispam.o: ./core/request.h ./core/requesttypes.h ./core/error.h ./templates/antispam.o: ./core/config.h ./core/textstream.h -./templates/antispam.o: models/winixmodel.h ./core/header.h ./core/session.h -./templates/antispam.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./templates/antispam.o: templates/locale.h core/request.h core/misc.h -./templates/antispam.o: core/winix_const.h +./templates/antispam.o: models/winixmodel.h ./core/header.h ./core/compress.h +./templates/antispam.o: ./core/winixbase.h ./core/plugin.h ./core/pluginmsg.h +./templates/antispam.o: ./core/plugindata.h ./core/mount.h ./core/mounts.h +./templates/antispam.o: db/db.h db/dbbase.h db/dbconn.h db/dbtextstream.h +./templates/antispam.o: core/textstream.h core/error.h models/user.h +./templates/antispam.o: models/group.h core/dircontainer.h core/ugcontainer.h +./templates/antispam.o: ./core/mountparser.h ./core/session.h ./core/rebus.h +./templates/antispam.o: ./core/ipban.h core/loadavg.h core/dirs.h +./templates/antispam.o: core/dircontainer.h core/crypt.h core/run.h +./templates/antispam.o: core/users.h core/groups.h core/ugcontainer.h +./templates/antispam.o: core/image.h core/threadmanager.h +./templates/antispam.o: models/winixmodelconnector.h notify/notify.h +./templates/antispam.o: core/winixmodeldeprecated.h notify/notifypool.h +./templates/antispam.o: templates/locale.h templates/patterns.h +./templates/antispam.o: notify/notifythread.h core/basethread.h +./templates/antispam.o: notify/templatesnotify.h core/users.h +./templates/antispam.o: ./core/lastcontainer.h core/timezones.h +./templates/antispam.o: core/timezone.h core/sessionmanager.h +./templates/antispam.o: ../../pikotools/src/html/htmlparser.h +./templates/antispam.o: core/winixrequest.h core/winixsystem.h core/slog.h +./templates/antispam.o: core/misc.h core/winix_const.h ./templates/antispam.o: ../../pikotools/src/convert/convert.h ./templates/antispam.o: ../../pikotools/src/convert/inttostr.h ./templates/antispam.o: ../../pikotools/src/convert/patternreplacer.h @@ -6975,19 +7484,30 @@ ./templates/config.o: ../../pikotools/src/convert/strtoint.h ./templates/config.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/config.o: templates/patterns.h templates/changepatterns.h -./templates/config.o: core/cur.h core/system.h core/sessionmanager.h -./templates/config.o: ../../pikotools/src/html/htmlparser.h db/db.h -./templates/config.o: db/dbbase.h db/dbconn.h db/dbtextstream.h -./templates/config.o: core/textstream.h core/error.h models/user.h -./templates/config.o: models/group.h core/dircontainer.h core/ugcontainer.h -./templates/config.o: ./core/winixbase.h core/winixrequest.h -./templates/config.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./templates/config.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./templates/config.o: core/slog.h ./core/cur.h ./core/request.h +./templates/config.o: core/cur.h core/system.h core/job.h ./core/basethread.h +./templates/config.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/config.o: core/request.h ./core/cur.h ./core/request.h ./templates/config.o: ./core/requesttypes.h ./core/error.h ./core/config.h ./templates/config.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./templates/config.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./templates/config.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./templates/config.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./templates/config.o: db/dbtextstream.h core/textstream.h core/error.h +./templates/config.o: models/user.h models/group.h core/dircontainer.h +./templates/config.o: core/ugcontainer.h ./core/mountparser.h ./templates/config.o: ./core/session.h ./core/rebus.h ./core/ipban.h -./templates/config.o: ./core/mount.h templates/locale.h +./templates/config.o: core/loadavg.h core/dirs.h core/dircontainer.h +./templates/config.o: core/crypt.h core/run.h core/users.h core/groups.h +./templates/config.o: core/ugcontainer.h core/image.h core/threadmanager.h +./templates/config.o: models/winixmodelconnector.h notify/notify.h +./templates/config.o: core/winixmodeldeprecated.h notify/notifypool.h +./templates/config.o: templates/locale.h templates/patterns.h +./templates/config.o: notify/notifythread.h core/basethread.h +./templates/config.o: notify/templatesnotify.h core/users.h +./templates/config.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/config.o: core/sessionmanager.h +./templates/config.o: ../../pikotools/src/html/htmlparser.h +./templates/config.o: core/winixrequest.h core/winixsystem.h core/slog.h ./templates/currentdate.o: ./templates/templates.h ../../ezc/src/ezc.h ./templates/currentdate.o: ../../morm/src/version.h ../../ezc/src/generator.h ./templates/currentdate.o: ../../ezc/src/blocks.h ../../ezc/src/item.h @@ -7058,32 +7578,40 @@ ./templates/currentdate.o: templates/htmltextstream.h ./templates/currentdate.o: templates/indexpatterns.h templates/patterns.h ./templates/currentdate.o: templates/changepatterns.h core/cur.h -./templates/currentdate.o: core/system.h core/sessionmanager.h -./templates/currentdate.o: ../../pikotools/src/html/htmlparser.h db/db.h -./templates/currentdate.o: db/dbbase.h db/dbconn.h db/dbtextstream.h -./templates/currentdate.o: core/textstream.h core/error.h models/user.h -./templates/currentdate.o: models/group.h core/dircontainer.h -./templates/currentdate.o: core/ugcontainer.h ./core/winixbase.h -./templates/currentdate.o: core/winixrequest.h core/winixsystem.h -./templates/currentdate.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./templates/currentdate.o: ./core/pluginmsg.h ./core/plugindata.h core/slog.h -./templates/currentdate.o: ./core/cur.h ./core/request.h +./templates/currentdate.o: core/system.h core/job.h ./core/basethread.h +./templates/currentdate.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/currentdate.o: core/request.h ./core/cur.h ./core/request.h ./templates/currentdate.o: ./core/requesttypes.h ./core/error.h ./templates/currentdate.o: ./core/config.h ./core/textstream.h ./templates/currentdate.o: models/winixmodel.h ./core/header.h +./templates/currentdate.o: ./core/compress.h ./core/winixbase.h +./templates/currentdate.o: ./core/plugin.h ./core/pluginmsg.h +./templates/currentdate.o: ./core/plugindata.h ./core/mount.h ./core/mounts.h +./templates/currentdate.o: db/db.h db/dbbase.h db/dbconn.h db/dbtextstream.h +./templates/currentdate.o: core/textstream.h core/error.h models/user.h +./templates/currentdate.o: models/group.h core/dircontainer.h +./templates/currentdate.o: core/ugcontainer.h ./core/mountparser.h ./templates/currentdate.o: ./core/session.h ./core/rebus.h ./core/ipban.h -./templates/currentdate.o: ./core/mount.h templates/locale.h core/misc.h -./templates/currentdate.o: core/winix_const.h +./templates/currentdate.o: core/loadavg.h core/dirs.h core/dircontainer.h +./templates/currentdate.o: core/crypt.h core/run.h core/users.h core/groups.h +./templates/currentdate.o: core/ugcontainer.h core/image.h +./templates/currentdate.o: core/threadmanager.h models/winixmodelconnector.h +./templates/currentdate.o: notify/notify.h core/winixmodeldeprecated.h +./templates/currentdate.o: notify/notifypool.h templates/locale.h +./templates/currentdate.o: templates/patterns.h notify/notifythread.h +./templates/currentdate.o: core/basethread.h notify/templatesnotify.h +./templates/currentdate.o: core/users.h ./core/lastcontainer.h +./templates/currentdate.o: core/timezones.h core/timezone.h +./templates/currentdate.o: core/sessionmanager.h +./templates/currentdate.o: ../../pikotools/src/html/htmlparser.h +./templates/currentdate.o: core/winixrequest.h core/winixsystem.h core/slog.h +./templates/currentdate.o: core/misc.h core/winix_const.h ./templates/currentdate.o: ../../pikotools/src/convert/convert.h ./templates/currentdate.o: ../../pikotools/src/convert/inttostr.h ./templates/currentdate.o: ../../pikotools/src/convert/patternreplacer.h ./templates/currentdate.o: ../../pikotools/src/convert/double.h ./templates/currentdate.o: functions/functions.h functions/functionbase.h -./templates/currentdate.o: core/request.h notify/notify.h -./templates/currentdate.o: core/winixmodeldeprecated.h notify/notifypool.h -./templates/currentdate.o: templates/patterns.h notify/notifythread.h -./templates/currentdate.o: core/basethread.h notify/templatesnotify.h -./templates/currentdate.o: core/users.h functions/functionparser.h +./templates/currentdate.o: functions/functionparser.h core/dirs.h ./templates/currentdate.o: functions/account.h functions/adduser.h ./templates/currentdate.o: functions/cat.h functions/chmod.h ./templates/currentdate.o: functions/privchanger.h functions/chown.h @@ -7098,12 +7626,12 @@ ./templates/currentdate.o: functions/nicedit.h functions/node.h ./templates/currentdate.o: functions/passwd.h functions/priv.h functions/pw.h ./templates/currentdate.o: functions/reload.h functions/rm.h -./templates/currentdate.o: functions/rmuser.h ./core/run.h functions/sort.h +./templates/currentdate.o: functions/rmuser.h functions/sort.h ./templates/currentdate.o: functions/specialdefault.h functions/stat.h ./templates/currentdate.o: functions/subject.h functions/template.h -./templates/currentdate.o: ./core/timezone.h functions/tinymce.h -./templates/currentdate.o: functions/uname.h functions/upload.h -./templates/currentdate.o: functions/uptime.h functions/who.h functions/vim.h +./templates/currentdate.o: functions/tinymce.h functions/uname.h +./templates/currentdate.o: functions/upload.h functions/uptime.h +./templates/currentdate.o: functions/who.h functions/vim.h ./templates/dir.o: ./templates/templates.h ../../ezc/src/ezc.h ./templates/dir.o: ../../morm/src/version.h ../../ezc/src/generator.h ./templates/dir.o: ../../ezc/src/blocks.h ../../ezc/src/item.h @@ -7165,44 +7693,49 @@ ./templates/dir.o: ../../pikotools/src/convert/strtoint.h ./templates/dir.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/dir.o: templates/patterns.h templates/changepatterns.h core/cur.h -./templates/dir.o: core/system.h core/sessionmanager.h -./templates/dir.o: ../../pikotools/src/html/htmlparser.h db/db.h db/dbbase.h -./templates/dir.o: db/dbconn.h db/dbtextstream.h core/textstream.h -./templates/dir.o: core/error.h models/user.h models/group.h -./templates/dir.o: core/dircontainer.h core/ugcontainer.h ./core/winixbase.h -./templates/dir.o: core/winixrequest.h core/winixsystem.h -./templates/dir.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./templates/dir.o: ./core/pluginmsg.h ./core/plugindata.h core/slog.h -./templates/dir.o: ./core/cur.h ./core/request.h ./core/requesttypes.h -./templates/dir.o: ./core/error.h ./core/config.h ./core/textstream.h -./templates/dir.o: models/winixmodel.h ./core/header.h ./core/session.h -./templates/dir.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./templates/dir.o: templates/locale.h core/misc.h core/winix_const.h -./templates/dir.o: ../../pikotools/src/convert/convert.h +./templates/dir.o: core/system.h core/job.h ./core/basethread.h +./templates/dir.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/dir.o: core/request.h ./core/cur.h ./core/request.h +./templates/dir.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./templates/dir.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./templates/dir.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./templates/dir.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./templates/dir.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./templates/dir.o: db/dbtextstream.h core/textstream.h core/error.h +./templates/dir.o: models/user.h models/group.h core/dircontainer.h +./templates/dir.o: core/ugcontainer.h ./core/mountparser.h ./core/session.h +./templates/dir.o: ./core/rebus.h ./core/ipban.h core/loadavg.h core/dirs.h +./templates/dir.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./templates/dir.o: core/groups.h core/ugcontainer.h core/image.h +./templates/dir.o: core/threadmanager.h models/winixmodelconnector.h +./templates/dir.o: notify/notify.h core/winixmodeldeprecated.h +./templates/dir.o: notify/notifypool.h templates/locale.h +./templates/dir.o: templates/patterns.h notify/notifythread.h +./templates/dir.o: core/basethread.h notify/templatesnotify.h core/users.h +./templates/dir.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/dir.o: core/sessionmanager.h +./templates/dir.o: ../../pikotools/src/html/htmlparser.h core/winixrequest.h +./templates/dir.o: core/winixsystem.h core/slog.h core/misc.h +./templates/dir.o: core/winix_const.h ../../pikotools/src/convert/convert.h ./templates/dir.o: ../../pikotools/src/convert/inttostr.h ./templates/dir.o: ../../pikotools/src/convert/patternreplacer.h ./templates/dir.o: ../../pikotools/src/convert/double.h functions/functions.h -./templates/dir.o: functions/functionbase.h core/request.h notify/notify.h -./templates/dir.o: core/winixmodeldeprecated.h notify/notifypool.h -./templates/dir.o: templates/patterns.h notify/notifythread.h -./templates/dir.o: core/basethread.h notify/templatesnotify.h core/users.h -./templates/dir.o: functions/functionparser.h functions/account.h -./templates/dir.o: functions/adduser.h functions/cat.h functions/chmod.h -./templates/dir.o: functions/privchanger.h functions/chown.h -./templates/dir.o: functions/ckeditor.h functions/cp.h functions/default.h -./templates/dir.o: functions/download.h functions/emacs.h functions/env.h -./templates/dir.o: models/userwrapper.h models/user.h functions/imgcrop.h -./templates/dir.o: functions/last.h functions/login.h functions/logout.h -./templates/dir.o: functions/ln.h functions/ls.h functions/man.h -./templates/dir.o: functions/meta.h functions/mkdir.h functions/mv.h -./templates/dir.o: functions/nicedit.h functions/node.h functions/passwd.h -./templates/dir.o: functions/priv.h functions/pw.h functions/reload.h -./templates/dir.o: functions/rm.h functions/rmuser.h ./core/run.h +./templates/dir.o: functions/functionbase.h functions/functionparser.h +./templates/dir.o: core/dirs.h functions/account.h functions/adduser.h +./templates/dir.o: functions/cat.h functions/chmod.h functions/privchanger.h +./templates/dir.o: functions/chown.h functions/ckeditor.h functions/cp.h +./templates/dir.o: functions/default.h functions/download.h functions/emacs.h +./templates/dir.o: functions/env.h models/userwrapper.h models/user.h +./templates/dir.o: functions/imgcrop.h functions/last.h functions/login.h +./templates/dir.o: functions/logout.h functions/ln.h functions/ls.h +./templates/dir.o: functions/man.h functions/meta.h functions/mkdir.h +./templates/dir.o: functions/mv.h functions/nicedit.h functions/node.h +./templates/dir.o: functions/passwd.h functions/priv.h functions/pw.h +./templates/dir.o: functions/reload.h functions/rm.h functions/rmuser.h ./templates/dir.o: functions/sort.h functions/specialdefault.h ./templates/dir.o: functions/stat.h functions/subject.h functions/template.h -./templates/dir.o: ./core/timezone.h functions/tinymce.h functions/uname.h -./templates/dir.o: functions/upload.h functions/uptime.h functions/who.h -./templates/dir.o: functions/vim.h +./templates/dir.o: functions/tinymce.h functions/uname.h functions/upload.h +./templates/dir.o: functions/uptime.h functions/who.h functions/vim.h ./templates/doc.o: ./templates/templates.h ../../ezc/src/ezc.h ./templates/doc.o: ../../morm/src/version.h ../../ezc/src/generator.h ./templates/doc.o: ../../ezc/src/blocks.h ../../ezc/src/item.h @@ -7264,19 +7797,29 @@ ./templates/doc.o: ../../pikotools/src/convert/strtoint.h ./templates/doc.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/doc.o: templates/patterns.h templates/changepatterns.h core/cur.h -./templates/doc.o: core/system.h core/sessionmanager.h -./templates/doc.o: ../../pikotools/src/html/htmlparser.h db/db.h db/dbbase.h -./templates/doc.o: db/dbconn.h db/dbtextstream.h core/textstream.h -./templates/doc.o: core/error.h models/user.h models/group.h -./templates/doc.o: core/dircontainer.h core/ugcontainer.h ./core/winixbase.h -./templates/doc.o: core/winixrequest.h core/winixsystem.h -./templates/doc.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./templates/doc.o: ./core/pluginmsg.h ./core/plugindata.h core/slog.h -./templates/doc.o: ./core/cur.h ./core/request.h ./core/requesttypes.h -./templates/doc.o: ./core/error.h ./core/config.h ./core/textstream.h -./templates/doc.o: models/winixmodel.h ./core/header.h ./core/session.h -./templates/doc.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./templates/doc.o: templates/locale.h core/request.h core/misc.h +./templates/doc.o: core/system.h core/job.h ./core/basethread.h +./templates/doc.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/doc.o: core/request.h ./core/cur.h ./core/request.h +./templates/doc.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./templates/doc.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./templates/doc.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./templates/doc.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./templates/doc.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./templates/doc.o: db/dbtextstream.h core/textstream.h core/error.h +./templates/doc.o: models/user.h models/group.h core/dircontainer.h +./templates/doc.o: core/ugcontainer.h ./core/mountparser.h ./core/session.h +./templates/doc.o: ./core/rebus.h ./core/ipban.h core/loadavg.h core/dirs.h +./templates/doc.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./templates/doc.o: core/groups.h core/ugcontainer.h core/image.h +./templates/doc.o: core/threadmanager.h models/winixmodelconnector.h +./templates/doc.o: notify/notify.h core/winixmodeldeprecated.h +./templates/doc.o: notify/notifypool.h templates/locale.h +./templates/doc.o: templates/patterns.h notify/notifythread.h +./templates/doc.o: core/basethread.h notify/templatesnotify.h core/users.h +./templates/doc.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/doc.o: core/sessionmanager.h +./templates/doc.o: ../../pikotools/src/html/htmlparser.h core/winixrequest.h +./templates/doc.o: core/winixsystem.h core/slog.h core/misc.h ./templates/doc.o: core/winix_const.h ../../pikotools/src/convert/convert.h ./templates/doc.o: ../../pikotools/src/convert/inttostr.h ./templates/doc.o: ../../pikotools/src/convert/patternreplacer.h @@ -7346,19 +7889,31 @@ ./templates/filters.o: ../../pikotools/src/convert/strtoint.h ./templates/filters.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/filters.o: templates/patterns.h templates/changepatterns.h -./templates/filters.o: core/cur.h core/system.h core/sessionmanager.h -./templates/filters.o: ../../pikotools/src/html/htmlparser.h db/db.h -./templates/filters.o: db/dbbase.h db/dbconn.h db/dbtextstream.h +./templates/filters.o: core/cur.h core/system.h core/job.h +./templates/filters.o: ./core/basethread.h ./core/winixmodeldeprecated.h +./templates/filters.o: core/jobtask.h core/request.h ./core/cur.h +./templates/filters.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./templates/filters.o: ./core/config.h ./core/textstream.h +./templates/filters.o: models/winixmodel.h ./core/header.h ./core/compress.h +./templates/filters.o: ./core/winixbase.h ./core/plugin.h ./core/pluginmsg.h +./templates/filters.o: ./core/plugindata.h ./core/mount.h ./core/mounts.h +./templates/filters.o: db/db.h db/dbbase.h db/dbconn.h db/dbtextstream.h ./templates/filters.o: core/textstream.h core/error.h models/user.h ./templates/filters.o: models/group.h core/dircontainer.h core/ugcontainer.h -./templates/filters.o: ./core/winixbase.h core/winixrequest.h -./templates/filters.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./templates/filters.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./templates/filters.o: core/slog.h ./core/cur.h ./core/request.h -./templates/filters.o: ./core/requesttypes.h ./core/error.h ./core/config.h -./templates/filters.o: ./core/textstream.h models/winixmodel.h -./templates/filters.o: ./core/header.h ./core/session.h ./core/rebus.h -./templates/filters.o: ./core/ipban.h ./core/mount.h templates/locale.h +./templates/filters.o: ./core/mountparser.h ./core/session.h ./core/rebus.h +./templates/filters.o: ./core/ipban.h core/loadavg.h core/dirs.h +./templates/filters.o: core/dircontainer.h core/crypt.h core/run.h +./templates/filters.o: core/users.h core/groups.h core/ugcontainer.h +./templates/filters.o: core/image.h core/threadmanager.h +./templates/filters.o: models/winixmodelconnector.h notify/notify.h +./templates/filters.o: core/winixmodeldeprecated.h notify/notifypool.h +./templates/filters.o: templates/locale.h templates/patterns.h +./templates/filters.o: notify/notifythread.h core/basethread.h +./templates/filters.o: notify/templatesnotify.h core/users.h +./templates/filters.o: ./core/lastcontainer.h core/timezones.h +./templates/filters.o: core/timezone.h core/sessionmanager.h +./templates/filters.o: ../../pikotools/src/html/htmlparser.h +./templates/filters.o: core/winixrequest.h core/winixsystem.h core/slog.h ./templates/filters.o: core/misc.h core/winix_const.h ./templates/filters.o: ../../pikotools/src/convert/convert.h ./templates/filters.o: ../../pikotools/src/convert/inttostr.h @@ -7430,20 +7985,32 @@ ./templates/generic.o: ../../pikotools/src/convert/strtoint.h ./templates/generic.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/generic.o: templates/patterns.h templates/changepatterns.h -./templates/generic.o: core/cur.h core/system.h core/sessionmanager.h -./templates/generic.o: ../../pikotools/src/html/htmlparser.h db/db.h -./templates/generic.o: db/dbbase.h db/dbconn.h db/dbtextstream.h +./templates/generic.o: core/cur.h core/system.h core/job.h +./templates/generic.o: ./core/basethread.h ./core/winixmodeldeprecated.h +./templates/generic.o: core/jobtask.h core/request.h ./core/cur.h +./templates/generic.o: ./core/request.h ./core/requesttypes.h ./core/error.h +./templates/generic.o: ./core/config.h ./core/textstream.h +./templates/generic.o: models/winixmodel.h ./core/header.h ./core/compress.h +./templates/generic.o: ./core/winixbase.h ./core/plugin.h ./core/pluginmsg.h +./templates/generic.o: ./core/plugindata.h ./core/mount.h ./core/mounts.h +./templates/generic.o: db/db.h db/dbbase.h db/dbconn.h db/dbtextstream.h ./templates/generic.o: core/textstream.h core/error.h models/user.h ./templates/generic.o: models/group.h core/dircontainer.h core/ugcontainer.h -./templates/generic.o: ./core/winixbase.h core/winixrequest.h -./templates/generic.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./templates/generic.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./templates/generic.o: core/slog.h ./core/cur.h ./core/request.h -./templates/generic.o: ./core/requesttypes.h ./core/error.h ./core/config.h -./templates/generic.o: ./core/textstream.h models/winixmodel.h -./templates/generic.o: ./core/header.h ./core/session.h ./core/rebus.h -./templates/generic.o: ./core/ipban.h ./core/mount.h templates/locale.h -./templates/generic.o: core/request.h core/misc.h core/winix_const.h +./templates/generic.o: ./core/mountparser.h ./core/session.h ./core/rebus.h +./templates/generic.o: ./core/ipban.h core/loadavg.h core/dirs.h +./templates/generic.o: core/dircontainer.h core/crypt.h core/run.h +./templates/generic.o: core/users.h core/groups.h core/ugcontainer.h +./templates/generic.o: core/image.h core/threadmanager.h +./templates/generic.o: models/winixmodelconnector.h notify/notify.h +./templates/generic.o: core/winixmodeldeprecated.h notify/notifypool.h +./templates/generic.o: templates/locale.h templates/patterns.h +./templates/generic.o: notify/notifythread.h core/basethread.h +./templates/generic.o: notify/templatesnotify.h core/users.h +./templates/generic.o: ./core/lastcontainer.h core/timezones.h +./templates/generic.o: core/timezone.h core/sessionmanager.h +./templates/generic.o: ../../pikotools/src/html/htmlparser.h +./templates/generic.o: core/winixrequest.h core/winixsystem.h core/slog.h +./templates/generic.o: core/misc.h core/winix_const.h ./templates/generic.o: ../../pikotools/src/convert/convert.h ./templates/generic.o: ../../pikotools/src/convert/inttostr.h ./templates/generic.o: ../../pikotools/src/convert/patternreplacer.h @@ -7619,19 +8186,30 @@ ./templates/insert.o: ../../pikotools/src/convert/strtoint.h ./templates/insert.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/insert.o: templates/patterns.h templates/changepatterns.h -./templates/insert.o: core/cur.h core/system.h core/sessionmanager.h -./templates/insert.o: ../../pikotools/src/html/htmlparser.h db/db.h -./templates/insert.o: db/dbbase.h db/dbconn.h db/dbtextstream.h -./templates/insert.o: core/textstream.h core/error.h models/user.h -./templates/insert.o: models/group.h core/dircontainer.h core/ugcontainer.h -./templates/insert.o: ./core/winixbase.h core/winixrequest.h -./templates/insert.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./templates/insert.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./templates/insert.o: core/slog.h ./core/cur.h ./core/request.h +./templates/insert.o: core/cur.h core/system.h core/job.h ./core/basethread.h +./templates/insert.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/insert.o: core/request.h ./core/cur.h ./core/request.h ./templates/insert.o: ./core/requesttypes.h ./core/error.h ./core/config.h ./templates/insert.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./templates/insert.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./templates/insert.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./templates/insert.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./templates/insert.o: db/dbtextstream.h core/textstream.h core/error.h +./templates/insert.o: models/user.h models/group.h core/dircontainer.h +./templates/insert.o: core/ugcontainer.h ./core/mountparser.h ./templates/insert.o: ./core/session.h ./core/rebus.h ./core/ipban.h -./templates/insert.o: ./core/mount.h templates/locale.h core/request.h +./templates/insert.o: core/loadavg.h core/dirs.h core/dircontainer.h +./templates/insert.o: core/crypt.h core/run.h core/users.h core/groups.h +./templates/insert.o: core/ugcontainer.h core/image.h core/threadmanager.h +./templates/insert.o: models/winixmodelconnector.h notify/notify.h +./templates/insert.o: core/winixmodeldeprecated.h notify/notifypool.h +./templates/insert.o: templates/locale.h templates/patterns.h +./templates/insert.o: notify/notifythread.h core/basethread.h +./templates/insert.o: notify/templatesnotify.h core/users.h +./templates/insert.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/insert.o: core/sessionmanager.h +./templates/insert.o: ../../pikotools/src/html/htmlparser.h +./templates/insert.o: core/winixrequest.h core/winixsystem.h core/slog.h ./templates/insert.o: core/misc.h core/winix_const.h ./templates/insert.o: ../../pikotools/src/convert/convert.h ./templates/insert.o: ../../pikotools/src/convert/inttostr.h @@ -7699,44 +8277,50 @@ ./templates/ipban.o: ../../pikotools/src/convert/strtoint.h ./templates/ipban.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/ipban.o: templates/patterns.h templates/changepatterns.h -./templates/ipban.o: core/cur.h core/system.h core/sessionmanager.h -./templates/ipban.o: ../../pikotools/src/html/htmlparser.h db/db.h -./templates/ipban.o: db/dbbase.h db/dbconn.h db/dbtextstream.h -./templates/ipban.o: core/textstream.h core/error.h models/user.h -./templates/ipban.o: models/group.h core/dircontainer.h core/ugcontainer.h -./templates/ipban.o: ./core/winixbase.h core/winixrequest.h -./templates/ipban.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./templates/ipban.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./templates/ipban.o: core/slog.h ./core/cur.h ./core/request.h +./templates/ipban.o: core/cur.h core/system.h core/job.h ./core/basethread.h +./templates/ipban.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/ipban.o: core/request.h ./core/cur.h ./core/request.h ./templates/ipban.o: ./core/requesttypes.h ./core/error.h ./core/config.h ./templates/ipban.o: ./core/textstream.h models/winixmodel.h ./core/header.h -./templates/ipban.o: ./core/session.h ./core/rebus.h ./core/ipban.h -./templates/ipban.o: ./core/mount.h templates/locale.h core/request.h +./templates/ipban.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./templates/ipban.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./templates/ipban.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./templates/ipban.o: db/dbtextstream.h core/textstream.h core/error.h +./templates/ipban.o: models/user.h models/group.h core/dircontainer.h +./templates/ipban.o: core/ugcontainer.h ./core/mountparser.h ./core/session.h +./templates/ipban.o: ./core/rebus.h ./core/ipban.h core/loadavg.h core/dirs.h +./templates/ipban.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./templates/ipban.o: core/groups.h core/ugcontainer.h core/image.h +./templates/ipban.o: core/threadmanager.h models/winixmodelconnector.h +./templates/ipban.o: notify/notify.h core/winixmodeldeprecated.h +./templates/ipban.o: notify/notifypool.h templates/locale.h +./templates/ipban.o: templates/patterns.h notify/notifythread.h +./templates/ipban.o: core/basethread.h notify/templatesnotify.h core/users.h +./templates/ipban.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/ipban.o: core/sessionmanager.h +./templates/ipban.o: ../../pikotools/src/html/htmlparser.h +./templates/ipban.o: core/winixrequest.h core/winixsystem.h core/slog.h ./templates/ipban.o: core/misc.h core/winix_const.h ./templates/ipban.o: ../../pikotools/src/convert/convert.h ./templates/ipban.o: ../../pikotools/src/convert/inttostr.h ./templates/ipban.o: ../../pikotools/src/convert/patternreplacer.h ./templates/ipban.o: ../../pikotools/src/convert/double.h ./templates/ipban.o: functions/functions.h functions/functionbase.h -./templates/ipban.o: notify/notify.h core/winixmodeldeprecated.h -./templates/ipban.o: notify/notifypool.h templates/patterns.h -./templates/ipban.o: notify/notifythread.h core/basethread.h -./templates/ipban.o: notify/templatesnotify.h core/users.h -./templates/ipban.o: functions/functionparser.h functions/account.h -./templates/ipban.o: functions/adduser.h functions/cat.h functions/chmod.h -./templates/ipban.o: functions/privchanger.h functions/chown.h -./templates/ipban.o: functions/ckeditor.h functions/cp.h functions/default.h -./templates/ipban.o: functions/download.h functions/emacs.h functions/env.h -./templates/ipban.o: models/userwrapper.h models/user.h functions/imgcrop.h -./templates/ipban.o: functions/last.h functions/login.h functions/logout.h -./templates/ipban.o: functions/ln.h functions/ls.h functions/man.h -./templates/ipban.o: functions/meta.h functions/mkdir.h functions/mv.h -./templates/ipban.o: functions/nicedit.h functions/node.h functions/passwd.h -./templates/ipban.o: functions/priv.h functions/pw.h functions/reload.h -./templates/ipban.o: functions/rm.h functions/rmuser.h ./core/run.h -./templates/ipban.o: functions/sort.h functions/specialdefault.h -./templates/ipban.o: functions/stat.h functions/subject.h -./templates/ipban.o: functions/template.h ./core/timezone.h +./templates/ipban.o: functions/functionparser.h core/dirs.h +./templates/ipban.o: functions/account.h functions/adduser.h functions/cat.h +./templates/ipban.o: functions/chmod.h functions/privchanger.h +./templates/ipban.o: functions/chown.h functions/ckeditor.h functions/cp.h +./templates/ipban.o: functions/default.h functions/download.h +./templates/ipban.o: functions/emacs.h functions/env.h models/userwrapper.h +./templates/ipban.o: models/user.h functions/imgcrop.h functions/last.h +./templates/ipban.o: functions/login.h functions/logout.h functions/ln.h +./templates/ipban.o: functions/ls.h functions/man.h functions/meta.h +./templates/ipban.o: functions/mkdir.h functions/mv.h functions/nicedit.h +./templates/ipban.o: functions/node.h functions/passwd.h functions/priv.h +./templates/ipban.o: functions/pw.h functions/reload.h functions/rm.h +./templates/ipban.o: functions/rmuser.h functions/sort.h +./templates/ipban.o: functions/specialdefault.h functions/stat.h +./templates/ipban.o: functions/subject.h functions/template.h ./templates/ipban.o: functions/tinymce.h functions/uname.h functions/upload.h ./templates/ipban.o: functions/uptime.h functions/who.h functions/vim.h ./templates/locale.o: templates/locale.h @@ -7854,19 +8438,29 @@ ./templates/last.o: ../../pikotools/src/convert/strtoint.h ./templates/last.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/last.o: templates/patterns.h templates/changepatterns.h -./templates/last.o: core/cur.h core/system.h core/sessionmanager.h -./templates/last.o: ../../pikotools/src/html/htmlparser.h db/db.h db/dbbase.h -./templates/last.o: db/dbconn.h db/dbtextstream.h core/textstream.h -./templates/last.o: core/error.h models/user.h models/group.h -./templates/last.o: core/dircontainer.h core/ugcontainer.h ./core/winixbase.h -./templates/last.o: core/winixrequest.h core/winixsystem.h -./templates/last.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./templates/last.o: ./core/pluginmsg.h ./core/plugindata.h core/slog.h -./templates/last.o: ./core/cur.h ./core/request.h ./core/requesttypes.h -./templates/last.o: ./core/error.h ./core/config.h ./core/textstream.h -./templates/last.o: models/winixmodel.h ./core/header.h ./core/session.h -./templates/last.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./templates/last.o: templates/locale.h ./core/lastcontainer.h +./templates/last.o: core/cur.h core/system.h core/job.h ./core/basethread.h +./templates/last.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/last.o: core/request.h ./core/cur.h ./core/request.h +./templates/last.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./templates/last.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./templates/last.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./templates/last.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./templates/last.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./templates/last.o: db/dbtextstream.h core/textstream.h core/error.h +./templates/last.o: models/user.h models/group.h core/dircontainer.h +./templates/last.o: core/ugcontainer.h ./core/mountparser.h ./core/session.h +./templates/last.o: ./core/rebus.h ./core/ipban.h core/loadavg.h core/dirs.h +./templates/last.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./templates/last.o: core/groups.h core/ugcontainer.h core/image.h +./templates/last.o: core/threadmanager.h models/winixmodelconnector.h +./templates/last.o: notify/notify.h core/winixmodeldeprecated.h +./templates/last.o: notify/notifypool.h templates/locale.h +./templates/last.o: templates/patterns.h notify/notifythread.h +./templates/last.o: core/basethread.h notify/templatesnotify.h core/users.h +./templates/last.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/last.o: core/sessionmanager.h +./templates/last.o: ../../pikotools/src/html/htmlparser.h core/winixrequest.h +./templates/last.o: core/winixsystem.h core/slog.h ./core/lastcontainer.h ./templates/last.o: ./core/request.h ./core/misc.h core/winix_const.h ./templates/last.o: ../../pikotools/src/convert/convert.h ./templates/last.o: ../../pikotools/src/convert/inttostr.h @@ -7933,23 +8527,33 @@ ./templates/misc.o: ../../pikotools/src/convert/strtoint.h ./templates/misc.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/misc.o: templates/patterns.h templates/changepatterns.h -./templates/misc.o: core/cur.h core/system.h core/sessionmanager.h -./templates/misc.o: ../../pikotools/src/html/htmlparser.h db/db.h db/dbbase.h -./templates/misc.o: db/dbconn.h db/dbtextstream.h core/textstream.h -./templates/misc.o: core/error.h models/user.h models/group.h -./templates/misc.o: core/dircontainer.h core/ugcontainer.h ./core/winixbase.h -./templates/misc.o: core/winixrequest.h core/winixsystem.h -./templates/misc.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./templates/misc.o: ./core/pluginmsg.h ./core/plugindata.h core/slog.h -./templates/misc.o: ./core/cur.h ./core/request.h ./core/requesttypes.h -./templates/misc.o: ./core/error.h ./core/config.h ./core/textstream.h -./templates/misc.o: models/winixmodel.h ./core/header.h ./core/session.h -./templates/misc.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./templates/misc.o: templates/locale.h core/misc.h core/winix_const.h -./templates/misc.o: ../../pikotools/src/convert/convert.h +./templates/misc.o: core/cur.h core/system.h core/job.h ./core/basethread.h +./templates/misc.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/misc.o: core/request.h ./core/cur.h ./core/request.h +./templates/misc.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./templates/misc.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./templates/misc.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./templates/misc.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./templates/misc.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./templates/misc.o: db/dbtextstream.h core/textstream.h core/error.h +./templates/misc.o: models/user.h models/group.h core/dircontainer.h +./templates/misc.o: core/ugcontainer.h ./core/mountparser.h ./core/session.h +./templates/misc.o: ./core/rebus.h ./core/ipban.h core/loadavg.h core/dirs.h +./templates/misc.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./templates/misc.o: core/groups.h core/ugcontainer.h core/image.h +./templates/misc.o: core/threadmanager.h models/winixmodelconnector.h +./templates/misc.o: notify/notify.h core/winixmodeldeprecated.h +./templates/misc.o: notify/notifypool.h templates/locale.h +./templates/misc.o: templates/patterns.h notify/notifythread.h +./templates/misc.o: core/basethread.h notify/templatesnotify.h core/users.h +./templates/misc.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/misc.o: core/sessionmanager.h +./templates/misc.o: ../../pikotools/src/html/htmlparser.h core/winixrequest.h +./templates/misc.o: core/winixsystem.h core/slog.h core/misc.h +./templates/misc.o: core/winix_const.h ../../pikotools/src/convert/convert.h ./templates/misc.o: ../../pikotools/src/convert/inttostr.h ./templates/misc.o: ../../pikotools/src/convert/patternreplacer.h -./templates/misc.o: ../../pikotools/src/convert/double.h core/request.h +./templates/misc.o: ../../pikotools/src/convert/double.h ./templates/localefilter.o: templates/localefilter.h templates/locale.h ./templates/localefilter.o: ../../pikotools/src/space/spaceparser.h ./templates/localefilter.o: ../../pikotools/src/space/space.h @@ -8082,38 +8686,45 @@ ./templates/login.o: ../../pikotools/src/convert/strtoint.h ./templates/login.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/login.o: templates/patterns.h templates/changepatterns.h -./templates/login.o: core/cur.h core/system.h core/sessionmanager.h -./templates/login.o: ../../pikotools/src/html/htmlparser.h db/db.h -./templates/login.o: db/dbbase.h db/dbconn.h db/dbtextstream.h -./templates/login.o: core/textstream.h core/error.h models/user.h -./templates/login.o: models/group.h core/dircontainer.h core/ugcontainer.h -./templates/login.o: ./core/winixbase.h core/winixrequest.h -./templates/login.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./templates/login.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./templates/login.o: core/slog.h ./core/cur.h ./core/request.h +./templates/login.o: core/cur.h core/system.h core/job.h ./core/basethread.h +./templates/login.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/login.o: core/request.h ./core/cur.h ./core/request.h ./templates/login.o: ./core/requesttypes.h ./core/error.h ./core/config.h ./templates/login.o: ./core/textstream.h models/winixmodel.h ./core/header.h -./templates/login.o: ./core/session.h ./core/rebus.h ./core/ipban.h -./templates/login.o: ./core/mount.h templates/locale.h functions/functions.h -./templates/login.o: functions/functionbase.h core/request.h notify/notify.h -./templates/login.o: core/winixmodeldeprecated.h notify/notifypool.h +./templates/login.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./templates/login.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./templates/login.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./templates/login.o: db/dbtextstream.h core/textstream.h core/error.h +./templates/login.o: models/user.h models/group.h core/dircontainer.h +./templates/login.o: core/ugcontainer.h ./core/mountparser.h ./core/session.h +./templates/login.o: ./core/rebus.h ./core/ipban.h core/loadavg.h core/dirs.h +./templates/login.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./templates/login.o: core/groups.h core/ugcontainer.h core/image.h +./templates/login.o: core/threadmanager.h models/winixmodelconnector.h +./templates/login.o: notify/notify.h core/winixmodeldeprecated.h +./templates/login.o: notify/notifypool.h templates/locale.h ./templates/login.o: templates/patterns.h notify/notifythread.h ./templates/login.o: core/basethread.h notify/templatesnotify.h core/users.h -./templates/login.o: functions/functionparser.h functions/account.h -./templates/login.o: functions/adduser.h functions/cat.h functions/chmod.h -./templates/login.o: functions/privchanger.h functions/chown.h -./templates/login.o: functions/ckeditor.h functions/cp.h functions/default.h -./templates/login.o: functions/download.h functions/emacs.h functions/env.h -./templates/login.o: models/userwrapper.h models/user.h functions/imgcrop.h -./templates/login.o: functions/last.h functions/login.h functions/logout.h -./templates/login.o: functions/ln.h functions/ls.h functions/man.h -./templates/login.o: functions/meta.h functions/mkdir.h functions/mv.h -./templates/login.o: functions/nicedit.h functions/node.h functions/passwd.h -./templates/login.o: functions/priv.h functions/pw.h functions/reload.h -./templates/login.o: functions/rm.h functions/rmuser.h ./core/run.h -./templates/login.o: functions/sort.h functions/specialdefault.h -./templates/login.o: functions/stat.h functions/subject.h -./templates/login.o: functions/template.h ./core/timezone.h +./templates/login.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/login.o: core/sessionmanager.h +./templates/login.o: ../../pikotools/src/html/htmlparser.h +./templates/login.o: core/winixrequest.h core/winixsystem.h core/slog.h +./templates/login.o: functions/functions.h functions/functionbase.h +./templates/login.o: functions/functionparser.h core/dirs.h +./templates/login.o: functions/account.h functions/adduser.h functions/cat.h +./templates/login.o: functions/chmod.h functions/privchanger.h +./templates/login.o: functions/chown.h functions/ckeditor.h functions/cp.h +./templates/login.o: functions/default.h functions/download.h +./templates/login.o: functions/emacs.h functions/env.h models/userwrapper.h +./templates/login.o: models/user.h functions/imgcrop.h functions/last.h +./templates/login.o: functions/login.h functions/logout.h functions/ln.h +./templates/login.o: functions/ls.h functions/man.h functions/meta.h +./templates/login.o: functions/mkdir.h functions/mv.h functions/nicedit.h +./templates/login.o: functions/node.h functions/passwd.h functions/priv.h +./templates/login.o: functions/pw.h functions/reload.h functions/rm.h +./templates/login.o: functions/rmuser.h functions/sort.h +./templates/login.o: functions/specialdefault.h functions/stat.h +./templates/login.o: functions/subject.h functions/template.h ./templates/login.o: functions/tinymce.h functions/uname.h functions/upload.h ./templates/login.o: functions/uptime.h functions/who.h functions/vim.h ./templates/ls.o: ./templates/templates.h ../../ezc/src/ezc.h @@ -8175,19 +8786,28 @@ ./templates/ls.o: ../../pikotools/src/convert/strtoint.h ./templates/ls.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/ls.o: templates/patterns.h templates/changepatterns.h core/cur.h -./templates/ls.o: core/system.h core/sessionmanager.h -./templates/ls.o: ../../pikotools/src/html/htmlparser.h db/db.h db/dbbase.h -./templates/ls.o: db/dbconn.h db/dbtextstream.h core/textstream.h -./templates/ls.o: core/error.h models/user.h models/group.h -./templates/ls.o: core/dircontainer.h core/ugcontainer.h ./core/winixbase.h -./templates/ls.o: core/winixrequest.h core/winixsystem.h -./templates/ls.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./templates/ls.o: ./core/pluginmsg.h ./core/plugindata.h core/slog.h +./templates/ls.o: core/system.h core/job.h ./core/basethread.h +./templates/ls.o: ./core/winixmodeldeprecated.h core/jobtask.h core/request.h ./templates/ls.o: ./core/cur.h ./core/request.h ./core/requesttypes.h ./templates/ls.o: ./core/error.h ./core/config.h ./core/textstream.h -./templates/ls.o: models/winixmodel.h ./core/header.h ./core/session.h -./templates/ls.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./templates/ls.o: templates/locale.h core/request.h +./templates/ls.o: models/winixmodel.h ./core/header.h ./core/compress.h +./templates/ls.o: ./core/winixbase.h ./core/plugin.h ./core/pluginmsg.h +./templates/ls.o: ./core/plugindata.h ./core/mount.h ./core/mounts.h db/db.h +./templates/ls.o: db/dbbase.h db/dbconn.h db/dbtextstream.h core/textstream.h +./templates/ls.o: core/error.h models/user.h models/group.h +./templates/ls.o: core/dircontainer.h core/ugcontainer.h ./core/mountparser.h +./templates/ls.o: ./core/session.h ./core/rebus.h ./core/ipban.h +./templates/ls.o: core/loadavg.h core/dirs.h core/dircontainer.h core/crypt.h +./templates/ls.o: core/run.h core/users.h core/groups.h core/ugcontainer.h +./templates/ls.o: core/image.h core/threadmanager.h +./templates/ls.o: models/winixmodelconnector.h notify/notify.h +./templates/ls.o: core/winixmodeldeprecated.h notify/notifypool.h +./templates/ls.o: templates/locale.h templates/patterns.h +./templates/ls.o: notify/notifythread.h core/basethread.h +./templates/ls.o: notify/templatesnotify.h core/users.h +./templates/ls.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/ls.o: core/sessionmanager.h ../../pikotools/src/html/htmlparser.h +./templates/ls.o: core/winixrequest.h core/winixsystem.h core/slog.h ./templates/man.o: ./templates/templates.h ../../ezc/src/ezc.h ./templates/man.o: ../../morm/src/version.h ../../ezc/src/generator.h ./templates/man.o: ../../ezc/src/blocks.h ../../ezc/src/item.h @@ -8249,44 +8869,49 @@ ./templates/man.o: ../../pikotools/src/convert/strtoint.h ./templates/man.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/man.o: templates/patterns.h templates/changepatterns.h core/cur.h -./templates/man.o: core/system.h core/sessionmanager.h -./templates/man.o: ../../pikotools/src/html/htmlparser.h db/db.h db/dbbase.h -./templates/man.o: db/dbconn.h db/dbtextstream.h core/textstream.h -./templates/man.o: core/error.h models/user.h models/group.h -./templates/man.o: core/dircontainer.h core/ugcontainer.h ./core/winixbase.h -./templates/man.o: core/winixrequest.h core/winixsystem.h -./templates/man.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./templates/man.o: ./core/pluginmsg.h ./core/plugindata.h core/slog.h -./templates/man.o: ./core/cur.h ./core/request.h ./core/requesttypes.h -./templates/man.o: ./core/error.h ./core/config.h ./core/textstream.h -./templates/man.o: models/winixmodel.h ./core/header.h ./core/session.h -./templates/man.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./templates/man.o: templates/locale.h core/request.h core/misc.h +./templates/man.o: core/system.h core/job.h ./core/basethread.h +./templates/man.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/man.o: core/request.h ./core/cur.h ./core/request.h +./templates/man.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./templates/man.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./templates/man.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./templates/man.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./templates/man.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./templates/man.o: db/dbtextstream.h core/textstream.h core/error.h +./templates/man.o: models/user.h models/group.h core/dircontainer.h +./templates/man.o: core/ugcontainer.h ./core/mountparser.h ./core/session.h +./templates/man.o: ./core/rebus.h ./core/ipban.h core/loadavg.h core/dirs.h +./templates/man.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./templates/man.o: core/groups.h core/ugcontainer.h core/image.h +./templates/man.o: core/threadmanager.h models/winixmodelconnector.h +./templates/man.o: notify/notify.h core/winixmodeldeprecated.h +./templates/man.o: notify/notifypool.h templates/locale.h +./templates/man.o: templates/patterns.h notify/notifythread.h +./templates/man.o: core/basethread.h notify/templatesnotify.h core/users.h +./templates/man.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/man.o: core/sessionmanager.h +./templates/man.o: ../../pikotools/src/html/htmlparser.h core/winixrequest.h +./templates/man.o: core/winixsystem.h core/slog.h core/misc.h ./templates/man.o: core/winix_const.h ../../pikotools/src/convert/convert.h ./templates/man.o: ../../pikotools/src/convert/inttostr.h ./templates/man.o: ../../pikotools/src/convert/patternreplacer.h ./templates/man.o: ../../pikotools/src/convert/double.h functions/functions.h -./templates/man.o: functions/functionbase.h notify/notify.h -./templates/man.o: core/winixmodeldeprecated.h notify/notifypool.h -./templates/man.o: templates/patterns.h notify/notifythread.h -./templates/man.o: core/basethread.h notify/templatesnotify.h core/users.h -./templates/man.o: functions/functionparser.h functions/account.h -./templates/man.o: functions/adduser.h functions/cat.h functions/chmod.h -./templates/man.o: functions/privchanger.h functions/chown.h -./templates/man.o: functions/ckeditor.h functions/cp.h functions/default.h -./templates/man.o: functions/download.h functions/emacs.h functions/env.h -./templates/man.o: models/userwrapper.h models/user.h functions/imgcrop.h -./templates/man.o: functions/last.h functions/login.h functions/logout.h -./templates/man.o: functions/ln.h functions/ls.h functions/man.h -./templates/man.o: functions/meta.h functions/mkdir.h functions/mv.h -./templates/man.o: functions/nicedit.h functions/node.h functions/passwd.h -./templates/man.o: functions/priv.h functions/pw.h functions/reload.h -./templates/man.o: functions/rm.h functions/rmuser.h ./core/run.h +./templates/man.o: functions/functionbase.h functions/functionparser.h +./templates/man.o: core/dirs.h functions/account.h functions/adduser.h +./templates/man.o: functions/cat.h functions/chmod.h functions/privchanger.h +./templates/man.o: functions/chown.h functions/ckeditor.h functions/cp.h +./templates/man.o: functions/default.h functions/download.h functions/emacs.h +./templates/man.o: functions/env.h models/userwrapper.h models/user.h +./templates/man.o: functions/imgcrop.h functions/last.h functions/login.h +./templates/man.o: functions/logout.h functions/ln.h functions/ls.h +./templates/man.o: functions/man.h functions/meta.h functions/mkdir.h +./templates/man.o: functions/mv.h functions/nicedit.h functions/node.h +./templates/man.o: functions/passwd.h functions/priv.h functions/pw.h +./templates/man.o: functions/reload.h functions/rm.h functions/rmuser.h ./templates/man.o: functions/sort.h functions/specialdefault.h ./templates/man.o: functions/stat.h functions/subject.h functions/template.h -./templates/man.o: ./core/timezone.h functions/tinymce.h functions/uname.h -./templates/man.o: functions/upload.h functions/uptime.h functions/who.h -./templates/man.o: functions/vim.h +./templates/man.o: functions/tinymce.h functions/uname.h functions/upload.h +./templates/man.o: functions/uptime.h functions/who.h functions/vim.h ./templates/mount.o: ./templates/templates.h ../../ezc/src/ezc.h ./templates/mount.o: ../../morm/src/version.h ../../ezc/src/generator.h ./templates/mount.o: ../../ezc/src/blocks.h ../../ezc/src/item.h @@ -8349,24 +8974,34 @@ ./templates/mount.o: ../../pikotools/src/convert/strtoint.h ./templates/mount.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/mount.o: templates/patterns.h templates/changepatterns.h -./templates/mount.o: core/cur.h core/system.h core/sessionmanager.h -./templates/mount.o: ../../pikotools/src/html/htmlparser.h db/db.h -./templates/mount.o: db/dbbase.h db/dbconn.h db/dbtextstream.h -./templates/mount.o: core/textstream.h core/error.h models/user.h -./templates/mount.o: models/group.h core/dircontainer.h core/ugcontainer.h -./templates/mount.o: ./core/winixbase.h core/winixrequest.h -./templates/mount.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./templates/mount.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./templates/mount.o: core/slog.h ./core/cur.h ./core/request.h +./templates/mount.o: core/cur.h core/system.h core/job.h ./core/basethread.h +./templates/mount.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/mount.o: core/request.h ./core/cur.h ./core/request.h ./templates/mount.o: ./core/requesttypes.h ./core/error.h ./core/config.h ./templates/mount.o: ./core/textstream.h models/winixmodel.h ./core/header.h -./templates/mount.o: ./core/session.h ./core/rebus.h ./core/ipban.h -./templates/mount.o: ./core/mount.h templates/locale.h core/misc.h -./templates/mount.o: core/winix_const.h ../../pikotools/src/convert/convert.h +./templates/mount.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./templates/mount.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./templates/mount.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./templates/mount.o: db/dbtextstream.h core/textstream.h core/error.h +./templates/mount.o: models/user.h models/group.h core/dircontainer.h +./templates/mount.o: core/ugcontainer.h ./core/mountparser.h ./core/session.h +./templates/mount.o: ./core/rebus.h ./core/ipban.h core/loadavg.h core/dirs.h +./templates/mount.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./templates/mount.o: core/groups.h core/ugcontainer.h core/image.h +./templates/mount.o: core/threadmanager.h models/winixmodelconnector.h +./templates/mount.o: notify/notify.h core/winixmodeldeprecated.h +./templates/mount.o: notify/notifypool.h templates/locale.h +./templates/mount.o: templates/patterns.h notify/notifythread.h +./templates/mount.o: core/basethread.h notify/templatesnotify.h core/users.h +./templates/mount.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/mount.o: core/sessionmanager.h +./templates/mount.o: ../../pikotools/src/html/htmlparser.h +./templates/mount.o: core/winixrequest.h core/winixsystem.h core/slog.h +./templates/mount.o: core/misc.h core/winix_const.h +./templates/mount.o: ../../pikotools/src/convert/convert.h ./templates/mount.o: ../../pikotools/src/convert/inttostr.h ./templates/mount.o: ../../pikotools/src/convert/patternreplacer.h ./templates/mount.o: ../../pikotools/src/convert/double.h core/mounts.h -./templates/mount.o: ./core/dirs.h ./core/dircontainer.h ./core/mountparser.h ./templates/passwd.o: core/request.h ./templates/templates.h ./templates/passwd.o: ../../ezc/src/ezc.h ../../morm/src/version.h ./templates/passwd.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h @@ -8432,19 +9067,30 @@ ./templates/passwd.o: ../../pikotools/src/convert/strtoint.h ./templates/passwd.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/passwd.o: templates/patterns.h templates/changepatterns.h -./templates/passwd.o: core/cur.h core/system.h core/sessionmanager.h -./templates/passwd.o: ../../pikotools/src/html/htmlparser.h db/db.h -./templates/passwd.o: db/dbbase.h db/dbconn.h db/dbtextstream.h +./templates/passwd.o: core/cur.h core/system.h core/job.h ./core/basethread.h +./templates/passwd.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/passwd.o: ./core/cur.h ./core/request.h ./core/requesttypes.h +./templates/passwd.o: ./core/error.h ./core/config.h ./core/textstream.h +./templates/passwd.o: models/winixmodel.h ./core/header.h ./core/compress.h +./templates/passwd.o: ./core/winixbase.h ./core/plugin.h ./core/pluginmsg.h +./templates/passwd.o: ./core/plugindata.h ./core/mount.h ./core/mounts.h +./templates/passwd.o: db/db.h db/dbbase.h db/dbconn.h db/dbtextstream.h ./templates/passwd.o: core/textstream.h core/error.h models/user.h ./templates/passwd.o: models/group.h core/dircontainer.h core/ugcontainer.h -./templates/passwd.o: ./core/winixbase.h core/winixrequest.h -./templates/passwd.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./templates/passwd.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./templates/passwd.o: core/slog.h ./core/cur.h ./core/request.h -./templates/passwd.o: ./core/requesttypes.h ./core/error.h ./core/config.h -./templates/passwd.o: ./core/textstream.h models/winixmodel.h ./core/header.h -./templates/passwd.o: ./core/session.h ./core/rebus.h ./core/ipban.h -./templates/passwd.o: ./core/mount.h templates/locale.h +./templates/passwd.o: ./core/mountparser.h ./core/session.h ./core/rebus.h +./templates/passwd.o: ./core/ipban.h core/loadavg.h core/dirs.h +./templates/passwd.o: core/dircontainer.h core/crypt.h core/run.h +./templates/passwd.o: core/users.h core/groups.h core/ugcontainer.h +./templates/passwd.o: core/image.h core/threadmanager.h +./templates/passwd.o: models/winixmodelconnector.h notify/notify.h +./templates/passwd.o: core/winixmodeldeprecated.h notify/notifypool.h +./templates/passwd.o: templates/locale.h templates/patterns.h +./templates/passwd.o: notify/notifythread.h core/basethread.h +./templates/passwd.o: notify/templatesnotify.h core/users.h +./templates/passwd.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/passwd.o: core/sessionmanager.h +./templates/passwd.o: ../../pikotools/src/html/htmlparser.h +./templates/passwd.o: core/winixrequest.h core/winixsystem.h core/slog.h ./templates/patterncacher.o: templates/patterncacher.h ./templates/patterncacher.o: ../../pikotools/src/convert/misc.h ./templates/patterncacher.o: ../../pikotools/src/convert/text.h @@ -8577,45 +9223,51 @@ ./templates/priv.o: ../../pikotools/src/convert/strtoint.h ./templates/priv.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/priv.o: templates/patterns.h templates/changepatterns.h -./templates/priv.o: core/cur.h core/system.h core/sessionmanager.h -./templates/priv.o: ../../pikotools/src/html/htmlparser.h db/db.h db/dbbase.h -./templates/priv.o: db/dbconn.h db/dbtextstream.h core/textstream.h -./templates/priv.o: core/error.h models/user.h models/group.h -./templates/priv.o: core/dircontainer.h core/ugcontainer.h ./core/winixbase.h -./templates/priv.o: core/winixrequest.h core/winixsystem.h -./templates/priv.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./templates/priv.o: ./core/pluginmsg.h ./core/plugindata.h core/slog.h -./templates/priv.o: ./core/cur.h ./core/request.h ./core/requesttypes.h -./templates/priv.o: ./core/error.h ./core/config.h ./core/textstream.h -./templates/priv.o: models/winixmodel.h ./core/header.h ./core/session.h -./templates/priv.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./templates/priv.o: templates/locale.h core/request.h core/misc.h +./templates/priv.o: core/cur.h core/system.h core/job.h ./core/basethread.h +./templates/priv.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/priv.o: core/request.h ./core/cur.h ./core/request.h +./templates/priv.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./templates/priv.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./templates/priv.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./templates/priv.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./templates/priv.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./templates/priv.o: db/dbtextstream.h core/textstream.h core/error.h +./templates/priv.o: models/user.h models/group.h core/dircontainer.h +./templates/priv.o: core/ugcontainer.h ./core/mountparser.h ./core/session.h +./templates/priv.o: ./core/rebus.h ./core/ipban.h core/loadavg.h core/dirs.h +./templates/priv.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./templates/priv.o: core/groups.h core/ugcontainer.h core/image.h +./templates/priv.o: core/threadmanager.h models/winixmodelconnector.h +./templates/priv.o: notify/notify.h core/winixmodeldeprecated.h +./templates/priv.o: notify/notifypool.h templates/locale.h +./templates/priv.o: templates/patterns.h notify/notifythread.h +./templates/priv.o: core/basethread.h notify/templatesnotify.h core/users.h +./templates/priv.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/priv.o: core/sessionmanager.h +./templates/priv.o: ../../pikotools/src/html/htmlparser.h core/winixrequest.h +./templates/priv.o: core/winixsystem.h core/slog.h core/misc.h ./templates/priv.o: core/winix_const.h ../../pikotools/src/convert/convert.h ./templates/priv.o: ../../pikotools/src/convert/inttostr.h ./templates/priv.o: ../../pikotools/src/convert/patternreplacer.h ./templates/priv.o: ../../pikotools/src/convert/double.h ./templates/priv.o: functions/functions.h functions/functionbase.h -./templates/priv.o: notify/notify.h core/winixmodeldeprecated.h -./templates/priv.o: notify/notifypool.h templates/patterns.h -./templates/priv.o: notify/notifythread.h core/basethread.h -./templates/priv.o: notify/templatesnotify.h core/users.h -./templates/priv.o: functions/functionparser.h functions/account.h -./templates/priv.o: functions/adduser.h functions/cat.h functions/chmod.h -./templates/priv.o: functions/privchanger.h functions/chown.h -./templates/priv.o: functions/ckeditor.h functions/cp.h functions/default.h -./templates/priv.o: functions/download.h functions/emacs.h functions/env.h -./templates/priv.o: models/userwrapper.h models/user.h functions/imgcrop.h -./templates/priv.o: functions/last.h functions/login.h functions/logout.h -./templates/priv.o: functions/ln.h functions/ls.h functions/man.h -./templates/priv.o: functions/meta.h functions/mkdir.h functions/mv.h -./templates/priv.o: functions/nicedit.h functions/node.h functions/passwd.h -./templates/priv.o: functions/priv.h functions/pw.h functions/reload.h -./templates/priv.o: functions/rm.h functions/rmuser.h ./core/run.h -./templates/priv.o: functions/sort.h functions/specialdefault.h -./templates/priv.o: functions/stat.h functions/subject.h functions/template.h -./templates/priv.o: ./core/timezone.h functions/tinymce.h functions/uname.h -./templates/priv.o: functions/upload.h functions/uptime.h functions/who.h -./templates/priv.o: functions/vim.h +./templates/priv.o: functions/functionparser.h core/dirs.h +./templates/priv.o: functions/account.h functions/adduser.h functions/cat.h +./templates/priv.o: functions/chmod.h functions/privchanger.h +./templates/priv.o: functions/chown.h functions/ckeditor.h functions/cp.h +./templates/priv.o: functions/default.h functions/download.h +./templates/priv.o: functions/emacs.h functions/env.h models/userwrapper.h +./templates/priv.o: models/user.h functions/imgcrop.h functions/last.h +./templates/priv.o: functions/login.h functions/logout.h functions/ln.h +./templates/priv.o: functions/ls.h functions/man.h functions/meta.h +./templates/priv.o: functions/mkdir.h functions/mv.h functions/nicedit.h +./templates/priv.o: functions/node.h functions/passwd.h functions/priv.h +./templates/priv.o: functions/pw.h functions/reload.h functions/rm.h +./templates/priv.o: functions/rmuser.h functions/sort.h +./templates/priv.o: functions/specialdefault.h functions/stat.h +./templates/priv.o: functions/subject.h functions/template.h +./templates/priv.o: functions/tinymce.h functions/uname.h functions/upload.h +./templates/priv.o: functions/uptime.h functions/who.h functions/vim.h ./templates/rebus.o: core/request.h ./templates/templates.h ./templates/rebus.o: ../../ezc/src/ezc.h ../../morm/src/version.h ./templates/rebus.o: ../../ezc/src/generator.h ../../ezc/src/blocks.h @@ -8679,19 +9331,29 @@ ./templates/rebus.o: ../../pikotools/src/convert/strtoint.h ./templates/rebus.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/rebus.o: templates/patterns.h templates/changepatterns.h -./templates/rebus.o: core/cur.h core/system.h core/sessionmanager.h -./templates/rebus.o: ../../pikotools/src/html/htmlparser.h db/db.h -./templates/rebus.o: db/dbbase.h db/dbconn.h db/dbtextstream.h +./templates/rebus.o: core/cur.h core/system.h core/job.h ./core/basethread.h +./templates/rebus.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/rebus.o: ./core/cur.h ./core/request.h ./core/requesttypes.h +./templates/rebus.o: ./core/error.h ./core/config.h ./core/textstream.h +./templates/rebus.o: models/winixmodel.h ./core/header.h ./core/compress.h +./templates/rebus.o: ./core/winixbase.h ./core/plugin.h ./core/pluginmsg.h +./templates/rebus.o: ./core/plugindata.h ./core/mount.h ./core/mounts.h +./templates/rebus.o: db/db.h db/dbbase.h db/dbconn.h db/dbtextstream.h ./templates/rebus.o: core/textstream.h core/error.h models/user.h ./templates/rebus.o: models/group.h core/dircontainer.h core/ugcontainer.h -./templates/rebus.o: ./core/winixbase.h core/winixrequest.h -./templates/rebus.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./templates/rebus.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./templates/rebus.o: core/slog.h ./core/cur.h ./core/request.h -./templates/rebus.o: ./core/requesttypes.h ./core/error.h ./core/config.h -./templates/rebus.o: ./core/textstream.h models/winixmodel.h ./core/header.h -./templates/rebus.o: ./core/session.h ./core/rebus.h ./core/ipban.h -./templates/rebus.o: ./core/mount.h templates/locale.h +./templates/rebus.o: ./core/mountparser.h ./core/session.h ./core/rebus.h +./templates/rebus.o: ./core/ipban.h core/loadavg.h core/dirs.h +./templates/rebus.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./templates/rebus.o: core/groups.h core/ugcontainer.h core/image.h +./templates/rebus.o: core/threadmanager.h models/winixmodelconnector.h +./templates/rebus.o: notify/notify.h core/winixmodeldeprecated.h +./templates/rebus.o: notify/notifypool.h templates/locale.h +./templates/rebus.o: templates/patterns.h notify/notifythread.h +./templates/rebus.o: core/basethread.h notify/templatesnotify.h core/users.h +./templates/rebus.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/rebus.o: core/sessionmanager.h +./templates/rebus.o: ../../pikotools/src/html/htmlparser.h +./templates/rebus.o: core/winixrequest.h core/winixsystem.h core/slog.h ./templates/server.o: ./templates/templates.h ../../ezc/src/ezc.h ./templates/server.o: ../../morm/src/version.h ../../ezc/src/generator.h ./templates/server.o: ../../ezc/src/blocks.h ../../ezc/src/item.h @@ -8756,38 +9418,46 @@ ./templates/server.o: ../../pikotools/src/convert/strtoint.h ./templates/server.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/server.o: templates/patterns.h templates/changepatterns.h -./templates/server.o: core/cur.h core/system.h core/sessionmanager.h -./templates/server.o: ../../pikotools/src/html/htmlparser.h db/db.h -./templates/server.o: db/dbbase.h db/dbconn.h db/dbtextstream.h -./templates/server.o: core/textstream.h core/error.h models/user.h -./templates/server.o: models/group.h core/dircontainer.h core/ugcontainer.h -./templates/server.o: ./core/winixbase.h core/winixrequest.h -./templates/server.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./templates/server.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./templates/server.o: core/slog.h ./core/cur.h ./core/request.h +./templates/server.o: core/cur.h core/system.h core/job.h ./core/basethread.h +./templates/server.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/server.o: core/request.h ./core/cur.h ./core/request.h ./templates/server.o: ./core/requesttypes.h ./core/error.h ./core/config.h ./templates/server.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./templates/server.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./templates/server.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./templates/server.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./templates/server.o: db/dbtextstream.h core/textstream.h core/error.h +./templates/server.o: models/user.h models/group.h core/dircontainer.h +./templates/server.o: core/ugcontainer.h ./core/mountparser.h ./templates/server.o: ./core/session.h ./core/rebus.h ./core/ipban.h -./templates/server.o: ./core/mount.h templates/locale.h functions/functions.h -./templates/server.o: functions/functionbase.h core/request.h notify/notify.h +./templates/server.o: core/loadavg.h core/dirs.h core/dircontainer.h +./templates/server.o: core/crypt.h core/run.h core/users.h core/groups.h +./templates/server.o: core/ugcontainer.h core/image.h core/threadmanager.h +./templates/server.o: models/winixmodelconnector.h notify/notify.h ./templates/server.o: core/winixmodeldeprecated.h notify/notifypool.h -./templates/server.o: templates/patterns.h notify/notifythread.h -./templates/server.o: core/basethread.h notify/templatesnotify.h core/users.h -./templates/server.o: functions/functionparser.h functions/account.h -./templates/server.o: functions/adduser.h functions/cat.h functions/chmod.h -./templates/server.o: functions/privchanger.h functions/chown.h -./templates/server.o: functions/ckeditor.h functions/cp.h functions/default.h -./templates/server.o: functions/download.h functions/emacs.h functions/env.h -./templates/server.o: models/userwrapper.h models/user.h functions/imgcrop.h -./templates/server.o: functions/last.h functions/login.h functions/logout.h -./templates/server.o: functions/ln.h functions/ls.h functions/man.h -./templates/server.o: functions/meta.h functions/mkdir.h functions/mv.h -./templates/server.o: functions/nicedit.h functions/node.h functions/passwd.h -./templates/server.o: functions/priv.h functions/pw.h functions/reload.h -./templates/server.o: functions/rm.h functions/rmuser.h ./core/run.h -./templates/server.o: functions/sort.h functions/specialdefault.h -./templates/server.o: functions/stat.h functions/subject.h -./templates/server.o: functions/template.h ./core/timezone.h +./templates/server.o: templates/locale.h templates/patterns.h +./templates/server.o: notify/notifythread.h core/basethread.h +./templates/server.o: notify/templatesnotify.h core/users.h +./templates/server.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/server.o: core/sessionmanager.h +./templates/server.o: ../../pikotools/src/html/htmlparser.h +./templates/server.o: core/winixrequest.h core/winixsystem.h core/slog.h +./templates/server.o: functions/functions.h functions/functionbase.h +./templates/server.o: functions/functionparser.h core/dirs.h +./templates/server.o: functions/account.h functions/adduser.h functions/cat.h +./templates/server.o: functions/chmod.h functions/privchanger.h +./templates/server.o: functions/chown.h functions/ckeditor.h functions/cp.h +./templates/server.o: functions/default.h functions/download.h +./templates/server.o: functions/emacs.h functions/env.h models/userwrapper.h +./templates/server.o: models/user.h functions/imgcrop.h functions/last.h +./templates/server.o: functions/login.h functions/logout.h functions/ln.h +./templates/server.o: functions/ls.h functions/man.h functions/meta.h +./templates/server.o: functions/mkdir.h functions/mv.h functions/nicedit.h +./templates/server.o: functions/node.h functions/passwd.h functions/priv.h +./templates/server.o: functions/pw.h functions/reload.h functions/rm.h +./templates/server.o: functions/rmuser.h functions/sort.h +./templates/server.o: functions/specialdefault.h functions/stat.h +./templates/server.o: functions/subject.h functions/template.h ./templates/server.o: functions/tinymce.h functions/uname.h ./templates/server.o: functions/upload.h functions/uptime.h functions/who.h ./templates/server.o: functions/vim.h @@ -8852,19 +9522,30 @@ ./templates/slog.o: ../../ezc/src/expressionparser.h ../../ezc/src/models.h ./templates/slog.o: ../../ezc/src/patternparser.h templates/htmltextstream.h ./templates/slog.o: ./core/error.h ./core/config.h ./core/textstream.h -./templates/slog.o: models/winixmodel.h ./core/header.h ./core/session.h -./templates/slog.o: models/user.h ./core/plugindata.h ./core/rebus.h -./templates/slog.o: ./core/winixbase.h ./core/ipban.h ./core/mount.h -./templates/slog.o: templates/locale.h ./templates/templates.h +./templates/slog.o: models/winixmodel.h ./core/header.h ./core/compress.h +./templates/slog.o: ./core/winixbase.h ./core/plugin.h ./core/pluginmsg.h +./templates/slog.o: ./core/plugindata.h ./core/winixmodeldeprecated.h +./templates/slog.o: ./core/mount.h ./core/mounts.h db/db.h db/dbbase.h +./templates/slog.o: db/dbconn.h db/dbtextstream.h core/textstream.h +./templates/slog.o: core/error.h models/user.h models/group.h +./templates/slog.o: core/dircontainer.h core/ugcontainer.h +./templates/slog.o: ./core/mountparser.h ./core/session.h ./core/rebus.h +./templates/slog.o: ./core/ipban.h templates/locale.h ./templates/templates.h ./templates/slog.o: templates/patterncacher.h templates/indexpatterns.h ./templates/slog.o: templates/patterns.h templates/changepatterns.h -./templates/slog.o: core/cur.h core/system.h core/sessionmanager.h -./templates/slog.o: ../../pikotools/src/html/htmlparser.h db/db.h db/dbbase.h -./templates/slog.o: db/dbconn.h db/dbtextstream.h core/textstream.h -./templates/slog.o: core/error.h models/group.h core/dircontainer.h -./templates/slog.o: core/ugcontainer.h core/winixrequest.h core/winixsystem.h -./templates/slog.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./templates/slog.o: ./core/pluginmsg.h +./templates/slog.o: core/cur.h core/system.h core/job.h ./core/basethread.h +./templates/slog.o: core/jobtask.h core/request.h core/loadavg.h core/dirs.h +./templates/slog.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./templates/slog.o: core/groups.h core/ugcontainer.h core/image.h +./templates/slog.o: core/threadmanager.h models/winixmodelconnector.h +./templates/slog.o: notify/notify.h core/winixmodeldeprecated.h +./templates/slog.o: notify/notifypool.h templates/patterns.h +./templates/slog.o: notify/notifythread.h core/basethread.h +./templates/slog.o: notify/templatesnotify.h core/users.h +./templates/slog.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/slog.o: core/sessionmanager.h +./templates/slog.o: ../../pikotools/src/html/htmlparser.h core/winixrequest.h +./templates/slog.o: core/winixsystem.h ./templates/stat.o: ./templates/templates.h ../../ezc/src/ezc.h ./templates/stat.o: ../../morm/src/version.h ../../ezc/src/generator.h ./templates/stat.o: ../../ezc/src/blocks.h ../../ezc/src/item.h @@ -8926,19 +9607,29 @@ ./templates/stat.o: ../../pikotools/src/convert/strtoint.h ./templates/stat.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/stat.o: templates/patterns.h templates/changepatterns.h -./templates/stat.o: core/cur.h core/system.h core/sessionmanager.h -./templates/stat.o: ../../pikotools/src/html/htmlparser.h db/db.h db/dbbase.h -./templates/stat.o: db/dbconn.h db/dbtextstream.h core/textstream.h -./templates/stat.o: core/error.h models/user.h models/group.h -./templates/stat.o: core/dircontainer.h core/ugcontainer.h ./core/winixbase.h -./templates/stat.o: core/winixrequest.h core/winixsystem.h -./templates/stat.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./templates/stat.o: ./core/pluginmsg.h ./core/plugindata.h core/slog.h -./templates/stat.o: ./core/cur.h ./core/request.h ./core/requesttypes.h -./templates/stat.o: ./core/error.h ./core/config.h ./core/textstream.h -./templates/stat.o: models/winixmodel.h ./core/header.h ./core/session.h -./templates/stat.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./templates/stat.o: templates/locale.h core/request.h core/misc.h +./templates/stat.o: core/cur.h core/system.h core/job.h ./core/basethread.h +./templates/stat.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/stat.o: core/request.h ./core/cur.h ./core/request.h +./templates/stat.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./templates/stat.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./templates/stat.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./templates/stat.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./templates/stat.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./templates/stat.o: db/dbtextstream.h core/textstream.h core/error.h +./templates/stat.o: models/user.h models/group.h core/dircontainer.h +./templates/stat.o: core/ugcontainer.h ./core/mountparser.h ./core/session.h +./templates/stat.o: ./core/rebus.h ./core/ipban.h core/loadavg.h core/dirs.h +./templates/stat.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./templates/stat.o: core/groups.h core/ugcontainer.h core/image.h +./templates/stat.o: core/threadmanager.h models/winixmodelconnector.h +./templates/stat.o: notify/notify.h core/winixmodeldeprecated.h +./templates/stat.o: notify/notifypool.h templates/locale.h +./templates/stat.o: templates/patterns.h notify/notifythread.h +./templates/stat.o: core/basethread.h notify/templatesnotify.h core/users.h +./templates/stat.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/stat.o: core/sessionmanager.h +./templates/stat.o: ../../pikotools/src/html/htmlparser.h core/winixrequest.h +./templates/stat.o: core/winixsystem.h core/slog.h core/misc.h ./templates/stat.o: core/winix_const.h ../../pikotools/src/convert/convert.h ./templates/stat.o: ../../pikotools/src/convert/inttostr.h ./templates/stat.o: ../../pikotools/src/convert/patternreplacer.h @@ -9004,19 +9695,29 @@ ./templates/sys.o: ../../pikotools/src/convert/strtoint.h ./templates/sys.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/sys.o: templates/patterns.h templates/changepatterns.h core/cur.h -./templates/sys.o: core/system.h core/sessionmanager.h -./templates/sys.o: ../../pikotools/src/html/htmlparser.h db/db.h db/dbbase.h -./templates/sys.o: db/dbconn.h db/dbtextstream.h core/textstream.h -./templates/sys.o: core/error.h models/user.h models/group.h -./templates/sys.o: core/dircontainer.h core/ugcontainer.h ./core/winixbase.h -./templates/sys.o: core/winixrequest.h core/winixsystem.h -./templates/sys.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./templates/sys.o: ./core/pluginmsg.h ./core/plugindata.h core/slog.h -./templates/sys.o: ./core/cur.h ./core/request.h ./core/requesttypes.h -./templates/sys.o: ./core/error.h ./core/config.h ./core/textstream.h -./templates/sys.o: models/winixmodel.h ./core/header.h ./core/session.h -./templates/sys.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./templates/sys.o: templates/locale.h core/request.h core/version.h +./templates/sys.o: core/system.h core/job.h ./core/basethread.h +./templates/sys.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/sys.o: core/request.h ./core/cur.h ./core/request.h +./templates/sys.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./templates/sys.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./templates/sys.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./templates/sys.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./templates/sys.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./templates/sys.o: db/dbtextstream.h core/textstream.h core/error.h +./templates/sys.o: models/user.h models/group.h core/dircontainer.h +./templates/sys.o: core/ugcontainer.h ./core/mountparser.h ./core/session.h +./templates/sys.o: ./core/rebus.h ./core/ipban.h core/loadavg.h core/dirs.h +./templates/sys.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./templates/sys.o: core/groups.h core/ugcontainer.h core/image.h +./templates/sys.o: core/threadmanager.h models/winixmodelconnector.h +./templates/sys.o: notify/notify.h core/winixmodeldeprecated.h +./templates/sys.o: notify/notifypool.h templates/locale.h +./templates/sys.o: templates/patterns.h notify/notifythread.h +./templates/sys.o: core/basethread.h notify/templatesnotify.h core/users.h +./templates/sys.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/sys.o: core/sessionmanager.h +./templates/sys.o: ../../pikotools/src/html/htmlparser.h core/winixrequest.h +./templates/sys.o: core/winixsystem.h core/slog.h core/version.h ./templates/sys.o: ../../pikotools/src/pikotools/version.h ./templates/sys.o: ../../tito/src/tito.h ./templates/template.o: ./templates/templates.h ../../ezc/src/ezc.h @@ -9085,20 +9786,32 @@ ./templates/template.o: ../../pikotools/src/convert/strtoint.h ./templates/template.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/template.o: templates/patterns.h templates/changepatterns.h -./templates/template.o: core/cur.h core/system.h core/sessionmanager.h -./templates/template.o: ../../pikotools/src/html/htmlparser.h db/db.h -./templates/template.o: db/dbbase.h db/dbconn.h db/dbtextstream.h -./templates/template.o: core/textstream.h core/error.h models/user.h -./templates/template.o: models/group.h core/dircontainer.h core/ugcontainer.h -./templates/template.o: ./core/winixbase.h core/winixrequest.h -./templates/template.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./templates/template.o: ./core/plugin.h ./core/pluginmsg.h -./templates/template.o: ./core/plugindata.h core/slog.h ./core/cur.h +./templates/template.o: core/cur.h core/system.h core/job.h +./templates/template.o: ./core/basethread.h ./core/winixmodeldeprecated.h +./templates/template.o: core/jobtask.h core/request.h ./core/cur.h ./templates/template.o: ./core/request.h ./core/requesttypes.h ./core/error.h ./templates/template.o: ./core/config.h ./core/textstream.h -./templates/template.o: models/winixmodel.h ./core/header.h ./core/session.h -./templates/template.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./templates/template.o: templates/locale.h core/misc.h core/winix_const.h +./templates/template.o: models/winixmodel.h ./core/header.h ./core/compress.h +./templates/template.o: ./core/winixbase.h ./core/plugin.h ./core/pluginmsg.h +./templates/template.o: ./core/plugindata.h ./core/mount.h ./core/mounts.h +./templates/template.o: db/db.h db/dbbase.h db/dbconn.h db/dbtextstream.h +./templates/template.o: core/textstream.h core/error.h models/user.h +./templates/template.o: models/group.h core/dircontainer.h core/ugcontainer.h +./templates/template.o: ./core/mountparser.h ./core/session.h ./core/rebus.h +./templates/template.o: ./core/ipban.h core/loadavg.h core/dirs.h +./templates/template.o: core/dircontainer.h core/crypt.h core/run.h +./templates/template.o: core/users.h core/groups.h core/ugcontainer.h +./templates/template.o: core/image.h core/threadmanager.h +./templates/template.o: models/winixmodelconnector.h notify/notify.h +./templates/template.o: core/winixmodeldeprecated.h notify/notifypool.h +./templates/template.o: templates/locale.h templates/patterns.h +./templates/template.o: notify/notifythread.h core/basethread.h +./templates/template.o: notify/templatesnotify.h core/users.h +./templates/template.o: ./core/lastcontainer.h core/timezones.h +./templates/template.o: core/timezone.h core/sessionmanager.h +./templates/template.o: ../../pikotools/src/html/htmlparser.h +./templates/template.o: core/winixrequest.h core/winixsystem.h core/slog.h +./templates/template.o: core/misc.h core/winix_const.h ./templates/template.o: ../../pikotools/src/convert/convert.h ./templates/template.o: ../../pikotools/src/convert/inttostr.h ./templates/template.o: ../../pikotools/src/convert/patternreplacer.h @@ -9170,30 +9883,39 @@ ./templates/templates.o: ../../pikotools/src/convert/strtoint.h ./templates/templates.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/templates.o: templates/patterns.h templates/changepatterns.h -./templates/templates.o: core/cur.h core/system.h core/sessionmanager.h -./templates/templates.o: ../../pikotools/src/html/htmlparser.h db/db.h -./templates/templates.o: db/dbbase.h db/dbconn.h db/dbtextstream.h -./templates/templates.o: core/textstream.h core/error.h models/user.h -./templates/templates.o: models/group.h core/dircontainer.h -./templates/templates.o: core/ugcontainer.h ./core/winixbase.h -./templates/templates.o: core/winixrequest.h core/winixsystem.h -./templates/templates.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./templates/templates.o: ./core/pluginmsg.h ./core/plugindata.h core/slog.h -./templates/templates.o: ./core/cur.h ./core/request.h ./core/requesttypes.h +./templates/templates.o: core/cur.h core/system.h core/job.h +./templates/templates.o: ./core/basethread.h ./core/winixmodeldeprecated.h +./templates/templates.o: core/jobtask.h core/request.h ./core/cur.h +./templates/templates.o: ./core/request.h ./core/requesttypes.h ./templates/templates.o: ./core/error.h ./core/config.h ./core/textstream.h -./templates/templates.o: models/winixmodel.h ./core/header.h ./core/session.h -./templates/templates.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./templates/templates.o: templates/locale.h core/misc.h core/winix_const.h +./templates/templates.o: models/winixmodel.h ./core/header.h +./templates/templates.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./templates/templates.o: ./core/pluginmsg.h ./core/plugindata.h +./templates/templates.o: ./core/mount.h ./core/mounts.h db/db.h db/dbbase.h +./templates/templates.o: db/dbconn.h db/dbtextstream.h core/textstream.h +./templates/templates.o: core/error.h models/user.h models/group.h +./templates/templates.o: core/dircontainer.h core/ugcontainer.h +./templates/templates.o: ./core/mountparser.h ./core/session.h ./core/rebus.h +./templates/templates.o: ./core/ipban.h core/loadavg.h core/dirs.h +./templates/templates.o: core/dircontainer.h core/crypt.h core/run.h +./templates/templates.o: core/users.h core/groups.h core/ugcontainer.h +./templates/templates.o: core/image.h core/threadmanager.h +./templates/templates.o: models/winixmodelconnector.h notify/notify.h +./templates/templates.o: core/winixmodeldeprecated.h notify/notifypool.h +./templates/templates.o: templates/locale.h templates/patterns.h +./templates/templates.o: notify/notifythread.h core/basethread.h +./templates/templates.o: notify/templatesnotify.h core/users.h +./templates/templates.o: ./core/lastcontainer.h core/timezones.h +./templates/templates.o: core/timezone.h core/sessionmanager.h +./templates/templates.o: ../../pikotools/src/html/htmlparser.h +./templates/templates.o: core/winixrequest.h core/winixsystem.h core/slog.h +./templates/templates.o: core/misc.h core/winix_const.h ./templates/templates.o: ../../pikotools/src/convert/convert.h ./templates/templates.o: ../../pikotools/src/convert/inttostr.h ./templates/templates.o: ../../pikotools/src/convert/patternreplacer.h ./templates/templates.o: ../../pikotools/src/convert/double.h core/plugin.h ./templates/templates.o: functions/functions.h functions/functionbase.h -./templates/templates.o: core/request.h notify/notify.h -./templates/templates.o: core/winixmodeldeprecated.h notify/notifypool.h -./templates/templates.o: templates/patterns.h notify/notifythread.h -./templates/templates.o: core/basethread.h notify/templatesnotify.h -./templates/templates.o: core/users.h functions/functionparser.h +./templates/templates.o: functions/functionparser.h core/dirs.h ./templates/templates.o: functions/account.h functions/adduser.h ./templates/templates.o: functions/cat.h functions/chmod.h ./templates/templates.o: functions/privchanger.h functions/chown.h @@ -9207,12 +9929,12 @@ ./templates/templates.o: functions/mkdir.h functions/mv.h functions/nicedit.h ./templates/templates.o: functions/node.h functions/passwd.h functions/priv.h ./templates/templates.o: functions/pw.h functions/reload.h functions/rm.h -./templates/templates.o: functions/rmuser.h ./core/run.h functions/sort.h +./templates/templates.o: functions/rmuser.h functions/sort.h ./templates/templates.o: functions/specialdefault.h functions/stat.h ./templates/templates.o: functions/subject.h functions/template.h -./templates/templates.o: ./core/timezone.h functions/tinymce.h -./templates/templates.o: functions/uname.h functions/upload.h -./templates/templates.o: functions/uptime.h functions/who.h functions/vim.h +./templates/templates.o: functions/tinymce.h functions/uname.h +./templates/templates.o: functions/upload.h functions/uptime.h +./templates/templates.o: functions/who.h functions/vim.h ./templates/user.o: ./templates/templates.h ../../ezc/src/ezc.h ./templates/user.o: ../../morm/src/version.h ../../ezc/src/generator.h ./templates/user.o: ../../ezc/src/blocks.h ../../ezc/src/item.h @@ -9274,19 +9996,29 @@ ./templates/user.o: ../../pikotools/src/convert/strtoint.h ./templates/user.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/user.o: templates/patterns.h templates/changepatterns.h -./templates/user.o: core/cur.h core/system.h core/sessionmanager.h -./templates/user.o: ../../pikotools/src/html/htmlparser.h db/db.h db/dbbase.h -./templates/user.o: db/dbconn.h db/dbtextstream.h core/textstream.h -./templates/user.o: core/error.h models/user.h models/group.h -./templates/user.o: core/dircontainer.h core/ugcontainer.h ./core/winixbase.h -./templates/user.o: core/winixrequest.h core/winixsystem.h -./templates/user.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./templates/user.o: ./core/pluginmsg.h ./core/plugindata.h core/slog.h -./templates/user.o: ./core/cur.h ./core/request.h ./core/requesttypes.h -./templates/user.o: ./core/error.h ./core/config.h ./core/textstream.h -./templates/user.o: models/winixmodel.h ./core/header.h ./core/session.h -./templates/user.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./templates/user.o: templates/locale.h core/request.h core/misc.h +./templates/user.o: core/cur.h core/system.h core/job.h ./core/basethread.h +./templates/user.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/user.o: core/request.h ./core/cur.h ./core/request.h +./templates/user.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./templates/user.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./templates/user.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./templates/user.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./templates/user.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./templates/user.o: db/dbtextstream.h core/textstream.h core/error.h +./templates/user.o: models/user.h models/group.h core/dircontainer.h +./templates/user.o: core/ugcontainer.h ./core/mountparser.h ./core/session.h +./templates/user.o: ./core/rebus.h ./core/ipban.h core/loadavg.h core/dirs.h +./templates/user.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./templates/user.o: core/groups.h core/ugcontainer.h core/image.h +./templates/user.o: core/threadmanager.h models/winixmodelconnector.h +./templates/user.o: notify/notify.h core/winixmodeldeprecated.h +./templates/user.o: notify/notifypool.h templates/locale.h +./templates/user.o: templates/patterns.h notify/notifythread.h +./templates/user.o: core/basethread.h notify/templatesnotify.h core/users.h +./templates/user.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/user.o: core/sessionmanager.h +./templates/user.o: ../../pikotools/src/html/htmlparser.h core/winixrequest.h +./templates/user.o: core/winixsystem.h core/slog.h core/misc.h ./templates/user.o: core/winix_const.h ../../pikotools/src/convert/convert.h ./templates/user.o: ../../pikotools/src/convert/inttostr.h ./templates/user.o: ../../pikotools/src/convert/patternreplacer.h @@ -9369,19 +10101,30 @@ ./templates/upload.o: ../../pikotools/src/convert/strtoint.h ./templates/upload.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/upload.o: templates/patterns.h templates/changepatterns.h -./templates/upload.o: core/cur.h core/system.h core/sessionmanager.h -./templates/upload.o: ../../pikotools/src/html/htmlparser.h db/db.h -./templates/upload.o: db/dbbase.h db/dbconn.h db/dbtextstream.h +./templates/upload.o: core/cur.h core/system.h core/job.h ./core/basethread.h +./templates/upload.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/upload.o: ./core/cur.h ./core/request.h ./core/requesttypes.h +./templates/upload.o: ./core/error.h ./core/config.h ./core/textstream.h +./templates/upload.o: models/winixmodel.h ./core/header.h ./core/compress.h +./templates/upload.o: ./core/winixbase.h ./core/plugin.h ./core/pluginmsg.h +./templates/upload.o: ./core/plugindata.h ./core/mount.h ./core/mounts.h +./templates/upload.o: db/db.h db/dbbase.h db/dbconn.h db/dbtextstream.h ./templates/upload.o: core/textstream.h core/error.h models/user.h ./templates/upload.o: models/group.h core/dircontainer.h core/ugcontainer.h -./templates/upload.o: ./core/winixbase.h core/winixrequest.h -./templates/upload.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./templates/upload.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./templates/upload.o: core/slog.h ./core/cur.h ./core/request.h -./templates/upload.o: ./core/requesttypes.h ./core/error.h ./core/config.h -./templates/upload.o: ./core/textstream.h models/winixmodel.h ./core/header.h -./templates/upload.o: ./core/session.h ./core/rebus.h ./core/ipban.h -./templates/upload.o: ./core/mount.h templates/locale.h +./templates/upload.o: ./core/mountparser.h ./core/session.h ./core/rebus.h +./templates/upload.o: ./core/ipban.h core/loadavg.h core/dirs.h +./templates/upload.o: core/dircontainer.h core/crypt.h core/run.h +./templates/upload.o: core/users.h core/groups.h core/ugcontainer.h +./templates/upload.o: core/image.h core/threadmanager.h +./templates/upload.o: models/winixmodelconnector.h notify/notify.h +./templates/upload.o: core/winixmodeldeprecated.h notify/notifypool.h +./templates/upload.o: templates/locale.h templates/patterns.h +./templates/upload.o: notify/notifythread.h core/basethread.h +./templates/upload.o: notify/templatesnotify.h core/users.h +./templates/upload.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/upload.o: core/sessionmanager.h +./templates/upload.o: ../../pikotools/src/html/htmlparser.h +./templates/upload.o: core/winixrequest.h core/winixsystem.h core/slog.h ./templates/uptime.o: ./templates/templates.h ../../ezc/src/ezc.h ./templates/uptime.o: ../../morm/src/version.h ../../ezc/src/generator.h ./templates/uptime.o: ../../ezc/src/blocks.h ../../ezc/src/item.h @@ -9446,19 +10189,30 @@ ./templates/uptime.o: ../../pikotools/src/convert/strtoint.h ./templates/uptime.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/uptime.o: templates/patterns.h templates/changepatterns.h -./templates/uptime.o: core/cur.h core/system.h core/sessionmanager.h -./templates/uptime.o: ../../pikotools/src/html/htmlparser.h db/db.h -./templates/uptime.o: db/dbbase.h db/dbconn.h db/dbtextstream.h -./templates/uptime.o: core/textstream.h core/error.h models/user.h -./templates/uptime.o: models/group.h core/dircontainer.h core/ugcontainer.h -./templates/uptime.o: ./core/winixbase.h core/winixrequest.h -./templates/uptime.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./templates/uptime.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./templates/uptime.o: core/slog.h ./core/cur.h ./core/request.h +./templates/uptime.o: core/cur.h core/system.h core/job.h ./core/basethread.h +./templates/uptime.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/uptime.o: core/request.h ./core/cur.h ./core/request.h ./templates/uptime.o: ./core/requesttypes.h ./core/error.h ./core/config.h ./templates/uptime.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./templates/uptime.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./templates/uptime.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./templates/uptime.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./templates/uptime.o: db/dbtextstream.h core/textstream.h core/error.h +./templates/uptime.o: models/user.h models/group.h core/dircontainer.h +./templates/uptime.o: core/ugcontainer.h ./core/mountparser.h ./templates/uptime.o: ./core/session.h ./core/rebus.h ./core/ipban.h -./templates/uptime.o: ./core/mount.h templates/locale.h +./templates/uptime.o: core/loadavg.h core/dirs.h core/dircontainer.h +./templates/uptime.o: core/crypt.h core/run.h core/users.h core/groups.h +./templates/uptime.o: core/ugcontainer.h core/image.h core/threadmanager.h +./templates/uptime.o: models/winixmodelconnector.h notify/notify.h +./templates/uptime.o: core/winixmodeldeprecated.h notify/notifypool.h +./templates/uptime.o: templates/locale.h templates/patterns.h +./templates/uptime.o: notify/notifythread.h core/basethread.h +./templates/uptime.o: notify/templatesnotify.h core/users.h +./templates/uptime.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/uptime.o: core/sessionmanager.h +./templates/uptime.o: ../../pikotools/src/html/htmlparser.h +./templates/uptime.o: core/winixrequest.h core/winixsystem.h core/slog.h ./templates/who.o: ./templates/templates.h ../../ezc/src/ezc.h ./templates/who.o: ../../morm/src/version.h ../../ezc/src/generator.h ./templates/who.o: ../../ezc/src/blocks.h ../../ezc/src/item.h @@ -9520,19 +10274,29 @@ ./templates/who.o: ../../pikotools/src/convert/strtoint.h ./templates/who.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/who.o: templates/patterns.h templates/changepatterns.h core/cur.h -./templates/who.o: core/system.h core/sessionmanager.h -./templates/who.o: ../../pikotools/src/html/htmlparser.h db/db.h db/dbbase.h -./templates/who.o: db/dbconn.h db/dbtextstream.h core/textstream.h -./templates/who.o: core/error.h models/user.h models/group.h -./templates/who.o: core/dircontainer.h core/ugcontainer.h ./core/winixbase.h -./templates/who.o: core/winixrequest.h core/winixsystem.h -./templates/who.o: ./core/winixmodeldeprecated.h ./core/plugin.h -./templates/who.o: ./core/pluginmsg.h ./core/plugindata.h core/slog.h -./templates/who.o: ./core/cur.h ./core/request.h ./core/requesttypes.h -./templates/who.o: ./core/error.h ./core/config.h ./core/textstream.h -./templates/who.o: models/winixmodel.h ./core/header.h ./core/session.h -./templates/who.o: ./core/rebus.h ./core/ipban.h ./core/mount.h -./templates/who.o: templates/locale.h core/request.h core/misc.h +./templates/who.o: core/system.h core/job.h ./core/basethread.h +./templates/who.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/who.o: core/request.h ./core/cur.h ./core/request.h +./templates/who.o: ./core/requesttypes.h ./core/error.h ./core/config.h +./templates/who.o: ./core/textstream.h models/winixmodel.h ./core/header.h +./templates/who.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./templates/who.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./templates/who.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./templates/who.o: db/dbtextstream.h core/textstream.h core/error.h +./templates/who.o: models/user.h models/group.h core/dircontainer.h +./templates/who.o: core/ugcontainer.h ./core/mountparser.h ./core/session.h +./templates/who.o: ./core/rebus.h ./core/ipban.h core/loadavg.h core/dirs.h +./templates/who.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./templates/who.o: core/groups.h core/ugcontainer.h core/image.h +./templates/who.o: core/threadmanager.h models/winixmodelconnector.h +./templates/who.o: notify/notify.h core/winixmodeldeprecated.h +./templates/who.o: notify/notifypool.h templates/locale.h +./templates/who.o: templates/patterns.h notify/notifythread.h +./templates/who.o: core/basethread.h notify/templatesnotify.h core/users.h +./templates/who.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/who.o: core/sessionmanager.h +./templates/who.o: ../../pikotools/src/html/htmlparser.h core/winixrequest.h +./templates/who.o: core/winixsystem.h core/slog.h core/misc.h ./templates/who.o: core/winix_const.h ../../pikotools/src/convert/convert.h ./templates/who.o: ../../pikotools/src/convert/inttostr.h ./templates/who.o: ../../pikotools/src/convert/patternreplacer.h @@ -9599,46 +10363,93 @@ ./templates/winix.o: ../../pikotools/src/convert/strtoint.h ./templates/winix.o: templates/htmltextstream.h templates/indexpatterns.h ./templates/winix.o: templates/patterns.h templates/changepatterns.h -./templates/winix.o: core/cur.h core/system.h core/sessionmanager.h -./templates/winix.o: ../../pikotools/src/html/htmlparser.h db/db.h -./templates/winix.o: db/dbbase.h db/dbconn.h db/dbtextstream.h -./templates/winix.o: core/textstream.h core/error.h models/user.h -./templates/winix.o: models/group.h core/dircontainer.h core/ugcontainer.h -./templates/winix.o: ./core/winixbase.h core/winixrequest.h -./templates/winix.o: core/winixsystem.h ./core/winixmodeldeprecated.h -./templates/winix.o: ./core/plugin.h ./core/pluginmsg.h ./core/plugindata.h -./templates/winix.o: core/slog.h ./core/cur.h ./core/request.h +./templates/winix.o: core/cur.h core/system.h core/job.h ./core/basethread.h +./templates/winix.o: ./core/winixmodeldeprecated.h core/jobtask.h +./templates/winix.o: core/request.h ./core/cur.h ./core/request.h ./templates/winix.o: ./core/requesttypes.h ./core/error.h ./core/config.h ./templates/winix.o: ./core/textstream.h models/winixmodel.h ./core/header.h -./templates/winix.o: ./core/session.h ./core/rebus.h ./core/ipban.h -./templates/winix.o: ./core/mount.h templates/locale.h core/request.h +./templates/winix.o: ./core/compress.h ./core/winixbase.h ./core/plugin.h +./templates/winix.o: ./core/pluginmsg.h ./core/plugindata.h ./core/mount.h +./templates/winix.o: ./core/mounts.h db/db.h db/dbbase.h db/dbconn.h +./templates/winix.o: db/dbtextstream.h core/textstream.h core/error.h +./templates/winix.o: models/user.h models/group.h core/dircontainer.h +./templates/winix.o: core/ugcontainer.h ./core/mountparser.h ./core/session.h +./templates/winix.o: ./core/rebus.h ./core/ipban.h core/loadavg.h core/dirs.h +./templates/winix.o: core/dircontainer.h core/crypt.h core/run.h core/users.h +./templates/winix.o: core/groups.h core/ugcontainer.h core/image.h +./templates/winix.o: core/threadmanager.h models/winixmodelconnector.h +./templates/winix.o: notify/notify.h core/winixmodeldeprecated.h +./templates/winix.o: notify/notifypool.h templates/locale.h +./templates/winix.o: templates/patterns.h notify/notifythread.h +./templates/winix.o: core/basethread.h notify/templatesnotify.h core/users.h +./templates/winix.o: ./core/lastcontainer.h core/timezones.h core/timezone.h +./templates/winix.o: core/sessionmanager.h +./templates/winix.o: ../../pikotools/src/html/htmlparser.h +./templates/winix.o: core/winixrequest.h core/winixsystem.h core/slog.h ./templates/winix.o: core/misc.h core/winix_const.h ./templates/winix.o: ../../pikotools/src/convert/convert.h ./templates/winix.o: ../../pikotools/src/convert/inttostr.h ./templates/winix.o: ../../pikotools/src/convert/patternreplacer.h ./templates/winix.o: ../../pikotools/src/convert/double.h ./templates/winix.o: functions/functions.h functions/functionbase.h -./templates/winix.o: notify/notify.h core/winixmodeldeprecated.h -./templates/winix.o: notify/notifypool.h templates/patterns.h -./templates/winix.o: notify/notifythread.h core/basethread.h -./templates/winix.o: notify/templatesnotify.h core/users.h -./templates/winix.o: functions/functionparser.h functions/account.h -./templates/winix.o: functions/adduser.h functions/cat.h functions/chmod.h -./templates/winix.o: functions/privchanger.h functions/chown.h -./templates/winix.o: functions/ckeditor.h functions/cp.h functions/default.h -./templates/winix.o: functions/download.h functions/emacs.h functions/env.h -./templates/winix.o: models/userwrapper.h models/user.h functions/imgcrop.h -./templates/winix.o: functions/last.h functions/login.h functions/logout.h -./templates/winix.o: functions/ln.h functions/ls.h functions/man.h -./templates/winix.o: functions/meta.h functions/mkdir.h functions/mv.h -./templates/winix.o: functions/nicedit.h functions/node.h functions/passwd.h -./templates/winix.o: functions/priv.h functions/pw.h functions/reload.h -./templates/winix.o: functions/rm.h functions/rmuser.h ./core/run.h -./templates/winix.o: functions/sort.h functions/specialdefault.h -./templates/winix.o: functions/stat.h functions/subject.h -./templates/winix.o: functions/template.h ./core/timezone.h +./templates/winix.o: functions/functionparser.h core/dirs.h +./templates/winix.o: functions/account.h functions/adduser.h functions/cat.h +./templates/winix.o: functions/chmod.h functions/privchanger.h +./templates/winix.o: functions/chown.h functions/ckeditor.h functions/cp.h +./templates/winix.o: functions/default.h functions/download.h +./templates/winix.o: functions/emacs.h functions/env.h models/userwrapper.h +./templates/winix.o: models/user.h functions/imgcrop.h functions/last.h +./templates/winix.o: functions/login.h functions/logout.h functions/ln.h +./templates/winix.o: functions/ls.h functions/man.h functions/meta.h +./templates/winix.o: functions/mkdir.h functions/mv.h functions/nicedit.h +./templates/winix.o: functions/node.h functions/passwd.h functions/priv.h +./templates/winix.o: functions/pw.h functions/reload.h functions/rm.h +./templates/winix.o: functions/rmuser.h functions/sort.h +./templates/winix.o: functions/specialdefault.h functions/stat.h +./templates/winix.o: functions/subject.h functions/template.h ./templates/winix.o: functions/tinymce.h functions/uname.h functions/upload.h ./templates/winix.o: functions/uptime.h functions/who.h functions/vim.h +./utils/http.o: ./utils/http.h core/synchro.h +./utils/http.o: ../../pikotools/src/textstream/textstream.h +./utils/http.o: ../../pikotools/src/textstream/stream.h +./utils/http.o: ../../pikotools/src/space/space.h +./utils/http.o: ../../pikotools/src/date/date.h +./utils/http.o: ../../pikotools/src/convert/inttostr.h +./utils/http.o: ../../pikotools/src/membuffer/membuffer.h +./utils/http.o: ../../pikotools/src/textstream/types.h +./utils/http.o: ../../pikotools/src/utf8/utf8.h +./utils/http.o: ../../pikotools/src/textstream/stream.h +./utils/http.o: ../../pikotools/src/utf8/utf8_templates.h +./utils/http.o: ../../pikotools/src/utf8/utf8_private.h +./utils/http.o: ../../pikotools/src/utf8/utf8_stream.h core/winixbase.h +./utils/http.o: core/config.h ../../pikotools/src/space/spaceparser.h +./utils/http.o: ../../pikotools/src/space/space.h +./utils/http.o: ../../pikotools/src/textstream/types.h +./utils/http.o: ../../pikotools/src/convert/baseparser.h core/log.h +./utils/http.o: core/logmanipulators.h ../../pikotools/src/log/log.h +./utils/http.o: ../../pikotools/src/log/filelog.h ../../morm/src/morm.h +./utils/http.o: ../../morm/src/version.h ../../morm/src/morm_types.h +./utils/http.o: ../../morm/src/model.h ../../morm/src/modelconnector.h +./utils/http.o: ../../morm/src/clearer.h ../../morm/src/ft.h +./utils/http.o: ../../morm/src/dbconnector.h ../../morm/src/queryresult.h +./utils/http.o: ../../morm/src/flatconnector.h ../../morm/src/dbexpression.h +./utils/http.o: ../../morm/src/baseexpression.h ../../morm/src/modelenv.h +./utils/http.o: ../../morm/src/modeldata.h ../../morm/src/cursorhelper.h +./utils/http.o: ../../morm/src/finderhelper.h +./utils/http.o: ../../morm/src/fieldvaluehelper.h ../../morm/src/wrapper.h +./utils/http.o: ../../morm/src/spacewrapper.h +./utils/http.o: ../../morm/src/baseobjectwrapper.h +./utils/http.o: ../../morm/src/modelcontainerwrapper.h +./utils/http.o: ../../morm/src/select.h ../../ezc/src/funinfo.h +./utils/http.o: ../../ezc/src/item.h ../../pikotools/src/convert/text.h +./utils/http.o: ../../morm/src/flatexpression.h ../../morm/src/finder.h +./utils/http.o: ../../morm/src/cursor.h ../../morm/src/jsonexpression.h +./utils/http.o: ../../morm/src/postgresqlexpression.h +./utils/http.o: ../../morm/src/jsonconnector.h +./utils/http.o: ../../morm/src/postgresqlconnector.h +./utils/http.o: ../../morm/src/postgresqlqueryresult.h +./utils/http.o: ../../morm/src/transaction.h core/log.h core/filelog.h +./utils/http.o: core/lock.h ./core/synchro.h core/lock.h core/header.h ./utils/acceptbaseparser.o: utils/acceptbaseparser.h core/header.h ./utils/acceptbaseparser.o: ../../pikotools/src/convert/convert.h ./utils/acceptbaseparser.o: ../../pikotools/src/convert/inttostr.h diff --git a/winixd/core/app.cpp b/winixd/core/app.cpp index 1050c62..2626a13 100644 --- a/winixd/core/app.cpp +++ b/winixd/core/app.cpp @@ -51,6 +51,8 @@ #include "utf8/utf8.h" #include "convert/convert.h" #include "models/migration.h" +#include "lock.h" + namespace Winix @@ -64,6 +66,7 @@ App::App() stdout_is_closed = false; last_sessions_save = std::time(0); fcgi_socket = -1; + request_id = 1; file_log.set_synchro(&synchro); file_log.set_time_zones(&system.time_zones); @@ -95,33 +98,24 @@ App::App() config.SetFileLog(&file_log); config.SetLogBuffer(&log_buffer); - - // temporary there is only one request - cur.request = &req; - cur.session = session_manager.GetTmpSession(); - cur.mount = system.mounts.GetEmptyMount(); + cur.request = nullptr; + cur.session = nullptr; + cur.mount = nullptr; db_conn.set_dependency(&winix_base); db.set_dependency(&winix_base); db.SetConn(db_conn); - plugin.set_dependency(&winix_base); + plugin.set_dependency(&winix_model); plugin.SetDb(&db); - //plugin.SetConfig(&config); plugin.SetCur(&cur); plugin.SetSystem(&system); plugin.SetFunctions(&functions); plugin.SetTemplates(&templates); - //plugin.SetSynchro(&synchro); plugin.SetSessionManager(&session_manager); plugin.SetWinixRequest(&winix_request); - req.SetConfig(&config); - req.set_connector(&model_connector); - - - functions.set_dependency(&winix_request); // functions.set_config(&config); // functions.set_file_log(&file_log); @@ -163,7 +157,6 @@ App::App() } - void App::InitLoggers() { file_log.init(config.log_file, config.log_stdout, config.log_level, config.log_save_each_line, config.log_time_zone_id); @@ -178,12 +171,6 @@ Log & App::GetMainLog() -void App::LoadPlugins() -{ - plugin.LoadPlugins(config.plugins_dir, config.plugin_file); -} - - bool App::TranslateFCGInames(char * sock, char * sock_user, char * sock_group) { if( !wide_to_utf8(config.fcgi_socket, sock, WINIX_OS_PATH_SIZE) ) @@ -291,17 +278,10 @@ char sock_group[WINIX_OS_USERNAME_SIZE]; return false; } - if( FCGX_InitRequest(&fcgi_request, fcgi_socket, FCGI_FAIL_ACCEPT_ON_INTR) != 0 ) - { - log << log1 << "App: FCGX_InitRequest fails" << logend; - return false; - } - return true; } - bool App::DoDatabaseMigration() { bool ok = true; @@ -330,7 +310,6 @@ bool App::DoDatabaseMigration() } - bool App::TryToMakeDatabaseMigration() { if( config.db_make_migration_if_needed ) @@ -344,7 +323,7 @@ bool App::TryToMakeDatabaseMigration() } } - PluginRes res = plugin.Call(nullptr, WINIX_MAKE_DATABASE_MIGRATION); + PluginRes res = plugin.Call(WINIX_MAKE_DATABASE_MIGRATION); if( config.db_stop_if_migration_fails && res.res_false > 0 ) { @@ -359,7 +338,7 @@ bool App::TryToMakeDatabaseMigration() bool App::InitializePlugins() { - PluginRes plugin_res = plugin.Call((Session*)0, WINIX_PLUGIN_INIT); + PluginRes plugin_res = plugin.Call(WINIX_PLUGIN_INIT); if( plugin_res.res_false > 0 ) { @@ -373,10 +352,6 @@ bool App::InitializePlugins() bool App::Init() { - // load plugins before loading sessions - session_manager.LoadSessions() - // because some of the plugins can init its own sessions dates - LoadPlugins(); - if( !config.db_conn_string.empty() ) postgresql_connector.set_conn_param(config.db_conn_string); else @@ -394,7 +369,7 @@ bool App::Init() model_connector.set_db_connector(postgresql_connector); model_connector.set_logger(log); model_connector.set_winix_config(&config); - model_connector.set_winix_request(&req); + //model_connector.set_winix_request(&req); model_connector.set_winix_logger(&log); model_connector.set_winix_dirs(&system.dirs); model_connector.set_winix_mounts(&system.mounts); @@ -407,6 +382,10 @@ bool App::Init() model_connector.set_winix_time_zones(&system.time_zones); model_connector.set_winix_pattern_cacher(&TemplatesFunctions::pattern_cacher); + // load plugins before loading sessions - session_manager.LoadSessions() + // because some of the plugins can init its own sessions datas + plugin.LoadPlugins(config.plugins_dir, config.plugin_file); + // CHECKME this will call WINIX_MAKE_DATABASE_MIGRATION, but WINIX_PLUGIN_INIT was not called yet, it is correct? if( !TryToMakeDatabaseMigration() ) return false; @@ -422,7 +401,6 @@ bool App::Init() db.LogQueries(config.log_db_query); - cur.request->Clear(); compress.set_dependency(&winix_base); compress.Init(); @@ -455,17 +433,15 @@ bool App::Init() } - void App::Close() { { Winix::Lock lock(synchro); - plugin.Call((Winix::Session*)0, WINIX_PREPARE_TO_CLOSE); + plugin.Call(WINIX_PREPARE_TO_CLOSE); session_manager.SaveSessions(); session_manager.DeleteSessions(); - cur.request->Clear(); session_manager.UninitTmpSession(); functions.Finish(); @@ -479,12 +455,12 @@ void App::Close() * at the moment plugins are removed when winix is finishing * but in the future we can add plug-in removal before the end */ - plugin.Call(nullptr, WINIX_PLUGIN_QUIT); + plugin.Call(WINIX_PLUGIN_QUIT); /* * this is the last message for plugins */ - plugin.Call(nullptr, WINIX_QUIT); + plugin.Call(WINIX_QUIT); } @@ -505,10 +481,9 @@ void App::BaseUrlRedirect(int code, bool add_subdomain) } - bool App::BaseUrlRedirect() { - plugin.Call((Session*)0, WINIX_BASE_URL_REDIRECT); + plugin.Call(WINIX_BASE_URL_REDIRECT); if( !cur.request->redirect_to.empty() ) return true; @@ -532,9 +507,6 @@ return true; } - - - void App::CheckIfNeedSSLredirect() { if( cur.request->method == Request::post ) @@ -589,8 +561,6 @@ void App::CheckIfNeedSSLredirect() } - - void App::SetLocale() { size_t locale_id; @@ -611,7 +581,6 @@ size_t locale_id; } - bool App::CheckAccessFromPlugins() { PluginRes res = plugin.Call(WINIX_CHECK_PLUGIN_ACCESS); @@ -628,10 +597,6 @@ return true; } - - - - /* * REFACTOR ME */ @@ -651,8 +616,6 @@ void App::MakeRenameMeToABetterName() */ cur.request->item.set_connector(model_connector); - cur.mount = system.mounts.CalcCurMount(); - cur.session = session_manager.PrepareSession(); model_connector.set_winix_session(cur.session); @@ -715,30 +678,31 @@ void App::MakeRenameMeToABetterName() if( cur.request->status == WINIX_ERR_OK && cur.request->http_status == Header::status_200_ok ) functions.MakeFunction(); - if( cur.session->spam_score > 0 ) - log << log1 << "App: spam score: " << cur.session->spam_score << logend; - - if( cur.request->IsParam(L"noredirect") ) - cur.request->redirect_to.clear(); - - if( cur.request->status == WINIX_ERR_OK && cur.request->http_status == Header::status_200_ok ) - plugin.Call(WINIX_PROCESS_REQUEST); - - CheckPostRedirect(); - - if( !cur.request->redirect_to.empty() ) - return; - - if( cur.request->dir_tab.empty() ) + if( cur.request->run_state == Request::RunState::normal_run ) { - log << log1 << "App: there is no a root dir (dir_tab is empty -- after calling a function)" << logend; - return; + if( cur.session->spam_score > 0 ) + log << log1 << "App: spam score: " << cur.session->spam_score << logend; + + if( cur.request->IsParam(L"noredirect") ) + cur.request->redirect_to.clear(); + + if( cur.request->status == WINIX_ERR_OK && cur.request->http_status == Header::status_200_ok ) + plugin.Call(WINIX_PROCESS_REQUEST); + + CheckPostRedirect(); + + if( !cur.request->redirect_to.empty() ) + return; + + if( cur.request->dir_tab.empty() ) + { + log << log1 << "App: there is no a root dir (dir_tab is empty -- after calling a function)" << logend; + return; + } } } - - bool App::AddRootDir() { Item * root_dir = system.dirs.GetRootDir(); @@ -758,7 +722,6 @@ bool App::AddRootDir() } - void App::ProcessRequestThrow() { if( AddRootDir() ) @@ -772,6 +735,8 @@ void App::ProcessRequestThrow() ReadPostVars(); } + cur.mount = system.mounts.CalcCurMount(cur.request); + if( cur.mount->type != system.mounts.MountTypeStatic() ) { MakeRenameMeToABetterName(); @@ -788,18 +753,23 @@ void App::ProcessRequest() cur.request->set_connector(model_connector); model_connector.set_winix_request(cur.request); - cur.request->RequestStarts(); system.load_avg.StartRequest(cur.request); log << log2 << config.log_delimiter << logend; ProcessRequestThrow(); - ModifyStatusCodeIfNeeded(); - SendAnswer(); + + if( cur.request->run_state == Request::RunState::normal_run ) + { + cur.request->FinishRequest(); + system.load_avg.StopRequest(cur.request); + } + SaveSessionsIfNeeded(); - cur.request->RequestEnds(); - system.load_avg.StopRequest(cur.request); - LogRequestTime(); + if( cur.request->run_state == Request::RunState::finished ) + { + ClearAfterRequest(); + } } catch(const std::exception & e) { @@ -813,49 +783,25 @@ void App::ProcessRequest() { log << log1 << "App: there was an unknown exception" << logend; } - - ClearAfterRequest(); } - void App::ClearAfterRequest() { - try - { - plugin.Call(WINIX_END_REQUEST); - } - catch(...) - { - log << log1 << "App: an exception from a plugin when clearing after a request" << logend; - } - - try { // simple operations which should not throw an exception - json_out_stream.clear(); - templates.ClearAfterRequest(); cur.request->Clear(); cur.session->ClearAfterRequest(); cur.session = session_manager.GetTmpSession(); - output_8bit.clear(); - output_tmp_filtered_stream.clear(); - compressed_output.clear(); - //html_filtered.clear(); - aheader_name.clear(); - aheader_value.clear(); cur.mount = system.mounts.GetEmptyMount(); system.mounts.pmount = cur.mount; // IMPROVE ME system.mounts.pmount will be removed - post_log_tmp_buffer.clear(); // send_data_buf doesn't have to be cleared and it is better to not clear it (optimizing) model_connector.set_winix_request(nullptr); model_connector.set_winix_session(nullptr); model_connector.set_winix_session_logger(nullptr); - cur.request->item.set_connector(nullptr); // it is needed? - log << logendrequest; } catch(...) @@ -865,34 +811,194 @@ void App::ClearAfterRequest() } +bool App::InitializeRequestForFastCGI() +{ + bool request_initialized = false; + + while( !synchro.was_stop_signal && !request_initialized ) + { + if( FCGX_InitRequest(&cur.request->fcgi_request, fcgi_socket, FCGI_FAIL_ACCEPT_ON_INTR) == 0 ) + { + request_initialized = true; + } + else + { + log << log1 << "App: FCGX_InitRequest fails, I cannot read a new request, I wait 3s and will try again..." << logend << logsave; + sleep(3); // IMPROVEME put me to config + } + } + + return request_initialized; +} + + +void App::SetRequestDependency() +{ + cur.request->SetConfig(&config); + cur.request->SetTemplates(&templates); + cur.request->SetCompress(&compress); + cur.request->SetPlugin(&plugin); + cur.request->SetMounts(&system.mounts); + + cur.request->session = cur.session; + cur.request->mount = cur.mount; + + cur.request->set_connector(&model_connector); + cur.request->item.set_connector(&model_connector); +} + + +void App::InitializeNewRequest() +{ + SetRequestDependency(); + cur.request->Clear(); // IMPROVE ME what about an 'id' in request? it should be unique? + InitializeRequestForFastCGI(); +} + + +// use with lock/unlock +void App::PrepareRequest() +{ + Winix::Lock lock(synchro); + + if( system.req_tab.empty() ) + { + system.req_tab.resize(1); + } + + cur.request = &system.req_tab.back(); + InitializeNewRequest(); +} + + +void App::PutRequestToJob() +{ + if( cur.request->session ) + cur.request->session->allow_to_delete = false; + + if( cur.request->dir_tab.size() > 1 ) + { + // leave only the root dir, directories will be analyzed again + cur.request->dir_tab.resize(1); + } + + if( cur.request->is_item ) + cur.request->last_item = &cur.request->item; + else + if( !cur.request->dir_tab.empty() ) + cur.request->last_item = cur.request->dir_tab.back(); + else + cur.request->last_item = nullptr; + + system.job.Add(cur.request->job_id, cur.request, cur.request->job, Job::PRIORITY_REQUEST_CONTINUATION); + log << log3 << "App: this request (" << cur.request << ") has been moved to the job queue" << logend; +} void App::Start() { bool was_stop_signal = false; + FCGX_Request * fcgi_request = nullptr; { Winix::Lock lock(synchro); was_stop_signal = synchro.was_stop_signal; } - while( !was_stop_signal && FCGX_Accept_r(&fcgi_request) == 0 ) + PrepareRequest(); + { Winix::Lock lock(synchro); + fcgi_request = &cur.request->fcgi_request; + } + + while( !was_stop_signal && FCGX_Accept_r(fcgi_request) == 0 ) + { + Winix::Lock lock(synchro); + + cur.request = &system.req_tab.back(); // cur.request could have been changed by the job (we have at least one object in req_tab) + cur.session = session_manager.GetTmpSession(); + cur.mount = system.mounts.GetEmptyMount(); + cur.request->session = cur.session; + cur.request->mount = cur.mount; + cur.request->run_state = Request::RunState::normal_run; + cur.request->id = request_id; + cur.request->RequestStarts(); + bool do_process_request = true; if( synchro.was_stop_signal ) { was_stop_signal = true; - FCGX_Finish_r(&fcgi_request); + FCGX_Finish_r(&cur.request->fcgi_request); + do_process_request = false; } else + if( system.req_tab.size() > config.request_queue_job_limit ) + { + log << log2 << "App: requests queue exceeded limit of " << config.request_queue_job_limit + << " requests (skipping this request)" << logend; + + cur.request->http_status = Header::status_503_service_unavailale; + cur.request->FinishRequest(); + do_process_request = false; + + // although requests should be deleted at the end of the job + // we want to make sure no old requests are left + system.DeleteOldRequests(true); // true - leave at least one object + } + + if( do_process_request ) { ProcessRequest(); + + if( cur.request->run_state == Request::RunState::assigned_to_job ) + { + PutRequestToJob(); + + /* + * prepare a new request + */ + system.req_tab.resize(system.req_tab.size() + 1); + cur.request = &system.req_tab.back(); + InitializeNewRequest(); + } + } + + IncrementRequestId(); + fcgi_request = &cur.request->fcgi_request; + } + + WaitForRequestsToFinish(); +} + + +/* + * wait for requests from the jobs + */ +void App::WaitForRequestsToFinish() +{ + bool is_req_tab_empty = false; + + { + Winix::Lock lock(synchro); + system.DeleteOldRequests(); + is_req_tab_empty = system.req_tab.empty(); + } + + while( is_req_tab_empty ) + { + log << log3 << "App: waiting for requests to finish..." << logend << logsave; + sleep(1); + + { + Winix::Lock lock(synchro); + is_req_tab_empty = system.req_tab.empty(); } } } + void App::SaveSessionsIfNeeded() { time_t t = std::time(0); @@ -906,32 +1012,6 @@ void App::SaveSessionsIfNeeded() } -// !! IMPROVE ME change to a better name -void App::UseEzcGenerator() -{ -// if( cur.request->page_generated || !cur.request->redirect_to.empty() || !cur.request->x_sendfile.empty() ) -// return; - - - clock_gettime(CLOCK_REALTIME, &cur.request->timespec_ezc_engine_start); - - templates.SetEzcParameters( cur.request->gen_trim_white, - cur.request->gen_skip_new_line, - cur.request->gen_use_special_chars); - - templates.Generate(); - clock_gettime(CLOCK_REALTIME, &cur.request->timespec_ezc_engine_stop); - - timespec diff; - calculate_timespec_diff(cur.request->timespec_ezc_engine_start, cur.request->timespec_ezc_engine_stop, diff); - - pt::TextStream str; - timespec_to_stream_with_unit(diff, str); // IMPROVEME in the future Log can be used directly - - log << log3 << "App: ezc engine took: " << str << logend; -} - - void App::CheckPostRedirect() { if( cur.request->method == Request::post ) @@ -971,12 +1051,9 @@ void App::AddDefaultModels() } - - - void App::LogEnvironmentVariables() { - for(char ** e = fcgi_request.envp ; *e ; ++e ) + for(char ** e = cur.request->fcgi_request.envp ; *e ; ++e ) log << log1 << "Env: " << *e << logend; } @@ -1062,7 +1139,11 @@ void App::ReadRequest() ParseAcceptHeader(); ParseAcceptLanguageHeader(); + accept_encoding_parser.ParseAndLog(cur.request->env_http_accept_encoding, log); + cur.request->accept_deflate = accept_encoding_parser.AcceptDeflate(); + cur.request->accept_gzip = accept_encoding_parser.AcceptGzip(); + cookie_parser.Parse(cur.request->env_http_cookie, cur.request->cookie_tab); CheckIE(); @@ -1075,10 +1156,9 @@ void App::ReadRequest() } - void App::SetEnv(const char * name, std::wstring & env) { - const char * v = FCGX_GetParam(name, fcgi_request.envp); + const char * v = FCGX_GetParam(name, cur.request->fcgi_request.envp); if( v ) { @@ -1087,7 +1167,6 @@ void App::SetEnv(const char * name, std::wstring & env) } - /* * IMPROVE ME take it from cur.request.headers_in? */ @@ -1115,7 +1194,7 @@ void App::ReadEnvHTTPVariables() size_t http_prefix_len = sizeof(http_prefix) / sizeof(char) - 1; // 1 means terminating null character size_t http_headers_saved = 0; - for(char ** e = fcgi_request.envp ; *e && http_headers_saved < Request::MAX_INPUT_HEADERS ; ++e) + for(char ** e = cur.request->fcgi_request.envp ; *e && http_headers_saved < Request::MAX_INPUT_HEADERS ; ++e) { char * env = *e; @@ -1205,11 +1284,11 @@ void App::ReadEnvRemoteIP() pt::to_upper_emplace(http_header_name); pt::wide_to_utf8(http_header_name, http_header_8bit); - v = FCGX_GetParam(http_header_8bit.c_str(), fcgi_request.envp); + v = FCGX_GetParam(http_header_8bit.c_str(), cur.request->fcgi_request.envp); } else { - v = FCGX_GetParam("REMOTE_ADDR", fcgi_request.envp); + v = FCGX_GetParam("REMOTE_ADDR", cur.request->fcgi_request.envp); } if( v ) @@ -1220,7 +1299,6 @@ void App::ReadEnvRemoteIP() } - void App::CheckRequestMethod() { cur.request->method = Request::unknown_method; @@ -1242,7 +1320,6 @@ void App::CheckRequestMethod() } - void App::CheckSSL() { // !! CHECK ME @@ -1257,7 +1334,6 @@ void App::CheckSSL() } - void App::CheckHtmx() { // fastcgi will change the header to hx_request @@ -1270,7 +1346,6 @@ void App::CheckHtmx() } - void App::SetSubdomain() { CreateSubdomain(config.base_url.c_str(), cur.request->env_http_host.c_str(), cur.request->subdomain); @@ -1305,7 +1380,7 @@ void App::ReadInputPostToBuffer() do { - read_len = FCGX_GetStr(buffer, buffer_len, fcgi_request.in); + read_len = FCGX_GetStr(buffer, buffer_len, cur.request->fcgi_request.in); if( read_len > 0 ) post_buffer.write(buffer, read_len); @@ -1394,15 +1469,14 @@ void App::ReadPostJson() } - void App::ReadPostVars() { if( cur.request->method == Request::post || cur.request->method == Request::delete_ ) { - if( pt::is_substr_nc(L"multipart/form-data", cur.request->env_content_type.c_str()) ) + if( pt::is_substr_nc(Header::multipart_form_data, cur.request->env_content_type.c_str()) ) { - log << log3 << "App: post content type: multipart/form-data" << logend; - post_multi_parser.Parse(fcgi_request.in, *cur.request); // IMPROVEME add checking for return status + log << log3 << "App: post content type: " << Header::multipart_form_data << logend; + post_multi_parser.Parse(cur.request->fcgi_request.in, *cur.request); // IMPROVEME add checking for return status } else if( pt::is_substr_nc(Winix::Header::application_json, cur.request->env_content_type.c_str()) ) @@ -1411,22 +1485,32 @@ void App::ReadPostVars() ReadPostJson(); } else + if( pt::is_substr_nc(Header::application_x_www_form_urlencoded, cur.request->env_content_type.c_str()) ) { - // IMPROVE ME may to check a correct content-type header? - post_parser.Parse(fcgi_request.in, *cur.request); // IMPROVEME add checking for return status + log << log3 << "App: post content type: " << Winix::Header::application_x_www_form_urlencoded << logend; + post_parser.Parse(cur.request->fcgi_request.in, *cur.request); // IMPROVEME add checking for return status + } + else + if( cur.request->env_content_type.empty() ) + { + log << log2 << "App: Content-Type header is not set or is empty, I try to parse as " << Header::application_x_www_form_urlencoded << logend; + post_parser.Parse(cur.request->fcgi_request.in, *cur.request); // IMPROVEME add checking for return status + } + else + { + log << log2 << "App: I cannot parse the input body, an unknown Content-Type header: " << cur.request->env_content_type << logend; } if( config.log_whole_http_post ) { cur.request->post_in.serialize_to_json_stream(post_log_tmp_buffer, true); log << log3 << "App: the whole http post after parsing:" << logend << post_log_tmp_buffer << logend; + post_log_tmp_buffer.clear(); } } } - - void App::CheckIE() { size_t msie = cur.request->env_http_user_agent.find(L"MSIE"); @@ -1434,7 +1518,6 @@ void App::CheckIE() } - void App::CheckKonqueror() { size_t kon = cur.request->env_http_user_agent.find(L"Konqueror"); @@ -1442,500 +1525,6 @@ void App::CheckKonqueror() } - - - -void App::PrepareSessionCookie() -{ - if( !cur.session || cur.session->id==0 ) - return; - - if( config.session_cookie_encode ) - { - if( !session_manager.EncodeSessionId(cur.session->id, cur.session->id_index, cookie_id_string) ) - Toa(cur.session->id, cookie_id_string); - } - else - { - Toa(cur.session->id, cookie_id_string); - } - - - if( !cur.session->puser || !cur.session->remember_me ) - { - cur.request->AddCookie(config.http_session_id_name, cookie_id_string); - } - else - { - pt::Date expires = cur.request->start_time + config.session_remember_max_idle; - cur.request->AddCookie(config.http_session_id_name, cookie_id_string, expires); - } -} - - - -bool App::AddHeader(const wchar_t * name, const wchar_t * value) -{ - if( !cur.request->out_headers.has_key(name) ) - { - cur.request->out_headers.add(name, value); - return true; - } - -return false; -} - - -bool App::AddHeader(const std::wstring & name, const std::wstring & value) -{ - if( !cur.request->out_headers.has_key(name) ) - { - cur.request->out_headers.add(name, value); - return true; - } - -return false; -} - - -bool App::AddHeader(const wchar_t * name, const pt::WTextStream & value) -{ - if( !cur.request->out_headers.has_key(name) ) - { - cur.request->out_headers.add_stream(name, value); - return true; - } - -return false; -} - - -bool App::AddHeader(const std::wstring & name, const pt::WTextStream & value) -{ - if( !cur.request->out_headers.has_key(name) ) - { - cur.request->out_headers.add_stream(name, value); - return true; - } - -return false; -} - - -bool App::CreateStaticResourcePath(pt::WTextStream & out_path) -{ - size_t i = 0; - Item * dir = system.dirs.GetDir(system.mounts.pmount->dir_id); - - if( !dir ) - { - log << log1 << "App: cannot find the mount directory" << logend; - return false; - } - - size_t how_many_dirs = system.dirs.DirLevel(dir->id); - const wchar_t * path = SkipDirs(cur.request->env_request_uri.c_str(), how_many_dirs); - - // the path begins with a slash only if how_many_dirs is zero - while( *path == '/' ) - path += 1; - - while( path[i]!=0 && path[i]!='?' && path[i]!='#' ) - ++i; - - if( i > 0 ) - out_path.write(path, i); - -return true; -} - - -void App::PrepareSendFileHeaderForStaticMountpoint() -{ - if( PathHasUpDir(cur.request->env_request_uri) ) - { - log << log1 << "App: incorrect path for a static file" << logend; - cur.request->http_status = Header::status_403_forbidden; - return; - } - - const std::wstring & index_str = system.mounts.pmount->FirstArg(system.mounts.MountParStatic()); - size_t index = Toi(index_str); - - if( index >= config.static_dirs.size() ) - { - log << log1 << "App: static dir with index " << index << " is not defined in the config" << logend; - cur.request->http_status = Header::status_403_forbidden; - return; - } - - pt::WTextStream path; - path << config.static_dirs[index] << L"/"; - - if( !CreateStaticResourcePath(path) ) - { - cur.request->http_status = Header::status_403_forbidden; - return; - } - - /* - * FIX ME now we can send full path (apache, lighttpd) and relative path (nginx) - * but this feature for mounting static content probably will be removed - */ - if( AddHeader(config.send_file_header, path) ) - { - log << log2 << "App: sending a file from a static mountpoint: " << path << logend; - } -} - - -void App::PrepareHeaderContentType() -{ - if( !cur.request->out_headers.has_key(Winix::Header::content_type) ) - { - if( cur.request->container_type == Request::ContainerType::container_json ) - { - cur.request->out_headers.add(Winix::Header::content_type, Winix::Header::application_json_utf8); - } - else - if( cur.request->container_type == Request::ContainerType::container_xml ) - { - cur.request->out_headers.add(Winix::Header::content_type, Winix::Header::application_xml_utf8); - } - else - if( cur.request->container_type == Request::ContainerType::container_csv ) - { - cur.request->out_headers.add(Winix::Header::content_type, Winix::Header::text_csv_utf8); - } - else - if( cur.request->container_type == Request::ContainerType::container_raw ) - { - if( cur.request->send_bin_stream ) - { - cur.request->out_headers.add(Winix::Header::content_type, Winix::Header::application_octet_stream); - } - else - { - switch( config.content_type_header ) - { - case 1: - cur.request->out_headers.add(Winix::Header::content_type, Winix::Header::application_xhtml_xml_utf8); - break; - - case 2: - cur.request->out_headers.add(Winix::Header::content_type, Winix::Header::application_xml_utf8); - break; - - case 0: - default: - cur.request->out_headers.add(Winix::Header::content_type, Winix::Header::text_html_utf8); - } - } - } - } -} - - - -void App::ModifyStatusForRedirect() -{ - switch(cur.request->redirect_type) - { - case 300: - cur.request->http_status = Header::status_300_multiple_choices; - break; - - case 301: - cur.request->http_status = Header::status_301_moved_permanently; - break; - - case 302: - cur.request->http_status = Header::status_302_found; - break; - - case 307: - cur.request->http_status = Header::status_307_temporary_redirect; - break; - - case 303: - default: - cur.request->http_status = Header::status_303_see_other; - break; - } -} - - -void App::PrepareSendFileHeader() -{ - if( AddHeader(config.send_file_header, cur.request->x_sendfile) ) - { - log << log2 << "App: sending file: " << cur.request->x_sendfile << logend; - } -} - - -void App::PrepareContentEncodingHeader(int compress_encoding) -{ - if( compress_encoding == 0 || compress_encoding == 1 ) - { - AddHeader(L"Content-Encoding", L"deflate"); - } - else - { - AddHeader(L"Content-Encoding", L"gzip"); - } -} - - -void App::PrepareContentLengthHeader(size_t output_size) -{ - if( output_size != static_cast(-1) ) - { - pt::WTextStream buf; - buf << output_size; - AddHeader(L"Content-Length", buf); - } -} - - -// we can improve SendHeaders and SendCookies methods by checking -// whether there is a new line character in either a name or a value -// and if such character exists and is being sent to the client it breaks the http headers and content -// and if compression is enabled the client's browser will not be able to decompress the stream -void App::SendHeaders() -{ - pt::Space::ObjectType::iterator i; - pt::Space & headers = cur.request->out_headers; - - if( headers.is_object() ) - { - plugin.Call(WINIX_PREPARE_TO_SEND_HTTP_HEADERS, &headers); - - for(i=headers.value.value_object.begin() ; i != headers.value.value_object.end() ; ++i) - { - if( i->second->is_wstr() ) - { - pt::wide_to_utf8(i->first, aheader_name); - pt::wide_to_utf8(*i->second->get_wstr(), 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); - - if( config.log_http_answer_headers ) - log << log1 << "HTTP Header: " << aheader_name << ": " << aheader_value << logend; - } - else - { - log << log2 << "Skipping HTTP Header: " << i->first << " - it's not a wstr" << logend; - } - } - } -} - - - -void App::SendCookies() -{ - pt::Space::ObjectType::iterator i; - pt::Space & cookies = cur.request->out_cookies; - - if( cookies.is_object() ) - { - plugin.Call(WINIX_PREPARE_TO_SEND_HTTP_COOKIES, &cookies); - - for(i=cookies.value.value_object.begin() ; i != cookies.value.value_object.end() ; ++i) - { - if( i->second->is_wstr() ) - { - pt::wide_to_utf8(i->first, aheader_name); - pt::wide_to_utf8(*i->second->get_wstr(), 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); - - if( config.log_http_answer_headers ) - log << log1 << "HTTP Header: Set-Cookie: " << aheader_name << "=" << aheader_value << logend; - } - else - { - log << log2 << "Skipping Cookie: " << i->first << " - it's not a wstr" << logend; - } - } - } -} - - -void App::PrepareHeaderStatus(int http_status) -{ - pt::WTextStream value; - Header::prepare_status_value(http_status, value, false); - AddHeader(L"Status", value); - log << log2 << "App: http status: " << value << logend; -} - - - -void App::PrepareHeaders(bool compressing, int compress_encoding, size_t output_size) -{ - PrepareSessionCookie(); - - if( cur.request->send_as_attachment ) - { - AddHeader(L"Content-Disposition", L"attachment"); - } - - if( !cur.request->redirect_to.empty() ) - { - ModifyStatusForRedirect(); - AddHeader(L"Location", cur.request->redirect_to); - log << log2 << "App: redirect to: " << cur.request->redirect_to << logend; - } - else - if( system.mounts.pmount->type == system.mounts.MountTypeStatic() ) - { - PrepareSendFileHeaderForStaticMountpoint(); - } - else - if( !cur.request->x_sendfile.empty() ) - { - PrepareSendFileHeader(); - } - else - { - PrepareContentLengthHeader(output_size); - } - - if( compressing ) - { - PrepareContentEncodingHeader(compress_encoding); - } - - PrepareHeaderStatus(cur.request->http_status); - PrepareHeaderContentType(); -} - - - - -int App::SelectDeflateVersion() -{ - if( cur.request->browser_msie ) - return 0; // raw deflate - else - return 1; // deflate -} - - - -void App::SelectCompression(size_t source_len, bool & compression_allowed, int & compression_encoding) -{ - compression_allowed = false; - compression_encoding = 0; - - if( config.compression && - cur.request->redirect_to.empty() && - cur.request->x_sendfile.empty() && - !cur.request->browser_konqueror && /* !! sprawdzic czy Konqueror bedzie obslugiwal raw deflate */ - source_len >= config.compression_page_min_size ) - { - if( config.compression_encoding == 1 || config.compression_encoding == 10 ) - { - if( accept_encoding_parser.AcceptDeflate() ) - { - compression_allowed = true; - compression_encoding = SelectDeflateVersion(); - } - else - if( config.compression_encoding == 10 && accept_encoding_parser.AcceptGzip() ) - { - compression_allowed = true; - compression_encoding = 2; // gzip - } - } - - if( config.compression_encoding == 2 || config.compression_encoding == 20 ) - { - if( accept_encoding_parser.AcceptGzip() ) - { - compression_allowed = true; - compression_encoding = 2; // gzip - } - else - if( config.compression_encoding == 20 && accept_encoding_parser.AcceptDeflate() ) - { - compression_allowed = true; - compression_encoding = SelectDeflateVersion(); - } - } - } -} - - - - -bool App::CanSendContent() -{ - if( !cur.request->x_sendfile.empty() ) - { - // if there is a file to send then we do not send a content - return false; - } - - if( !cur.request->redirect_to.empty() ) - { - // if there is a redirect and no json is requred then we do not send the content - return false; - } - - if( cur.request->method == Request::head ) - { - return false; - } - - return true; -} - - - -void App::ModifyStatusCodeIfNeeded() -{ - Error status = cur.request->status; - - // moved from Templates when a pattern was selected - switch( status ) - { - case WINIX_ERR_INCORRECT_URI: // !!temporarily - case WINIX_ERR_INTERNAL_ERROR: // !! temprarily - case WINIX_ERR_PERMISSION_DENIED: - case WINIX_ERR_CANT_CHANGE_USER: - case WINIX_ERR_CANT_CHANGE_GROUP: - case WINIX_ERR_CANT_CHANGE_PRIVILEGES: - cur.request->http_status = Header::status_403_forbidden; - break; - - case WINIX_ERR_NO_ITEM: - case WINIX_ERR_NO_FUNCTION: - case WINIX_ERR_UNKNOWN_PARAM: - cur.request->http_status = Header::status_404_not_found; - break; - } - - if( cur.request->use_200_status_for_not_found_and_permission_denied && ( - cur.request->http_status == Header::status_404_not_found || - cur.request->http_status == Header::status_403_forbidden - )) - { - cur.request->http_status = Header::status_200_ok; - log << log3 << "App: changing the http response to: 200 OK" << logend; - } -} - - bool App::IsRequestedFrame() { if( !config.request_frame_parameter.empty() ) @@ -1947,535 +1536,6 @@ bool App::IsRequestedFrame() } -// IMPROVEME -// we can send directly from BinaryPage without copying to a temporary buffer -// (but there is no an interface in BinaryPage yet) -void App::SendData(const BinaryPage & page, FCGX_Stream * out) -{ - const size_t buf_size = 4096; - - if( send_data_buf.size() != buf_size ) - send_data_buf.resize(buf_size); - - BinaryPage::const_iterator i = page.begin(); - BinaryPage::const_iterator end = page.end(); - - while( i != end ) - { - size_t s = 0; - - for( ; i != end && s < buf_size ; ++i, ++s) - send_data_buf[s] = *i; - - if( s > 0 ) - FCGX_PutStr(send_data_buf.c_str(), s, out); - } -} - - - -void App::SendAnswer() -{ - output_8bit.clear(); - compressed_output.clear(); - - // may use CanSendContent() method? - // what about method HEAD? - if( !cur.request->redirect_to.empty() || !cur.request->x_sendfile.empty() ) - { - Send8bitOutput(output_8bit); // send empty content - return; - } - - plugin.Call(WINIX_CONTENT_MAKE); - - if( cur.request->use_ezc_engine ) - { - UseEzcGenerator(); - } - - if( cur.request->container_type == Request::ContainerType::container_raw && cur.request->send_bin_stream ) - { - Send8bitOutput(cur.request->out_bin_stream); - return; - } - else - if( cur.request->container_type == Request::ContainerType::container_raw ) - { - PrepareRawAnswer(); - } - else - if( cur.request->container_type == Request::ContainerType::container_json ) - { - PrepareJsonAnswer(); - } - else - if( cur.request->container_type == Request::ContainerType::container_xml ) - { - PrepareXmlAnswer(); - } - else - if( cur.request->container_type == Request::ContainerType::container_csv ) - { - PrepareCsvAnswer(); - } - - Send8bitOutput(output_8bit); -} - - -void App::PrepareRawAnswer() -{ - if( cur.request->send_main_stream ) - { - FilterHtmlIfNeeded(cur.request->out_main_stream.get_buffer(), output_8bit, false); - } - else - if( cur.request->send_all_frames ) - { - SerializeAllFrames(); - } - else - if( !cur.request->send_frames.empty() ) - { - SerializeSpecificFrames(); - } -} - - -void App::PrepareJsonAnswer() -{ - output_8bit << '{'; - PrepareContenerizedAnswer(); - output_8bit << '}'; -} - -void App::PrepareXmlAnswer() -{ - output_8bit << '<'; - pt::esc_to_xml(config.xml_root, output_8bit); - output_8bit << '>'; - - PrepareContenerizedAnswer(); - - output_8bit << "'; -} - - -void App::PrepareCsvAnswer() -{ - PrepareContenerizedAnswer(); -} - - -void App::PrepareContenerizedAnswer() -{ - bool put_separator = false; - - if( cur.request->serialize_models ) - { - SerializeModels(); - put_separator = true; - } - - if( cur.request->send_bin_stream ) - { - PutSeparatorIfNeeded(put_separator); - - // IMPLEMENT ME serialize binary stream as base64 and put in 'bin_stream' field - pt::WTextStream str; - str << "NOT IMPLEMENTED YET"; - SerializeStream(str, config.bin_stream_field.c_str()); - put_separator = true; - } - - if( cur.request->send_main_stream ) - { - PutSeparatorIfNeeded(put_separator); - SerializeStream(cur.request->out_main_stream.get_buffer(), config.main_stream_field.c_str()); - put_separator = true; - } - - if( cur.request->send_all_frames || !cur.request->send_frames.empty() ) - { - PutSeparatorIfNeeded(put_separator); - SerializeFieldJson(config.ezc_frames_field.c_str()); - output_8bit << "{"; - - if( cur.request->send_all_frames ) - { - SerializeAllFrames(); - } - else - if( !cur.request->send_frames.empty() ) - { - SerializeSpecificFrames(); - } - - output_8bit << "}"; - put_separator = true; - } -} - - -void App::PutSeparatorIfNeeded(bool put_separator) -{ - if( put_separator ) - { - switch( cur.request->container_type ) - { - case Request::ContainerType::container_json: - output_8bit << ","; - break; - - case Request::ContainerType::container_xml: - break; - - case Request::ContainerType::container_csv: - output_8bit << ";"; - break; - - case Request::ContainerType::container_raw: - default: - break; - } - } -} - - -void App::SerializeFieldJson(const wchar_t * field_name) -{ - if( field_name ) - { - output_8bit << '"'; - pt::esc_to_json(field_name, output_8bit); - output_8bit << "\":"; - } -} - - - -void App::SerializeStream(const pt::WTextStream & input_stream, const wchar_t * field_name) -{ - switch( cur.request->container_type ) - { - case Request::ContainerType::container_json: - SerializeStreamJson(input_stream, field_name); - break; - - case Request::ContainerType::container_xml: - SerializeStreamXml(input_stream, field_name); - break; - - case Request::ContainerType::container_csv: - SerializeStreamCsv(input_stream, field_name); - break; - - case Request::ContainerType::container_raw: - default: - FilterHtmlIfNeeded(input_stream, output_8bit, false); - break; - } -} - - -void App::SerializeStreamJson(const pt::WTextStream & input_stream, const wchar_t * field_name) -{ - SerializeFieldJson(field_name); - output_8bit << '"'; - - if( config.html_filter && cur.request->use_html_filter ) - { - TemplatesFunctions::html_filter.filter(input_stream, output_tmp_filtered_stream, true); - pt::esc_to_json(output_tmp_filtered_stream, output_8bit); - } - else - { - pt::esc_to_json(input_stream, output_8bit); - } - - output_8bit << '"'; -} - - -void App::SerializeStreamXml(const pt::WTextStream & input_stream, const wchar_t * field_name) -{ - if( field_name ) - { - output_8bit << '<'; - pt::esc_to_xml(field_name, output_8bit); - output_8bit << '>'; - } - - if( config.html_filter && cur.request->use_html_filter ) - { - TemplatesFunctions::html_filter.filter(input_stream, output_tmp_filtered_stream, true); - pt::esc_to_xml(output_tmp_filtered_stream, output_8bit); - } - else - { - pt::esc_to_xml(input_stream, output_8bit); - } - - if( field_name ) - { - output_8bit << "'; - } -} - - -void App::SerializeStreamCsv(const pt::WTextStream & input_stream, const wchar_t * field_name) -{ - if( field_name ) - { - output_8bit << '"'; - pt::esc_to_csv(field_name, output_8bit); - output_8bit << "\";"; - } - - output_8bit << '"'; - - if( config.html_filter && cur.request->use_html_filter ) - { - TemplatesFunctions::html_filter.filter(input_stream, output_tmp_filtered_stream, true); - pt::esc_to_csv(output_tmp_filtered_stream, output_8bit); - } - else - { - pt::esc_to_csv(input_stream, output_8bit); - } - - output_8bit << "\";\n"; -} - - -void App::SerializeAllFrames() -{ - auto i = cur.request->out_streams.streams_map.begin(); - bool is_first = true; - - for( ; i != cur.request->out_streams.streams_map.end() ; ++i) - { - if( cur.request->container_type == Request::ContainerType::container_json && !is_first ) - { - output_8bit << ','; - } - - if( cur.request->container_type == Request::ContainerType::container_xml && i->first.empty() ) - { - log << log2 << "App: I cannot serialize a frame with an empty name to xml (frame skipped)" << logend; - } - else - { - SerializeStream(i->second->get_buffer(), i->first.c_str()); - } - - is_first = false; - } -} - - -void App::SerializeSpecificFrames() -{ - bool is_first = true; - - for(std::wstring & frame: cur.request->send_frames) - { - auto i = cur.request->out_streams.streams_map.find(frame); - - if( i != cur.request->out_streams.streams_map.end() ) - { - if( cur.request->container_type == Request::ContainerType::container_json && !is_first ) - { - output_8bit << ','; - } - - SerializeStream(i->second->get_buffer(), frame.c_str()); - is_first = false; - } - else - { - log << log2 << "App: there is no such a frame: " << frame << logend; - } - } -} - - -void App::SerializeModels() -{ - Ezc::Models::ModelsMap models_map = cur.request->models.GetMap(); - auto i = models_map.begin(); - bool is_first = true; - - for( ; i != models_map.end() ; ++i) - { - if( cur.request->container_type == Request::ContainerType::container_json && !is_first ) - { - output_8bit << ','; - } - - if( cur.request->container_type == Request::ContainerType::container_xml && i->first.empty() ) - { - log << log2 << "App: I cannot serialize a model with an empty name to xml (model skipped)" << logend; - } - else - { - SerializeModel(i->second, i->first.c_str()); - } - - is_first = false; - } -} - - -void App::SerializeModel(morm::Wrapper & wrapper, const wchar_t * field_name) -{ - switch( cur.request->container_type ) - { - case Request::ContainerType::container_json: - SerializeModelJson(wrapper, field_name); - break; - - case Request::ContainerType::container_xml: - SerializeModelXml(wrapper, field_name); - break; - - case Request::ContainerType::container_csv: - SerializeModelCsv(wrapper, field_name); - break; - - case Request::ContainerType::container_raw: - default: - break; - } -} - - -void App::SerializeModelJson(morm::Wrapper & wrapper, const wchar_t * field_name) -{ - SerializeFieldJson(field_name); - - if( wrapper.model ) - { - serialized_model.clear(); - wrapper.model->set_connector(model_connector); - wrapper.model->to_text(serialized_model); - output_8bit << serialized_model; - } - - if( wrapper.date ) - { - output_8bit << '"'; - wrapper.date->SerializeISO(output_8bit); - output_8bit << '"'; - } - - if( wrapper.space_wrapper ) - { - wrapper.space_wrapper->get_space()->serialize_to_json_stream(output_8bit, false); - } - - if( wrapper.model_container_wrapper ) - { - wrapper.model_container_wrapper->set_iterator_at_first_model(); - bool is_first = true; - output_8bit << '['; - - while( wrapper.model_container_wrapper->is_iterator_correct() ) - { - if( !is_first ) - output_8bit << ','; - - morm::Model * model = wrapper.model_container_wrapper->get_model(); - serialized_model.clear(); - model->set_connector(model_connector); - model->to_text(serialized_model); - output_8bit << serialized_model; - - wrapper.model_container_wrapper->increment_iterator(); - is_first = false; - } - - output_8bit << ']'; - } -} - - -void App::SerializeModelXml(morm::Wrapper & wrapper, const wchar_t * field_name) -{ - // IMPROVEME - log << log2 << "App: serializing models to xml not implemented yet" << logend; -} - - -void App::SerializeModelCsv(morm::Wrapper & wrapper, const wchar_t * field_name) -{ - // IMPROVEME - log << log2 << "App: serializing models to csv not implemented yet" << logend; -} - - - - -// IMPROVEME -// gime me a better name -void App::FilterHtmlIfNeeded(const pt::WTextStream & input_stream, BinaryPage & output, bool clear_stream) -{ - if( config.html_filter && cur.request->use_html_filter ) - { - TemplatesFunctions::html_filter.filter(input_stream, output, clear_stream); - } - else - { - pt::wide_stream_to_utf8(input_stream, output, clear_stream); - } -} - - - -void App::Send8bitOutput(BinaryPage & output) -{ - bool compressing = false; - int compress_encoding = 0; - size_t output_size = 0; - - SelectCompression(output.size(), compressing, compress_encoding); - - if( config.log_server_answer ) - { - log << log1 << "App: the server's answer is:\n" << output << "\nApp: end of the server's answer" << logend; - } - - if( compressing ) - { - compress.Compressing(output, compressed_output, compress_encoding); - output_size = compressed_output.size(); - } - else - { - output_size = output.size(); - } - - PrepareHeaders(compressing, compress_encoding, output_size); - SendHeaders(); - SendCookies(); - FCGX_PutS("\r\n", fcgi_request.out); - - if( CanSendContent() ) - { - if( compressing ) - SendData(compressed_output, fcgi_request.out); - else - SendData(output, fcgi_request.out); - } -} - - - void App::LogUser(const char * msg, uid_t id) { log << log3 << msg << " "; @@ -2526,7 +1586,6 @@ uid_t eid, rid; } - void App::LogEffectiveGroups(std::vector & tab) { log << log3 << "App: effective groups:"; @@ -2598,15 +1657,6 @@ void App::LogUserGroups() } -void App::LogRequestTime() -{ - pt::TextStream str; - timespec_to_stream_with_unit(cur.request->timespec_req_diff, str); - log << log2 << "App: request took: " << str << logend; -} - - - bool App::DropPrivileges(char * user, char * group) { if( !wide_to_utf8(config.user, user, WINIX_OS_USERNAME_SIZE) ) @@ -2619,7 +1669,6 @@ return true; } - bool App::DropPrivileges(const char * user, uid_t uid, gid_t gid, bool additional_groups) { if( additional_groups ) @@ -2663,7 +1712,6 @@ return true; } - bool App::DropPrivileges() { char user_name[WINIX_OS_USERNAME_SIZE]; @@ -2713,7 +1761,6 @@ return true; } - bool App::Demonize() { // in linux fork() should be used twice @@ -2756,15 +1803,9 @@ bool App::WasStopSignal() } -bool App::Lock() +Synchro * App::GetSynchro() { - return synchro.Lock(); -} - - -void App::Unlock() -{ - synchro.Unlock(); + return &synchro; } @@ -2775,9 +1816,6 @@ void App::WaitForThreads() } - - - /* we send a one FastCGI record at the end when winix closes (to wake up the main thread) this method is called from the special thread @@ -2853,12 +1891,13 @@ int sig; // waiting for SIGTERM or SIGINT sigwait(&set, &sig); - app->Lock(); - app->synchro.was_stop_signal = true; - FCGX_ShutdownPending(); + { + Lock lock(app->GetSynchro()); + app->synchro.was_stop_signal = true; + FCGX_ShutdownPending(); - pt::wide_to_utf8(app->config.fcgi_socket, app->socket_to_send_on_exit); - app->Unlock(); + pt::wide_to_utf8(app->config.fcgi_socket, app->socket_to_send_on_exit); + } app->SendEmptyFastCGIPacket(); @@ -2890,7 +1929,6 @@ void App::StartThreads() } - void App::CreateStaticTree() { if( config.upload_dir.empty() ) @@ -2911,6 +1949,14 @@ void App::CreateStaticTree() } +void App::IncrementRequestId() +{ + if( ++request_id == 0 ) + { + ++request_id; + } +} + } // namespace Winix diff --git a/winixd/core/app.h b/winixd/core/app.h index 3d0f038..b702ddb 100644 --- a/winixd/core/app.h +++ b/winixd/core/app.h @@ -74,18 +74,20 @@ public: bool DropPrivileges(); void InitLoggers(); Log & GetMainLog(); - void LoadPlugins(); bool InitializePlugins(); bool Init(); + bool InitializeRequestForFastCGI(); + void SetRequestDependency(); + void InitializeNewRequest(); + void PrepareRequest(); + void PutRequestToJob(); void Start(); void Close(); void LogUserGroups(); - void LogRequestTime(); bool Demonize(); void SetStopSignal(); bool WasStopSignal(); - bool Lock(); - void Unlock(); + Synchro * GetSynchro(); void StartThreads(); void WaitForThreads(); @@ -95,10 +97,6 @@ public: // pointers to the current request and a session Cur cur; - // temporary one request object - // current request - Request req; - // users sessions SessionManager session_manager; @@ -106,7 +104,8 @@ public: Db db; DbConn db_conn; - + // an unique id for each request + size_t request_id; // ... System system; @@ -136,24 +135,12 @@ private: AcceptBaseParser accept_base_parser; AcceptEncodingParser accept_encoding_parser; Compress compress; - FCGX_Request fcgi_request; int fcgi_socket; Synchro synchro; pthread_t signal_thread; std::string socket_to_send_on_exit; - std::string send_data_buf; - pt::WTextStream json_out_stream; - std::string aheader_name, aheader_value; - //std::wstring html_filtered; - //std::string output_8bit; - pt::TextStream serialized_model; pt::WTextStream post_log_tmp_buffer; - pt::WTextStream output_tmp_filtered_stream; - BinaryPage output_8bit; - BinaryPage compressed_output; - - std::wstring cookie_id_string; std::wstring http_header_name; std::wstring http_header_value; std::string http_header_8bit; @@ -199,48 +186,15 @@ private: void CheckIfNeedSSLredirect(); void SetLocale(); void CheckPostRedirect(); - void UseEzcGenerator(); void AddDefaultModels(); void SaveSessionsIfNeeded(); // !! IMPROVE ME wywalic do menagera sesji?? void LogAccess(); - void SendData(const BinaryPage & page, FCGX_Stream * out); - void ReadRequest(); - - void SendAnswer(); - void PrepareRawAnswer(); - void PrepareJsonAnswer(); - void PrepareXmlAnswer(); - void PrepareCsvAnswer(); - void PrepareContenerizedAnswer(); - - void PutSeparatorIfNeeded(bool put_separator); - - void SerializeFieldJson(const wchar_t * field_name); - - void SerializeStream(const pt::WTextStream & input_stream, const wchar_t * field_name); - void SerializeStreamJson(const pt::WTextStream & input_stream, const wchar_t * field_name); - void SerializeStreamXml(const pt::WTextStream & input_stream, const wchar_t * field_name); - void SerializeStreamCsv(const pt::WTextStream & input_stream, const wchar_t * field_name); - void SerializeAllFrames(); - void SerializeSpecificFrames(); - void SerializeModels(); - void Send8bitOutput(BinaryPage & output); - - void SerializeModel(morm::Wrapper & wrapper, const wchar_t * field_name); - void SerializeModelJson(morm::Wrapper & wrapper, const wchar_t * field_name); - void SerializeModelXml(morm::Wrapper & wrapper, const wchar_t * field_name); - void SerializeModelCsv(morm::Wrapper & wrapper, const wchar_t * field_name); - - void FilterHtmlIfNeeded(const pt::WTextStream & input_stream, BinaryPage & output, bool clear_stream = true); - - void LogEnvironmentVariables(); void LogEnvironmentHTTPVariables(); void ParseAcceptHeader(const wchar_t * header_name, const std::wstring & env, std::vector & container, size_t max_len); void ParseAcceptHeader(); void ParseAcceptLanguageHeader(); - void SetEnv(const char * name, std::wstring & env); void ReadEnvVariables(); void ReadEnvHTTPVariables(); @@ -250,37 +204,17 @@ private: void ParsePostJson(); void ReadPostJson(); void ReadPostVars(); - void CheckIE(); void CheckKonqueror(); void CheckRequestMethod(); void CheckSSL(); void CheckHtmx(); void SetSubdomain(); - bool IsRequestedFrame(); - - void ModifyStatusCodeIfNeeded(); - void PrepareSessionCookie(); void SendHeaders(); void SendCookies(); - bool AddHeader(const wchar_t * name, const wchar_t * value); - bool AddHeader(const std::wstring & name, const std::wstring & value); - bool AddHeader(const wchar_t * name, const pt::WTextStream & value); - bool AddHeader(const std::wstring & name, const pt::WTextStream & value); - bool CreateStaticResourcePath(pt::WTextStream & out_path); - void PrepareSendFileHeaderForStaticMountpoint(); - void PrepareHeaderContentType(); - void ModifyStatusForRedirect(); - void PrepareSendFileHeader(); - void PrepareContentEncodingHeader(int compress_encoding); - void PrepareContentLengthHeader(size_t output_size); - void PrepareHeaderStatus(int http_status); - void PrepareHeaders(bool compressing, int compress_encoding, size_t output_size); - int SelectDeflateVersion(); - void SelectCompression(size_t source_len, bool & compression_allowed, int & compression_encoding); - bool CanSendContent(); void ClearAfterRequest(); + void IncrementRequestId(); void LogUser(const char * msg, uid_t id); void LogGroup(const char * msg, gid_t id, bool put_logend = true); @@ -295,6 +229,7 @@ private: bool DoDatabaseMigration(); bool TryToMakeDatabaseMigration(); + void WaitForRequestsToFinish(); // !! IMPROVE ME diff --git a/winixd/core/basethread.cpp b/winixd/core/basethread.cpp index ce8ebbb..db06ab7 100644 --- a/winixd/core/basethread.cpp +++ b/winixd/core/basethread.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2019, Tomasz Sowa + * Copyright (c) 2010-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,10 +42,11 @@ namespace Winix BaseThread::BaseThread() : thread_signal(PTHREAD_COND_INITIALIZER) { - synchro = 0; - thread_id = 0; - work_mode = 0; - wake_up_was_called = false; + synchro = nullptr; + thread_id = 0; + work_mode = 0; + wake_up_was_called = false; + main_model_connector = nullptr; } @@ -66,6 +67,12 @@ void BaseThread::set_main_file_log(pt::FileLog * file_log) } +void BaseThread::set_main_model_connector(morm::ModelConnector * main_model_connector) +{ + this->main_model_connector = main_model_connector; +} + + void BaseThread::Mode(int mode) { work_mode = mode; diff --git a/winixd/core/basethread.h b/winixd/core/basethread.h index c7b20ba..b5c26ee 100644 --- a/winixd/core/basethread.h +++ b/winixd/core/basethread.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2019, Tomasz Sowa + * Copyright (c) 2010-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -57,6 +57,7 @@ public: void set_main_log_buffer(pt::WTextStream * log_buffer); void set_main_file_log(pt::FileLog * file_log); + void set_main_model_connector(morm::ModelConnector * main_model_connector); // work mode // we have two modes: @@ -105,11 +106,13 @@ protected: // logger for the main thread Log main_log; + // log from WinixBase is meant to be used by the second thread - // log from WinixBase is meant to be used by the other thread + // model connector for the main thread + // model_connector from the based class WinixModelDeprecated is meant to be used by the second thread + morm::ModelConnector * main_model_connector; -protected: // signal came (work mode = 0 - default) diff --git a/winixd/core/config.cpp b/winixd/core/config.cpp index d4933b3..ec41a52 100644 --- a/winixd/core/config.cpp +++ b/winixd/core/config.cpp @@ -135,7 +135,7 @@ void Config::AssignValues() fcgi_socket_chmod = Int(L"fcgi_socket_chmod", 0770); fcgi_socket_user = Text(L"fcgi_socket_user"); fcgi_socket_group = Text(L"fcgi_socket_group"); - fcgi_socket_listen = Int(L"fcgi_socket_listen", 100); + fcgi_socket_listen = Int(L"fcgi_socket_listen", 1024); log_level = Int(L"log_level", 1); log_request = Int(L"log_request", 1); log_save_each_line = Bool(L"log_save_each_line", false); @@ -344,6 +344,8 @@ void Config::AssignValues() use_antispam_mechanism_for_not_logged_users = Bool(L"use_antispam_mechanism_for_not_logged_users", true); antispam_list_max_size = Size(L"antispam_list_max_size", 10); add_header_cache_no_store_in_htmx_request = Bool(L"add_header_cache_no_store_in_htmx_request", true); + + request_queue_job_limit = Size(L"request_queue_job_limit", 1024); } diff --git a/winixd/core/config.h b/winixd/core/config.h index d237466..21847e9 100644 --- a/winixd/core/config.h +++ b/winixd/core/config.h @@ -94,7 +94,7 @@ public: bool log_stdout; // how many requests should be saved in the same time - // if you have a very busy server you can incrase this value + // if you have a very busy server you can increase this value // default: 1 int log_request; @@ -934,7 +934,7 @@ public: // default: X_Real_IP std::wstring proxy_ip_header; - // use an antismap mechanism for not logged users + // use an antispam mechanism for not logged users // when they try to add a new item // default: true bool use_antispam_mechanism_for_not_logged_users; @@ -952,6 +952,13 @@ public: // https://github.com/bigskysoftware/htmx/issues/497 bool add_header_cache_no_store_in_htmx_request; + // a limit for the queue for requests + // when a request is scheduled to a job + // default: 1024 + // if the limit is reached then the http status 503 Service Unavailable is returned + size_t request_queue_job_limit; + + Config(); diff --git a/winixd/core/cur.h b/winixd/core/cur.h index 8ff1067..64e782e 100644 --- a/winixd/core/cur.h +++ b/winixd/core/cur.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2014, Tomasz Sowa + * Copyright (c) 2010-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -56,6 +56,14 @@ struct Cur // those pointers are never null, if there is no a session for the user // the 'session' pointer pointers at a special temporary session + + Cur() + { + request = nullptr; + session = nullptr; + mount = nullptr; + } + }; diff --git a/winixd/core/header.h b/winixd/core/header.h index 50c885e..7ccbd41 100644 --- a/winixd/core/header.h +++ b/winixd/core/header.h @@ -83,6 +83,11 @@ public: static constexpr const wchar_t * text_csv_utf8 = L"text/csv; charset=UTF-8"; static constexpr const wchar_t * text_javascript_utf8 = L"text/javascript; charset=UTF-8"; + static constexpr const wchar_t * application_x_www_form_urlencoded = L"application/x-www-form-urlencoded"; + static constexpr const wchar_t * multipart_form_data = L"multipart/form-data"; + + static constexpr const wchar_t * bearer = L"Bearer"; + static const int status_200_ok = 200; static const int status_300_multiple_choices = 300; @@ -95,6 +100,7 @@ public: static const int status_404_not_found = 404; static const int status_414_uri_too_long = 414; static const int status_500_internal_server_error = 500; + static const int status_503_service_unavailale = 503; static constexpr const wchar_t * str_status_200 = L"OK"; @@ -108,6 +114,7 @@ public: static constexpr const wchar_t * str_status_404 = L"Not Found"; static constexpr const wchar_t * str_status_414 = L"URI Too Long"; static constexpr const wchar_t * str_status_500 = L"Internal Server Error"; + static constexpr const wchar_t * str_status_503 = L"Service Unavailable"; static const wchar_t * find_status_string_value(int http_status); @@ -135,6 +142,7 @@ protected: {status_404_not_found, str_status_404}, {status_414_uri_too_long, str_status_414}, {status_500_internal_server_error, str_status_500}, + {status_503_service_unavailale, str_status_503}, }; }; diff --git a/winixd/core/image.cpp b/winixd/core/image.cpp index 99dff5d..4e5f06c 100644 --- a/winixd/core/image.cpp +++ b/winixd/core/image.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2021, Tomasz Sowa + * Copyright (c) 2010-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -496,27 +496,27 @@ void Image::ImageSavedCorrectly() } log << log3 << "Image: generated a thumbnail: " << dst_path << logend; - plugin->Call((Session*)0, WINIX_CREATED_THUMB, &file_work); + plugin->Call(model_connector, &log, nullptr, WINIX_CREATED_THUMB, &file_work, nullptr, 0, 0); } else if( item_work.type == WINIX_IMAGE_TYPE_RESIZE ) { log << log3 << "Image: image resized: " << dst_path << logend; - plugin->Call((Session*)0, WINIX_IMAGE_RESIZED, &file_work); + plugin->Call(model_connector, &log, nullptr, WINIX_IMAGE_RESIZED, &file_work, nullptr, 0, 0); } else if( item_work.type == WINIX_IMAGE_TYPE_CROP ) { log << log3 << "Image: image cropped: " << dst_path << logend; // !! IMPROVE ME add a correct message - //plugin->Call((Session*)0, WINIX_IMAGE_RESIZED, &file_work); + //plugin->Call(model_connector, &log, nullptr, WINIX_IMAGE_RESIZED, &file_work, nullptr, 0, 0); } else if( item_work.type == WINIX_IMAGE_TYPE_CROP_THUMB ) { log << log3 << "Image: image thumbnail cropped: " << dst_path << logend; // !! IMPROVE ME add a correct message - //plugin->Call((Session*)0, WINIX_IMAGE_RESIZED, &file_work); + //plugin->Call(model_connector, &log, nullptr, WINIX_IMAGE_RESIZED, &file_work, nullptr, 0, 0); } else if( item_work.type == WINIX_IMAGE_TYPE_CREATE_CROP_NEW_THUMB ) diff --git a/winixd/core/job.cpp b/winixd/core/job.cpp index ac2ac50..03849b3 100644 --- a/winixd/core/job.cpp +++ b/winixd/core/job.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2012-2019, Tomasz Sowa + * Copyright (c) 2012-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,6 +35,9 @@ #include "job.h" #include "plugin.h" #include "log.h" +#include "functions/functions.h" +#include "lock.h" + namespace Winix @@ -45,31 +48,110 @@ namespace Winix Job::Job() { - jobs_queue_tab.resize(WINIX_JOBS_HOW_MANY_PRIORITIES); + jobs_queue_tab.resize(PRIORITY_HIGHEST + 1); + cur = nullptr; + functions = nullptr; + mounts = nullptr; + load_avg = nullptr; + req_tab = nullptr; } -void Job::CheckPriority(int & priority) const +void Job::SetCur(Cur * cur) { - if( priority < 0 ) - priority = 0; + this->cur = cur; +} - if( priority >= WINIX_JOBS_HOW_MANY_PRIORITIES ) - priority = WINIX_JOBS_HOW_MANY_PRIORITIES - 1; + +void Job::SetFunctions(Functions * functions) +{ + this->functions = functions; +} + + +void Job::SetLoadAvg(LoadAvg * load_avg) +{ + this->load_avg = load_avg; +} + + +void Job::SetMounts(Mounts * mounts) +{ + this->mounts = mounts; +} + + +void Job::SetReqTab(std::list * req_tab) +{ + this->req_tab = req_tab; +} + + +void Job::CheckPriority(size_t & priority) const +{ + if( priority > PRIORITY_HIGHEST ) + priority = PRIORITY_HIGHEST; } // first thread (objects locked) -void Job::Add(pt::Space & job, int priority) +void Job::Add(pt::Space & job, size_t priority) { CheckPriority(priority); - jobs_queue_tab[priority].push(job); + JobTask task; + task.job_type = JobTask::JOB_TYPE_DEFAULT; + task.job_id = JobTask::JOB_ID_DEFAULT; + task.job = job; + jobs_queue_tab[priority].push(task); + WakeUpThread(); +} + + +// first thread (objects locked) +void Job::Add(Request * request, pt::Space & job, size_t priority) +{ + CheckPriority(priority); + JobTask task; + task.job_type = JobTask::JOB_TYPE_REQUEST_CONTINUATION; + task.job_id = JobTask::JOB_ID_DEFAULT; + task.request = request; + task.job = job; + jobs_queue_tab[priority].push(task); WakeUpThread(); } -size_t Job::Size(int priority) const +// first thread (objects locked) +void Job::Add(long job_id, pt::Space & job, size_t priority) +{ + CheckPriority(priority); + JobTask task; + task.job_type = JobTask::JOB_TYPE_DEFAULT; + task.job_id = job_id; + task.job = job; + jobs_queue_tab[priority].push(task); + WakeUpThread(); +} + + +// first thread (objects locked) +void Job::Add(long job_id, Request * request, pt::Space & job, size_t priority) +{ + CheckPriority(priority); + JobTask task; + task.job_type = JobTask::JOB_TYPE_REQUEST_CONTINUATION; + task.job_id = job_id; + task.request = request; + task.job = job; + jobs_queue_tab[priority].push(task); + WakeUpThread(); +} + + + + +size_t Job::Size(size_t priority) const { CheckPriority(priority); return jobs_queue_tab[priority].size(); @@ -81,14 +163,14 @@ size_t Job::Size() const { size_t sum = 0; - for(size_t i=0 ; i 0 && !IsExitSignal() ) { do { - Lock(); - is_empty = Empty(i); - Unlock(); + { + Winix::Lock lock(synchro); + is_empty = Empty(i); + } if( !is_empty ) - DoQueue(jobs_queue_tab[i]); + DoQueue(jobs_queue_tab[i], i); } while( !is_empty && !IsExitSignal() ); } @@ -141,45 +224,144 @@ bool is_empty; // second thread (objects not locked, jobs_queue is not empty) -void Job::DoQueue(JobsQueue & jobs_queue) +void Job::DoQueue(JobsQueue & jobs_queue, size_t priority) { bool is_empty; do { - Lock(); // references will not be invalidated after insertion to jobs_queue // (jobs_queue is std::queue and it uses std::deque by default) - pt::Space & job = jobs_queue.front(); - Unlock(); + JobTask * job_task = nullptr; - DoJob(job); + { + Winix::Lock lock(synchro); - Lock(); - jobs_queue.pop(); - is_empty = jobs_queue.empty(); - Unlock(); + if( !jobs_queue.empty() ) + { + job_task = &jobs_queue.front(); + } + } + + if( job_task ) + { + DoJob(*job_task, priority); + + { + Winix::Lock lock(synchro); + + jobs_queue.pop(); + is_empty = jobs_queue.empty(); + } + } } while( !is_empty && !IsExitSignal() ); } // second thread (objects not locked) -void Job::DoJob(pt::Space & job) +void Job::DoJob(JobTask & task, size_t priority) { + PluginRes res; + try { - PluginRes res = plugin->Call((Session*)0, WINIX_JOB, &job); + main_log << logsave; + + if( task.job_type == JobTask::JOB_TYPE_REQUEST_CONTINUATION ) + { + if( task.request ) + { + Cur local_cur; + + // is this correct? we can read the task.request->session ... from the second thread? + // chyba tak bo ta struktura zostaje na stosie specjalnie dla joba do uzytku + + local_cur.request = task.request; + local_cur.session = task.request->session; + local_cur.mount = task.request->mount; + cur->request->run_state = Request::RunState::job_run; + + res = plugin->Call(model_connector, &log, &local_cur, WINIX_JOB, &task.job, nullptr, task.job_type, task.job_id); + + { + Winix::Lock lock(synchro); + cur->request = local_cur.request; + cur->session = local_cur.session; + cur->mount = local_cur.mount; + // winix templates functions uses its own cur (global pointer in TemplatesFunctions namespace) + // so we have to set it correctly + DoRequestContinuationJob(task, priority); + } + } + else + { + log << log2 << "Job: request continuation task doesn't have a request set, skipping the job and request continuation" << logend; + log << log2 << "Job: this is an internal error, the request if exists in the queue will never be removed" << logend; + } + } + else + { + res = plugin->Call(model_connector, &log, nullptr, WINIX_JOB, &task.job, nullptr, task.job_type, task.job_id); + } + + log << logsave; if( res.res_true == 0 ) - DoWinixJob(job); + { + DoWinixJob(task.job); // probably this will be removed + } } catch(...) { + log << log2 << "Job: an exception was catched when doing a job" << logend; } } +// second thread (objects locked) +// use main_log (after locking) for the logs to be in the correct order +void Job::DoRequestContinuationJob(JobTask & job_task, size_t priority) +{ + if( cur->request->function ) + { + main_log << config->log_delimiter << logend; + main_log << log3 << "Job: making a continuation for request " << cur->request << logend; + main_log << log4 << "Job: doing directory analysis again" << logend; + + if( functions->ParseOnlyDirs() ) + { + cur->mount = mounts->CalcCurMount(cur->request); + cur->request->mount = cur->mount; + cur->request->run_state = Request::RunState::job_continuation_run; + functions->ContinueMakeFunction(); + } + } + else + { + main_log << log2 << "Job: request continuation task doesn't have a funtion set, return 500 internal error" << logend; + cur->request->http_status = Header::status_500_internal_server_error; + } + + if( cur->request->run_state == Request::RunState::assigned_to_job ) + { + log << log3 << "Job: this request (" << cur->request << ") has been moved to the job queue again" << logend; + Add(cur->request->job_id, cur->request, cur->request->job, priority); + } + else + { + cur->request->FinishRequest(); // jak cur->request->function bedzie null to nie zadzialaja funkcje templajtowe + load_avg->StopRequest(cur->request); + cur->request->Clear(); + cur->request->run_state = Request::RunState::finished; + RemoveOldRequest(cur->request); + } + + main_log << logendrequest; +} + + + // second thread (objects not locked) void Job::DoWinixJob(pt::Space & job) { @@ -188,6 +370,28 @@ void Job::DoWinixJob(pt::Space & job) +// second thread (objects locked) +// use main_log for the logs to be in the correct order +void Job::RemoveOldRequest(Request * request) +{ + std::list::iterator i = req_tab->begin(); + + while( i != req_tab->end() ) + { + if( &(*i) == request ) + { + main_log << log3 << "Job: removing request " << request << logend; + req_tab->erase(i); + break; + } + else + { + ++i; + } + } +} + + } // namespace Winix diff --git a/winixd/core/job.h b/winixd/core/job.h index 6123cc6..6645163 100644 --- a/winixd/core/job.h +++ b/winixd/core/job.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2012-2014, Tomasz Sowa + * Copyright (c) 2012-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -32,22 +32,26 @@ * */ -#ifndef headerfile_winix_core_jobs -#define headerfile_winix_core_jobs +#ifndef headerfile_winix_core_job +#define headerfile_winix_core_job #include #include #include "basethread.h" #include "space/space.h" +#include "jobtask.h" +#include "cur.h" +#include "loadavg.h" +#include "mounts.h" + namespace Winix { +class Functions; -#define WINIX_JOBS_HOW_MANY_PRIORITIES 32 - @@ -55,19 +59,35 @@ class Job : public BaseThread { public: + static const size_t PRIORITY_LOWEST = 0; + static const size_t PRIORITY_HIGHEST = 31; + + static const size_t PRIORITY_DEFAULT = 16; + static const size_t PRIORITY_REQUEST_CONTINUATION = 17; + + Job(); + void SetCur(Cur * cur); + void SetFunctions(Functions * functions); + void SetLoadAvg(LoadAvg * load_avg); + void SetMounts(Mounts * mounts); + void SetReqTab(std::list * req_tab); + /* add a new job to the queue priority: 0-31 (0 - the lowest priority, 31 - the highest priority) */ - void Add(pt::Space & job, int priority = 0); + void Add(pt::Space & job, size_t priority = PRIORITY_DEFAULT); + void Add(Request * request, pt::Space & job, size_t priority = PRIORITY_DEFAULT); + void Add(long job_id, pt::Space & job, size_t priority = PRIORITY_DEFAULT); + void Add(long job_id, Request * request, pt::Space & job, size_t priority = PRIORITY_DEFAULT); /* queue size, and size of all jobs in any priority */ - size_t Size(int priority) const; + size_t Size(size_t priority) const; size_t Size() const; @@ -75,17 +95,23 @@ public: true if specified queue is empty or if all queues are empty */ - bool Empty(int priority) const; + bool Empty(size_t priority) const; bool Empty() const; private: - typedef std::queue JobsQueue; + Cur * cur; + Functions * functions; + LoadAvg * load_avg; + Mounts * mounts; + std::list * req_tab; + + typedef std::queue JobsQueue; typedef std::vector JobsQueueTab; JobsQueueTab jobs_queue_tab; - void CheckPriority(int & priority) const; + void CheckPriority(size_t & priority) const; void SaveToFile(); void ReadFromFile(); @@ -101,9 +127,11 @@ private: bool SignalReceived(); void Do(); - void DoQueue(JobsQueue & jobs_queue); - void DoJob(pt::Space & job); + void DoQueue(JobsQueue & jobs_queue, size_t priority); + void DoJob(JobTask & task, size_t priority); + void DoRequestContinuationJob(JobTask & job_task, size_t priority); void DoWinixJob(pt::Space & job); + void RemoveOldRequest(Request * request); }; diff --git a/winixd/core/jobtask.h b/winixd/core/jobtask.h new file mode 100644 index 0000000..70cd82f --- /dev/null +++ b/winixd/core/jobtask.h @@ -0,0 +1,84 @@ +/* + * This file is a part of Winix + * and is distributed under the 2-Clause BSD licence. + * Author: Tomasz Sowa + */ + +/* + * Copyright (c) 2022, Tomasz Sowa + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + */ + +#ifndef headerfile_winix_core_jobtask +#define headerfile_winix_core_jobtask + +#include "space/space.h" +#include "core/request.h" + + + +namespace Winix +{ + +class JobTask +{ +public: + + static const long JOB_TYPE_DEFAULT = 1; + static const long JOB_TYPE_REQUEST_CONTINUATION = 2; + + /* + * the value of job_id will be defined by each controller + * so the default value is better to have -1 instead of for example 1 + */ + static const long JOB_ID_DEFAULT = -1; + + long job_type; + long job_id; + Request * request; + pt::Space job; + + + JobTask() + { + clear(); + } + + void clear() + { + job_type = JOB_TYPE_DEFAULT; + job_id = JOB_ID_DEFAULT; + request = nullptr; + job.clear(); + } + +}; + +} + + +#endif + diff --git a/winixd/core/mount.cpp b/winixd/core/mount.cpp index 82bc131..9eeac47 100644 --- a/winixd/core/mount.cpp +++ b/winixd/core/mount.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2009-2014, Tomasz Sowa + * Copyright (c) 2009-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -43,14 +43,38 @@ namespace Winix Mount::Mount() +{ + Clear(); +} + + +Mount::Mount(const Mount & m) +{ + operator=(m); +} + + +Mount & Mount::operator=(const Mount & m) +{ + dir_id = m.dir_id; + type = m.type; + fs = m.fs; + param = m.param; + + return *this; +} + + + +void Mount::Clear() { dir_id = -1; type = -1; fs = -1; + ClearParams(); } - void Mount::ClearParams() { size_t i; diff --git a/winixd/core/mount.h b/winixd/core/mount.h index 50b7082..4b5ce2e 100644 --- a/winixd/core/mount.h +++ b/winixd/core/mount.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2009-2014, Tomasz Sowa + * Copyright (c) 2009-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -73,6 +73,10 @@ public: Mount(); + Mount(const Mount & m); + Mount & operator=(const Mount & m); + + void Clear(); void ClearParams(); bool IsPar(int code); diff --git a/winixd/core/mountparser.cpp b/winixd/core/mountparser.cpp index 4f73c9a..90f642e 100644 --- a/winixd/core/mountparser.cpp +++ b/winixd/core/mountparser.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2014, Tomasz Sowa + * Copyright (c) 2010-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,6 +35,7 @@ #include "mountparser.h" #include "log.h" #include "misc.h" +#include "dirs.h" namespace Winix diff --git a/winixd/core/mountparser.h b/winixd/core/mountparser.h index 04d7996..d1b78f3 100644 --- a/winixd/core/mountparser.h +++ b/winixd/core/mountparser.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2021, Tomasz Sowa + * Copyright (c) 2010-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -41,7 +41,6 @@ #include #include #include "mount.h" -#include "dirs.h" #include "models/item.h" #include "winixmodeldeprecated.h" @@ -49,6 +48,7 @@ namespace Winix { +class Dirs; diff --git a/winixd/core/mounts.cpp b/winixd/core/mounts.cpp index 71f5ccb..eb4088c 100644 --- a/winixd/core/mounts.cpp +++ b/winixd/core/mounts.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2009-2021, Tomasz Sowa + * Copyright (c) 2009-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,6 +37,7 @@ #include "log.h" #include "db/db.h" #include "cur.h" +#include "dirs.h" @@ -49,6 +50,7 @@ Mounts::Mounts() { pmount = &empty_mount; skip_static = false; + dirs = nullptr; } @@ -99,7 +101,7 @@ void Mounts::CreateMounts() CreateMountFs(); CreateMountPar(); - plugin->Call((Session*)0, WINIX_ADD_MOUNTS); + plugin->Call(WINIX_ADD_MOUNTS); empty_mount.param.resize(mount_par_tab.size()); empty_mount.ClearParams(); @@ -118,12 +120,6 @@ void Mounts::SetDb(Db * pdb) db = pdb; } -void Mounts::SetCur(Cur * pcur) -{ - cur = pcur; -} - - int Mounts::AddMountType(const wchar_t * type) { @@ -221,13 +217,11 @@ void Mounts::ReadMounts(const std::wstring & mounts) mount_parser.Parse(mounts, mount_tab); - CalcCurMount(); - // IMPROVE ME // cur->mount is pointing to the empty mount (it is set in functions.cpp in CheckSpecialFile method) // may would be better to call WINIX_FSTAB_CHANGED after the cur->mount is set? // some plugins are using 'cur' object - plugin->Call((Session*)0, WINIX_FSTAB_CHANGED); + plugin->Call(WINIX_FSTAB_CHANGED); } @@ -292,7 +286,7 @@ void Mounts::MountCmsForRoot() -Mount * Mounts::CalcCurMount() +Mount * Mounts::CalcCurMount(Request * request) { std::vector::reverse_iterator i; @@ -300,10 +294,10 @@ std::vector::reverse_iterator i; // when the program starts (when the dir_tab is empty() // we don't want to call MountCmsForRoot() - if( cur->request->dir_tab.empty() ) + if( request->dir_tab.empty() ) return pmount; - for(i = cur->request->dir_tab.rbegin() ; i!=cur->request->dir_tab.rend() ; ++i) + for(i = request->dir_tab.rbegin() ; i!=request->dir_tab.rend() ; ++i) { std::map::iterator m = mount_tab.find( (*i)->id ); diff --git a/winixd/core/mounts.h b/winixd/core/mounts.h index 077c79a..b7e0c84 100644 --- a/winixd/core/mounts.h +++ b/winixd/core/mounts.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2009-2018, Tomasz Sowa + * Copyright (c) 2009-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,6 @@ #include #include "mount.h" #include "error.h" -#include "dirs.h" #include "db/db.h" #include "request.h" #include "mountparser.h" @@ -51,7 +50,7 @@ namespace Winix { - +class Dirs; @@ -115,7 +114,6 @@ public: void SetDirs(Dirs * pdirs); void SetDb(Db * pdb); - void SetCur(Cur * pcur); // dir_id, mount_point typedef std::map MountTab; @@ -126,7 +124,7 @@ public: void ReadMounts(const std::wstring & mounts); void ReadMounts(); - Mount * CalcCurMount(); + Mount * CalcCurMount(Request * request); Mount * CalcMount(long dir_id); // current mount point @@ -146,7 +144,6 @@ private: Db * db; Dirs * dirs; - Cur * cur; bool skip_static; diff --git a/winixd/core/plugin.cpp b/winixd/core/plugin.cpp index 114060b..232a8c9 100644 --- a/winixd/core/plugin.cpp +++ b/winixd/core/plugin.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -48,47 +48,6 @@ namespace Winix { -/* - * - * PluginInfo - * - * - */ - - -void PluginInfo::set_dependency_for(WinixBase * winix_base) -{ - plugin->SetDependencyFor(winix_base); -} - -void PluginInfo::set_dependency_for(WinixBase & winix_base) -{ - set_dependency_for(&winix_base); -} - -void PluginInfo::set_dependency_for(WinixModelDeprecated * winix_model) -{ - plugin->SetDependencyFor(winix_model); - - //model_connector = winix_model->get_model_connector(); - // CHECKME what about model_connector here? -} - -void PluginInfo::set_dependency_for(WinixModelDeprecated & winix_model) -{ - set_dependency_for(&winix_model); -} - - - -/* - * - * Plugin - * - * - */ - - void Plugin::UnloadPlugins() { size_t i; @@ -113,6 +72,8 @@ Plugin::Plugin() templates = nullptr; session_manager = nullptr; winix_request = nullptr; + + plugin = this; } @@ -127,17 +88,6 @@ void Plugin::SetDb(Db * pdb) db = pdb; } -//void Plugin::SetConfig(Config * pconfig) -//{ -// config = pconfig; -//} - - -void Plugin::SetCur(Cur * pcur) -{ - cur = pcur; -} - void Plugin::SetSystem(System * psystem) { @@ -145,6 +95,12 @@ void Plugin::SetSystem(System * psystem) } +void Plugin::SetCur(Cur * cur) +{ + this->cur = cur; +} + + void Plugin::SetFunctions(Functions * pfunctions) { functions = pfunctions; @@ -157,12 +113,6 @@ void Plugin::SetTemplates(Templates * ptemplates) } -//void Plugin::SetSynchro(Synchro * psynchro) -//{ -// synchro = psynchro; -//} - - void Plugin::SetSessionManager(SessionManager * psession_manager) { session_manager = psession_manager; @@ -192,10 +142,10 @@ void Plugin::Unlock() -bool Plugin::SetDependency(PluginInfo & info) +bool Plugin::SetDependencyForPluginInfo(morm::ModelConnector * pmodel_connector, Log * plog, Cur * pcur, 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_request); + bool res = (pmodel_connector && plog && pcur && db && config && system && functions && templates && synchro && session_manager && winix_request); if( !res ) { @@ -204,39 +154,22 @@ bool Plugin::SetDependency(PluginInfo & info) info.db = db; info.config = config; - info.cur = cur; + info.cur = pcur; info.system = system; info.functions = functions; info.templates = templates; info.synchro = synchro; info.session_manager = session_manager; info.plugin = this; + info.model_connector = pmodel_connector;; - /* - * FIXME - * if we call a message from a different thread then a different model connector is needed - * (each thread should have its own model connector) - * - */ - info.model_connector = system->get_model_connector(); + info.log.set_log_buffer(plog->get_log_buffer()); + info.log.set_file_log(plog->get_file_log()); - info.log.SetDependency(&log); - -return res; + return res; } -void Plugin::SetDependencyFor(WinixBase * winix_base) -{ - winix_base->set_dependency(winix_request); -} - - -void Plugin::SetDependencyFor(WinixModelDeprecated * winix_model) -{ - winix_model->set_dependency(winix_request); -} - void Plugin::LoadPlugins(const std::wstring & plugins_dir, const std::vector & plugins) { @@ -304,7 +237,7 @@ void * plugin_handle; int old_current_plugin; PluginInfo info; - if( !SetDependency(info) ) + if( !SetDependencyForPluginInfo(model_connector, &log, cur, info) ) return; if( !(plugin_handle = LoadInitFun(filename, fun_init)) ) @@ -315,6 +248,10 @@ PluginInfo info; current_plugin = (int)plugins.size(); info.plugin_id = current_plugin; + /* + * WARNING: + * all pointers from Cur are null pointers here + */ fun_init(info); PluginsItem item; @@ -362,19 +299,18 @@ bool Plugin::HasMessage(int message) } -void Plugin::Call(Session * ses, int message, Slots::iterator & slot, PluginInfo & info) +void Plugin::Call(morm::ModelConnector * model_connector, Log * plog, Cur * cur, int message, Slots::iterator & slot, PluginInfo & info) { - if( !SetDependency(info) ) + if( !SetDependencyForPluginInfo(model_connector, plog, cur, info) ) return; current_plugin = slot->second.index; info.plugin_id = current_plugin; - info.session = ses; - if( current_plugin != -1 && ses ) - info.plugin_data_base = ses->plugin_data.Get(current_plugin); + if( current_plugin != -1 && cur->session && !cur->session->is_temporary_session() ) + info.plugin_data_base = cur->session->plugin_data.Get(current_plugin); else - info.plugin_data_base = 0; + info.plugin_data_base = nullptr; if( !slot->second.is_running ) { @@ -411,136 +347,104 @@ void Plugin::Call(Session * ses, int message, Slots::iterator & slot, PluginInfo -PluginRes Plugin::Call(Session * ses, int message, void * p1_, void * p2_, long l1_, long l2_) + +PluginRes Plugin::Call(morm::ModelConnector * model_connector, Log * plog, Cur * cur, int message, void * p1, void * p2, long l1, long l2) { -PluginRes res; -int old_current_plugin = current_plugin; -PluginInfo info; + PluginRes res; + int old_current_plugin = current_plugin; + PluginInfo info; + Cur local_cur; + + if( !cur ) + cur = &local_cur; Slots::iterator i = slots.lower_bound(message); for( ; i!=slots.end() && i->first==message ; ++i ) { info.Clear(); - info.p1 = p1_; - info.p2 = p2_; - info.l1 = l1_; - info.l2 = l2_; + info.p1 = p1; + info.p2 = p2; + info.l1 = l1; + info.l2 = l2; - Call(ses, message, i, info); + Call(model_connector, plog, cur, message, i, info); if( info.res ) ++res.res_true; else ++res.res_false; } - + current_plugin = old_current_plugin; -return res; + return res; } + +PluginRes Plugin::Call(morm::ModelConnector * model_connector, Log * plog, Session * session, Request * request, Mount * mount, int message, void * p1, void * p2, long l1, long l2) +{ + Cur local_cur; + + local_cur.session = session; + local_cur.request = request; + local_cur.mount = mount; + + return Call(model_connector, plog, &local_cur, message, p1, p2, l1, l2); +} + + + PluginRes Plugin::Call(int message) { - return Call(cur->session, message, 0, 0, 0, 0); + return Call(model_connector, &log, cur, message, 0, 0, 0, 0); } PluginRes Plugin::Call(int message, void * p1_) { - return Call(cur->session, message, p1_, 0, 0, 0); + return Call(model_connector, &log, cur, message, p1_, 0, 0, 0); } PluginRes Plugin::Call(int message, void * p1_, void * p2_) { - return Call(cur->session, message, p1_, p2_, 0, 0); + return Call(model_connector, &log, cur, message, p1_, p2_, 0, 0); } PluginRes Plugin::Call(int message, long l1_) { - return Call(cur->session, message, 0, 0, l1_, 0); + return Call(model_connector, &log, cur, message, 0, 0, l1_, 0); } PluginRes Plugin::Call(int message, long l1_, long l2_) { - return Call(cur->session, message, 0, 0, l1_, l2_); + return Call(model_connector, &log, cur, message, 0, 0, l1_, l2_); } PluginRes Plugin::Call(int message, void * p1_, long l1_) { - return Call(cur->session, message, p1_, 0, l1_, 0); + return Call(model_connector, &log, cur, message, p1_, 0, l1_, 0); } PluginRes Plugin::Call(int message, void * p1_, long l1_, long l2_) { - return Call(cur->session, message, p1_, 0, l1_, l2_); + return Call(model_connector, &log, cur, message, p1_, 0, l1_, l2_); } PluginRes Plugin::Call(int message, void * p1_, void * p2_, long l1_) { - return Call(cur->session, message, p1_, p2_, l1_, 0); + return Call(model_connector, &log, cur, message, p1_, p2_, l1_, 0); } -PluginRes Plugin::Call(Session * ses, int message) -{ - return Call(ses, message, 0, 0, 0, 0); -} - - -PluginRes Plugin::Call(Session * ses, int message, void * p1_) -{ - return Call(ses, message, p1_, 0, 0, 0); -} - - -PluginRes Plugin::Call(Session * ses, int message, void * p1_, void * p2_) -{ - return Call(ses, message, p1_, p2_, 0, 0); -} - - -PluginRes Plugin::Call(Session * ses, int message, long l1_) -{ - return Call(ses, message, 0, 0, l1_, 0); -} - - -PluginRes Plugin::Call(Session * ses, int message, long l1_, long l2_) -{ - return Call(ses, message, 0, 0, l1_, l2_); -} - - -PluginRes Plugin::Call(Session * ses, int message, void * p1_, long l1_) -{ - return Call(ses, message, p1_, 0, l1_, 0); -} - - -PluginRes Plugin::Call(Session * ses, int message, void * p1_, long l1_, long l2_) -{ - return Call(ses, message, p1_, 0, l1_, l2_); -} - - -PluginRes Plugin::Call(Session * ses, int message, void * p1_, void * p2_, long l1_) -{ - return Call(ses, message, p1_, p2_, l1_, 0); -} - - - - - size_t Plugin::Size() { return plugins.size(); diff --git a/winixd/core/plugin.h b/winixd/core/plugin.h index 21c7d7b..e672b54 100644 --- a/winixd/core/plugin.h +++ b/winixd/core/plugin.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2021, Tomasz Sowa + * Copyright (c) 2008-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -40,8 +40,10 @@ #include #include "pluginmsg.h" #include "plugindata.h" -#include "winixbase.h" +#include "winixmodeldeprecated.h" #include "modelconnector.h" +#include "mount.h" + @@ -78,6 +80,7 @@ class WinixRequest; class Plugin; class Session; +class Request; // move me to a different file @@ -111,14 +114,6 @@ struct PluginInfo morm::ModelConnector * model_connector; - // a session - // some messages are sent in a session's context e.g. logging a user - // this pointer in not always the same as cur->session, it is preferred - // to use this pointer instead of cur->session - // (cur->session can point at a temporary object) - // this pointer can be null - Session * session; - // pointer to the plugin session (can be null if not set by the plugin or if session is null) // this is taken from session->plugin_data.Get() // you should use WINIX_SESSION_CREATED and WINIX_PLUGIN_SESSION_DATA_REMOVE @@ -130,13 +125,6 @@ struct PluginInfo bool res; - - void set_dependency_for(WinixBase * winix_base); - void set_dependency_for(WinixBase & winix_base); - - void set_dependency_for(WinixModelDeprecated * winix_model); - void set_dependency_for(WinixModelDeprecated & winix_model); - void Clear() { // pointers to winix objects are not cleared here @@ -147,7 +135,6 @@ struct PluginInfo l2 = 0; plugin_id = -1; - session = 0; plugin_data_base = 0; res = false; @@ -173,11 +160,11 @@ struct PluginRes -class Plugin : public WinixBase +class Plugin : public WinixModelDeprecated { public: - // index of a plugin which is called by Call() method + // index of a plugin which is called by CallAllRegisteredMessages() method // normally: -1 int current_plugin; @@ -215,12 +202,10 @@ public: ~Plugin(); void SetDb(Db * pdb); - //void SetConfig(Config * pconfig); - void SetCur(Cur * pcur); void SetSystem(System * psystem); + void SetCur(Cur * cur); void SetFunctions(Functions * pfunctions); void SetTemplates(Templates * ptemplates); - //void SetSynchro(Synchro * psynchro); void SetSessionManager(SessionManager * psession_manager); void SetWinixRequest(WinixRequest * winix_request); @@ -244,16 +229,9 @@ public: PluginRes Call(int message, void * p1_, long l1_); PluginRes Call(int message, void * p1_, long l1_, long l2_); PluginRes Call(int message, void * p1_, void * p2_, long l1_); - PluginRes Call(Session * ses, int message, void * p1_, void * p2_, long l1_, long l2_); - PluginRes Call(Session * ses, int message); - PluginRes Call(Session * ses, int message, void * p1_); - PluginRes Call(Session * ses, int message, void * p1_, void * p2_); - PluginRes Call(Session * ses, int message, long l1_); - PluginRes Call(Session * ses, int message, long l1_, long l2_); - PluginRes Call(Session * ses, int message, void * p1_, long l1_); - PluginRes Call(Session * ses, int message, void * p1_, long l1_, long l2_); - PluginRes Call(Session * ses, int message, void * p1_, void * p2_, long l1_); + PluginRes Call(morm::ModelConnector * model_connector, Log * plog, Cur * cur, int message, void * p1 = nullptr, void * p2 = nullptr, long l1 = 0, long l2 = 0); + PluginRes Call(morm::ModelConnector * model_connector, Log * plog, Session * session, Request * request, Mount * mount, int message, void * p1 = nullptr, void * p2 = nullptr, long l1 = 0, long l2 = 0); // how many plugins there are size_t Size(); @@ -269,15 +247,13 @@ public: private: Db * db; - //Config * config; Cur * cur; System * system; Functions * functions; Templates * templates; - //Synchro * synchro; SessionManager * session_manager; - WinixRequest * winix_request; + WinixRequest * winix_request; // is it needed anymore? !!!!!!!!!!!!!!!! std::wstring temp_path; // used when loading plugins @@ -287,11 +263,10 @@ private: Slots slots; void * LoadInitFun(const wchar_t * filename, Fun1 & fun_init); - void Call(Session * ses, int message, Slots::iterator & slot, PluginInfo & info); + void Call(morm::ModelConnector * model_connector, Log * plog, Cur * cur, int message, Slots::iterator & slot, PluginInfo & info); - bool SetDependency(PluginInfo & info); - void SetDependencyFor(WinixBase * winix_base); - void SetDependencyFor(WinixModelDeprecated * winix_model); + + bool SetDependencyForPluginInfo(morm::ModelConnector * pmodel_connector, Log * plog, Cur * pcur, PluginInfo & info); void Lock(); void Unlock(); diff --git a/winixd/core/pluginmsg.h b/winixd/core/pluginmsg.h index d04bc08..4a2510e 100644 --- a/winixd/core/pluginmsg.h +++ b/winixd/core/pluginmsg.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2021, Tomasz Sowa + * Copyright (c) 2008-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -180,6 +180,7 @@ namespace Winix // the request is being ended // you can clear some of your objects here +// in p1 you have a pointer to the Request object #define WINIX_END_REQUEST 30140 // a new file (page) has been added @@ -323,6 +324,13 @@ namespace Winix // session is null // if you process the job then return 'true' from the processing method (from plugin call) // so this prevent to make a standard (system) job +// in l1 there is a job type (from JobTask structure), e.g. if you want to know whether +// the job is a request continuation you should compare l1 == JobTask::JOB_TYPE_REQUEST_CONTINUATION +// in l2 there is a job_id - the values passed to the Job::Add(long job_id, ...) method +// if you have called Add(...) without long job_id parameter then the default value JobTask::JOB_ID_DEFAULT is used +// if the job type is JobTask::JOB_TYPE_REQUEST_CONTINUATION then a pointer to Session can be set, +// such a Session has allow_to_delete flag set to false but of course you have to Lock/Unlock when +// you are using this structure #define WINIX_JOB 31200 diff --git a/winixd/core/postparser.cpp b/winixd/core/postparser.cpp index 06bc235..ab2a5ea 100644 --- a/winixd/core/postparser.cpp +++ b/winixd/core/postparser.cpp @@ -70,7 +70,7 @@ void PostParser::Parse(FCGX_Stream * in, Request & request) HttpSimpleParser::Parse(); if( has_winix_raw_post_msg ) - plugin->Call(0, WINIX_RAW_POST_STRING, &raw_post); + plugin->Call(WINIX_RAW_POST_STRING, &raw_post); raw_post.clear(); } @@ -114,7 +114,7 @@ void PostParser::CreateLog(bool param_added, const std::wstring & name, const st void PostParser::Parameter(std::wstring & name, std::wstring & value) { if( has_winix_post_params_msg ) - plugin->Call(0, WINIX_POST_PARAMS, &name, &value); + plugin->Call(WINIX_POST_PARAMS, &name, &value); bool added = request->AddPostVar(name, value); CreateLog(added, name, value); diff --git a/winixd/core/request.cpp b/winixd/core/request.cpp index 5cd3d76..2c86aca 100644 --- a/winixd/core/request.cpp +++ b/winixd/core/request.cpp @@ -34,10 +34,13 @@ #include "request.h" #include "log.h" -#include "plugin.h" #include "misc.h" #include "functions/functionbase.h" #include "templates/templates.h" +#include "convert/misc.h" +#include "templates/templates.h" +#include "jobtask.h" + namespace Winix @@ -50,7 +53,14 @@ namespace Winix Request::Request() { id = 0; - config = 0; + config = nullptr; + templates = nullptr; + compress = nullptr; + plugin = nullptr; + mounts = nullptr; + + // set function to nullptr because is used in Clear() + function = nullptr; } @@ -68,12 +78,35 @@ void Request::fields() -void Request::SetConfig(Config * pconfig) +void Request::SetConfig(Config * config) { - config = pconfig; + this->config = config; } +void Request::SetTemplates(Templates * templates) +{ + this->templates = templates; +} + + +void Request::SetCompress(Compress * compress) +{ + this->compress = compress; +} + + +void Request::SetPlugin(Plugin * plugin) +{ + this->plugin = plugin; +} + + +void Request::SetMounts(Mounts * mounts) +{ + this->mounts = mounts; +} + void Request::ClearOutputStreams() @@ -94,11 +127,13 @@ size_t len = 0; } +/* + * we do not clear config, templates, compress, plugin and mounts pointers + */ void Request::Clear() { - // id is never 0 - if( ++id == 0 ) - ++id; + id = -1; + run_state = RunState::not_assigned; RemovePostFileTmp(post_file_tab); ClearOutputStreams(); @@ -136,6 +171,8 @@ void Request::Clear() last_item = &item; is_item = false; function = nullptr; + session = nullptr; + mount = nullptr; param_tab.clear(); anchor.clear(); @@ -192,6 +229,22 @@ void Request::Clear() html_template.clear(); use_html_filter = false; + + job_id = JobTask::JOB_ID_DEFAULT; + job.clear(); + + accept_gzip = false; + accept_deflate = false; + + output_8bit.clear(); + compressed_output.clear(); + output_tmp_filtered_stream.clear(); + serialized_model.clear(); + aheader_name.clear(); + aheader_value.clear(); + cookie_id_string.clear(); + send_data_buf.clear(); + } @@ -281,7 +334,7 @@ void Request::CheckAcceptHeader() if( log ) { - (*log) << log2 << "App: an unknown " << Header::accept << " headers: "; + (*log) << log2 << "Request: an unknown " << Header::accept << " headers: "; HeaderValue::log_values(accept_mime_types, *log); (*log) << " (skipping)" << logend; } @@ -325,7 +378,7 @@ void Request::CheckContainerParameter() if( log ) { - (*log) << log2 << "App: an unknown container url parameter: " << *container << " (skipping)" << logend; + (*log) << log2 << "Request: an unknown container url parameter: " << *container << " (skipping)" << logend; } } } @@ -384,7 +437,7 @@ bool Request::AddPostVar(const wchar_t * name, const wchar_t * value) { if( log ) { - (*log) << log1 << "App: more than " << WINIX_POSTTABLE_VALUT_TABLE_MAXSIZE << " post variables in a table " << name << " (skipping)" << logend; + (*log) << log1 << "Request: more than " << WINIX_POSTTABLE_VALUT_TABLE_MAXSIZE << " post variables in a table " << name << " (skipping)" << logend; } } } @@ -408,7 +461,7 @@ bool Request::AddPostVar(const wchar_t * name, const wchar_t * value) { if( log ) { - (*log) << log1 << "App: more than " << WINIX_POSTTABLE_MAXSIZE << " post variables (skipping)" << logend; + (*log) << log1 << "Request: more than " << WINIX_POSTTABLE_MAXSIZE << " post variables (skipping)" << logend; } } } @@ -696,6 +749,1214 @@ void Request::http_status_error_description(EzcEnv & env) } +void Request::create_job(long job_id) +{ + this->job_id = job_id; + run_state = RunState::assigned_to_job; +} + + +/* + * will be removed in the future + */ +void Request::modify_status_code_if_needed() +{ + // moved from Templates when a pattern was selected + switch( status ) + { + case WINIX_ERR_INCORRECT_URI: // !!temporarily + case WINIX_ERR_INTERNAL_ERROR: // !! temprarily + case WINIX_ERR_PERMISSION_DENIED: + case WINIX_ERR_CANT_CHANGE_USER: + case WINIX_ERR_CANT_CHANGE_GROUP: + case WINIX_ERR_CANT_CHANGE_PRIVILEGES: + http_status = Header::status_403_forbidden; + break; + + case WINIX_ERR_NO_ITEM: + case WINIX_ERR_NO_FUNCTION: + case WINIX_ERR_UNKNOWN_PARAM: + http_status = Header::status_404_not_found; + break; + } + + if( use_200_status_for_not_found_and_permission_denied && ( + http_status == Header::status_404_not_found || + http_status == Header::status_403_forbidden + )) + { + http_status = Header::status_200_ok; + Log * plog = get_logger(); + + if( plog ) + { + (*plog) << log3 << "Request: changing the http response to: 200 OK" << logend; + } + } +} + + + +void Request::ModifyStatusForRedirect() +{ + switch(redirect_type) + { + case 300: + http_status = Header::status_300_multiple_choices; + break; + + case 301: + http_status = Header::status_301_moved_permanently; + break; + + case 302: + http_status = Header::status_302_found; + break; + + case 307: + http_status = Header::status_307_temporary_redirect; + break; + + case 303: + default: + http_status = Header::status_303_see_other; + break; + } +} + + + + + + +void Request::SendAnswer() +{ + output_8bit.clear(); + compressed_output.clear(); + + if( !fcgi_request.out ) + { + Log * plog = get_logger(); + + if( plog ) + { + (*plog) << "Request: I cannot send the answer - fcgi_request.out is null (internal error)" << logend; + return; + } + } + + // may use CanSendContent() method? + // what about method HEAD? + if( !redirect_to.empty() || !x_sendfile.empty() ) + { + Send8bitOutput(output_8bit); // send empty content + return; + } + + plugin->Call(WINIX_CONTENT_MAKE); + + if( use_ezc_engine ) + { + UseEzcGenerator(); + } + + if( container_type == Request::ContainerType::container_raw && send_bin_stream ) + { + Send8bitOutput(out_bin_stream); + return; + } + else + if( container_type == Request::ContainerType::container_raw ) + { + PrepareRawAnswer(); + } + else + if( container_type == Request::ContainerType::container_json ) + { + PrepareJsonAnswer(); + } + else + if( container_type == Request::ContainerType::container_xml ) + { + PrepareXmlAnswer(); + } + else + if( container_type == Request::ContainerType::container_csv ) + { + PrepareCsvAnswer(); + } + + Send8bitOutput(output_8bit); +} + + +void Request::PrepareRawAnswer() +{ + if( send_main_stream ) + { + FilterHtmlIfNeeded(out_main_stream.get_buffer(), output_8bit, false); + } + else + if( send_all_frames ) + { + SerializeAllFrames(); + } + else + if( !send_frames.empty() ) + { + SerializeSpecificFrames(); + } +} + + +void Request::PrepareJsonAnswer() +{ + output_8bit << '{'; + PrepareContenerizedAnswer(); + output_8bit << '}'; +} + + +void Request::PrepareXmlAnswer() +{ + output_8bit << '<'; + pt::esc_to_xml(config->xml_root, output_8bit); + output_8bit << '>'; + + PrepareContenerizedAnswer(); + + output_8bit << "xml_root, output_8bit); + output_8bit << '>'; +} + + +void Request::PrepareCsvAnswer() +{ + PrepareContenerizedAnswer(); +} + + +void Request::PrepareContenerizedAnswer() +{ + bool put_separator = false; + + if( serialize_models ) + { + SerializeModels(); + put_separator = true; + } + + if( send_bin_stream ) + { + PutSeparatorIfNeeded(put_separator); + + // IMPLEMENT ME serialize binary stream as base64 and put in 'bin_stream' field + pt::WTextStream str; + str << "NOT IMPLEMENTED YET"; + SerializeStream(str, config->bin_stream_field.c_str()); + put_separator = true; + } + + if( send_main_stream ) + { + PutSeparatorIfNeeded(put_separator); + SerializeStream(out_main_stream.get_buffer(), config->main_stream_field.c_str()); + put_separator = true; + } + + if( send_all_frames || !send_frames.empty() ) + { + PutSeparatorIfNeeded(put_separator); + SerializeFieldJson(config->ezc_frames_field.c_str()); + output_8bit << "{"; + + if( send_all_frames ) + { + SerializeAllFrames(); + } + else + if( !send_frames.empty() ) + { + SerializeSpecificFrames(); + } + + output_8bit << "}"; + put_separator = true; + } +} + + +void Request::PutSeparatorIfNeeded(bool put_separator) +{ + if( put_separator ) + { + switch( container_type ) + { + case Request::ContainerType::container_json: + output_8bit << ","; + break; + + case Request::ContainerType::container_xml: + break; + + case Request::ContainerType::container_csv: + output_8bit << ";"; + break; + + case Request::ContainerType::container_raw: + default: + break; + } + } +} + + +void Request::SerializeFieldJson(const wchar_t * field_name) +{ + if( field_name ) + { + output_8bit << '"'; + pt::esc_to_json(field_name, output_8bit); + output_8bit << "\":"; + } +} + + + +void Request::SerializeStream(const pt::WTextStream & input_stream, const wchar_t * field_name) +{ + switch( container_type ) + { + case Request::ContainerType::container_json: + SerializeStreamJson(input_stream, field_name); + break; + + case Request::ContainerType::container_xml: + SerializeStreamXml(input_stream, field_name); + break; + + case Request::ContainerType::container_csv: + SerializeStreamCsv(input_stream, field_name); + break; + + case Request::ContainerType::container_raw: + default: + FilterHtmlIfNeeded(input_stream, output_8bit, false); + break; + } +} + + +void Request::SerializeStreamJson(const pt::WTextStream & input_stream, const wchar_t * field_name) +{ + SerializeFieldJson(field_name); + output_8bit << '"'; + + if( config->html_filter && use_html_filter ) + { + TemplatesFunctions::html_filter.filter(input_stream, output_tmp_filtered_stream, true); + pt::esc_to_json(output_tmp_filtered_stream, output_8bit); + } + else + { + pt::esc_to_json(input_stream, output_8bit); + } + + output_8bit << '"'; +} + + +void Request::SerializeStreamXml(const pt::WTextStream & input_stream, const wchar_t * field_name) +{ + if( field_name ) + { + output_8bit << '<'; + pt::esc_to_xml(field_name, output_8bit); + output_8bit << '>'; + } + + if( config->html_filter && use_html_filter ) + { + TemplatesFunctions::html_filter.filter(input_stream, output_tmp_filtered_stream, true); + pt::esc_to_xml(output_tmp_filtered_stream, output_8bit); + } + else + { + pt::esc_to_xml(input_stream, output_8bit); + } + + if( field_name ) + { + output_8bit << "'; + } +} + + +void Request::SerializeStreamCsv(const pt::WTextStream & input_stream, const wchar_t * field_name) +{ + if( field_name ) + { + output_8bit << '"'; + pt::esc_to_csv(field_name, output_8bit); + output_8bit << "\";"; + } + + output_8bit << '"'; + + if( config->html_filter && use_html_filter ) + { + TemplatesFunctions::html_filter.filter(input_stream, output_tmp_filtered_stream, true); + pt::esc_to_csv(output_tmp_filtered_stream, output_8bit); + } + else + { + pt::esc_to_csv(input_stream, output_8bit); + } + + output_8bit << "\";\n"; +} + + +void Request::SerializeAllFrames() +{ + auto i = out_streams.streams_map.begin(); + bool is_first = true; + + for( ; i != out_streams.streams_map.end() ; ++i) + { + if( container_type == Request::ContainerType::container_json && !is_first ) + { + output_8bit << ','; + } + + if( container_type == Request::ContainerType::container_xml && i->first.empty() ) + { + Log * plog = get_logger(); + + if( plog ) + { + (*plog) << log2 << "Request: I cannot serialize a frame with an empty name to xml (frame skipped)" << logend; + } + } + else + { + SerializeStream(i->second->get_buffer(), i->first.c_str()); + } + + is_first = false; + } +} + + +void Request::SerializeSpecificFrames() +{ + bool is_first = true; + + for(std::wstring & frame: send_frames) + { + auto i = out_streams.streams_map.find(frame); + + if( i != out_streams.streams_map.end() ) + { + if( container_type == Request::ContainerType::container_json && !is_first ) + { + output_8bit << ','; + } + + SerializeStream(i->second->get_buffer(), frame.c_str()); + is_first = false; + } + else + { + Log * plog = get_logger(); + + if( plog ) + { + (*plog) << log2 << "Request: there is no such a frame: " << frame << logend; + } + } + } +} + + +void Request::SerializeModels() +{ + Ezc::Models::ModelsMap models_map = models.GetMap(); + auto i = models_map.begin(); + bool is_first = true; + + for( ; i != models_map.end() ; ++i) + { + if( container_type == Request::ContainerType::container_json && !is_first ) + { + output_8bit << ','; + } + + if( container_type == Request::ContainerType::container_xml && i->first.empty() ) + { + Log * plog = get_logger(); + + if( plog ) + { + (*plog) << log2 << "Request: I cannot serialize a model with an empty name to xml (model skipped)" << logend; + } + } + else + { + SerializeModel(i->second, i->first.c_str()); + } + + is_first = false; + } +} + + +void Request::SerializeModel(morm::Wrapper & wrapper, const wchar_t * field_name) +{ + switch( container_type ) + { + case Request::ContainerType::container_json: + SerializeModelJson(wrapper, field_name); + break; + + case Request::ContainerType::container_xml: + SerializeModelXml(wrapper, field_name); + break; + + case Request::ContainerType::container_csv: + SerializeModelCsv(wrapper, field_name); + break; + + case Request::ContainerType::container_raw: + default: + break; + } +} + + +void Request::SerializeModelJson(morm::Wrapper & wrapper, const wchar_t * field_name) +{ + SerializeFieldJson(field_name); + + if( wrapper.model ) + { + serialized_model.clear(); + wrapper.model->set_connector(model_connector); + wrapper.model->to_text(serialized_model); + output_8bit << serialized_model; + } + + if( wrapper.date ) + { + output_8bit << '"'; + wrapper.date->SerializeISO(output_8bit); + output_8bit << '"'; + } + + if( wrapper.space_wrapper ) + { + wrapper.space_wrapper->get_space()->serialize_to_json_stream(output_8bit, false); + } + + if( wrapper.model_container_wrapper ) + { + wrapper.model_container_wrapper->set_iterator_at_first_model(); + bool is_first = true; + output_8bit << '['; + + while( wrapper.model_container_wrapper->is_iterator_correct() ) + { + if( !is_first ) + output_8bit << ','; + + morm::Model * model = wrapper.model_container_wrapper->get_model(); + serialized_model.clear(); + model->set_connector(model_connector); + model->to_text(serialized_model); + output_8bit << serialized_model; + + wrapper.model_container_wrapper->increment_iterator(); + is_first = false; + } + + output_8bit << ']'; + } +} + + +void Request::SerializeModelXml(morm::Wrapper & wrapper, const wchar_t * field_name) +{ + // IMPROVEME + Log * plog = get_logger(); + + if( plog ) + { + (*plog) << log2 << "Request: serializing models to xml not implemented yet" << logend; + } +} + + +void Request::SerializeModelCsv(morm::Wrapper & wrapper, const wchar_t * field_name) +{ + // IMPROVEME + Log * plog = get_logger(); + + if( plog ) + { + (*plog) << log2 << "Request: serializing models to csv not implemented yet" << logend; + } +} + + + + +// IMPROVEME +// gime me a better name +void Request::FilterHtmlIfNeeded(const pt::WTextStream & input_stream, BinaryPage & output, bool clear_stream) +{ + if( config->html_filter && use_html_filter ) + { + TemplatesFunctions::html_filter.filter(input_stream, output, clear_stream); + } + else + { + pt::wide_stream_to_utf8(input_stream, output, clear_stream); + } +} + + + +void Request::Send8bitOutput(BinaryPage & output) +{ + bool compressing = false; + int compress_encoding = 0; + size_t output_size = 0; + Log * plog = get_logger(); + + SelectCompression(output.size(), compressing, compress_encoding); + + if( config->log_server_answer ) + { + (*plog) << log1 << "Request: the server's answer is:\n" << output << "\nRequest: end of the server's answer" << logend; + } + + if( compressing ) + { + compress->Compressing(output, compressed_output, compress_encoding); + output_size = compressed_output.size(); + } + else + { + output_size = output.size(); + } + + PrepareHeaders(compressing, compress_encoding, output_size); + SendHeaders(); + SendCookies(); + FCGX_PutS("\r\n", fcgi_request.out); + + if( CanSendContent() ) + { + if( compressing ) + SendData(compressed_output, fcgi_request.out); + else + SendData(output, fcgi_request.out); + } +} + + + +// IMPROVEME +// we can send directly from BinaryPage without copying to a temporary buffer +// (but there is no an interface in BinaryPage yet) +void Request::SendData(const BinaryPage & page, FCGX_Stream * out) +{ + const size_t buf_size = 4096; + + if( send_data_buf.size() != buf_size ) + send_data_buf.resize(buf_size); + + BinaryPage::const_iterator i = page.begin(); + BinaryPage::const_iterator end = page.end(); + + while( i != end ) + { + size_t s = 0; + + for( ; i != end && s < buf_size ; ++i, ++s) + send_data_buf[s] = *i; + + if( s > 0 ) + FCGX_PutStr(send_data_buf.c_str(), s, out); + } +} + + + + + +// !! IMPROVE ME change to a better name +void Request::UseEzcGenerator() +{ +// if( page_generated || !redirect_to.empty() || !x_sendfile.empty() ) +// return; + + + clock_gettime(CLOCK_REALTIME, ×pec_ezc_engine_start); + + templates->SetEzcParameters( gen_trim_white, + gen_skip_new_line, + gen_use_special_chars); + + templates->Generate(); + clock_gettime(CLOCK_REALTIME, ×pec_ezc_engine_stop); + + timespec diff; + calculate_timespec_diff(timespec_ezc_engine_start, timespec_ezc_engine_stop, diff); + + pt::TextStream str; + timespec_to_stream_with_unit(diff, str); // IMPROVEME in the future Log can be used directly + + Log * plog = get_logger(); + + if( plog ) + { + (*plog) << log3 << "Request: ezc engine took: " << str << logend; + } +} + + + +int Request::SelectDeflateVersion() +{ + if( browser_msie ) + return 0; // raw deflate + else + return 1; // deflate +} + + + +void Request::SelectCompression(size_t source_len, bool & compression_allowed, int & compression_encoding) +{ + compression_allowed = false; + compression_encoding = 0; + + if( config->compression && + redirect_to.empty() && + x_sendfile.empty() && + !browser_konqueror && /* IMPROVEME check whether the Konqueror can use deflate algorithm */ + source_len >= config->compression_page_min_size ) + { + // IMPROVEME put the constants somewhere (1, 2, 10, 20) + if( config->compression_encoding == 1 || config->compression_encoding == 10 ) + { + if( accept_deflate ) + { + compression_allowed = true; + compression_encoding = SelectDeflateVersion(); + } + else + if( config->compression_encoding == 10 && accept_gzip ) + { + compression_allowed = true; + compression_encoding = 2; // gzip + } + } + + if( config->compression_encoding == 2 || config->compression_encoding == 20 ) + { + if( accept_gzip ) + { + compression_allowed = true; + compression_encoding = 2; // gzip + } + else + if( config->compression_encoding == 20 && accept_deflate ) + { + compression_allowed = true; + compression_encoding = SelectDeflateVersion(); + } + } + } +} + + + + +void Request::PrepareSessionCookie() +{ + SessionManager * session_manager = get_session_manager(); + + if( !session || session->id==0 ) + return; + + if( config->session_cookie_encode ) + { + if( !session_manager->EncodeSessionId(session->id, session->id_index, cookie_id_string) ) + Toa(session->id, cookie_id_string); + } + else + { + Toa(session->id, cookie_id_string); + } + + + if( !session->puser || !session->remember_me ) + { + AddCookie(config->http_session_id_name, cookie_id_string); + } + else + { + pt::Date expires = start_time + config->session_remember_max_idle; + AddCookie(config->http_session_id_name, cookie_id_string, expires); + } +} + + + +void Request::PrepareHeaders(bool compressing, int compress_encoding, size_t output_size) +{ + PrepareSessionCookie(); + + if( send_as_attachment ) + { + AddHeader(L"Content-Disposition", L"attachment"); + } + + if( !redirect_to.empty() ) + { + ModifyStatusForRedirect(); + AddHeader(L"Location", redirect_to); + + Log * plog = get_logger(); + + if( plog ) + { + (*plog) << log2 << "Request: redirect to: " << redirect_to << logend; + } + } + else + if( mount && mount->type == mounts->MountTypeStatic() ) + { + PrepareSendFileHeaderForStaticMountpoint(); + } + else + if( !x_sendfile.empty() ) + { + PrepareSendFileHeader(); + } + else + { + PrepareContentLengthHeader(output_size); + } + + if( compressing ) + { + PrepareContentEncodingHeader(compress_encoding); + } + + PrepareHeaderStatus(http_status); + PrepareHeaderContentType(); +} + + + + +bool Request::AddHeader(const wchar_t * name, const wchar_t * value) +{ + if( !out_headers.has_key(name) ) + { + out_headers.add(name, value); + return true; + } + +return false; +} + + +bool Request::AddHeader(const std::wstring & name, const std::wstring & value) +{ + if( !out_headers.has_key(name) ) + { + out_headers.add(name, value); + return true; + } + +return false; +} + + +bool Request::AddHeader(const wchar_t * name, const pt::WTextStream & value) +{ + if( !out_headers.has_key(name) ) + { + out_headers.add_stream(name, value); + return true; + } + +return false; +} + + +bool Request::AddHeader(const std::wstring & name, const pt::WTextStream & value) +{ + if( !out_headers.has_key(name) ) + { + out_headers.add_stream(name, value); + return true; + } + +return false; +} + + +void Request::PrepareSendFileHeaderForStaticMountpoint() +{ + Log * plog = get_logger(); + + if( mount ) + { + if( PathHasUpDir(env_request_uri) ) + { + if( plog ) + { + (*plog) << log1 << "Request: incorrect path for a static file" << logend; + } + + http_status = Header::status_403_forbidden; + return; + } + + const std::wstring & index_str = mount->FirstArg(mounts->MountParStatic()); + size_t index = Toi(index_str); + + if( index >= config->static_dirs.size() ) + { + if( plog ) + { + (*plog) << log1 << "Request: static dir with index " << index << " is not defined in the config" << logend; + } + + http_status = Header::status_403_forbidden; + return; + } + + pt::WTextStream path; + path << config->static_dirs[index] << L"/"; + + if( !CreateStaticResourcePath(path) ) + { + http_status = Header::status_403_forbidden; + return; + } + + /* + * FIX ME now we can send full path (apache, lighttpd) and relative path (nginx) + * but this feature for mounting static content probably will be removed + */ + if( AddHeader(config->send_file_header, path) ) + { + if( plog ) + { + (*plog) << log2 << "Request: sending a file from a static mountpoint: " << path << logend; + } + } + } +} + + +void Request::PrepareSendFileHeader() +{ + Log * plog = get_logger(); + + if( AddHeader(config->send_file_header, x_sendfile) ) + { + if( plog ) + { + (*plog) << log2 << "Request: sending file: " << x_sendfile << logend; + } + } +} + + +void Request::PrepareContentEncodingHeader(int compress_encoding) +{ + if( compress_encoding == 0 || compress_encoding == 1 ) + { + AddHeader(L"Content-Encoding", L"deflate"); + } + else + { + AddHeader(L"Content-Encoding", L"gzip"); + } +} + + +void Request::PrepareContentLengthHeader(size_t output_size) +{ + if( output_size != static_cast(-1) ) + { + pt::WTextStream buf; + buf << output_size; + AddHeader(L"Content-Length", buf); + } +} + + +void Request::PrepareHeaderContentType() +{ + if( !out_headers.has_key(Winix::Header::content_type) ) + { + if( container_type == Request::ContainerType::container_json ) + { + out_headers.add(Winix::Header::content_type, Winix::Header::application_json_utf8); + } + else + if( container_type == Request::ContainerType::container_xml ) + { + out_headers.add(Winix::Header::content_type, Winix::Header::application_xml_utf8); + } + else + if( container_type == Request::ContainerType::container_csv ) + { + out_headers.add(Winix::Header::content_type, Winix::Header::text_csv_utf8); + } + else + if( container_type == Request::ContainerType::container_raw ) + { + if( send_bin_stream ) + { + out_headers.add(Winix::Header::content_type, Winix::Header::application_octet_stream); + } + else + { + switch( config->content_type_header ) + { + case 1: + out_headers.add(Winix::Header::content_type, Winix::Header::application_xhtml_xml_utf8); + break; + + case 2: + out_headers.add(Winix::Header::content_type, Winix::Header::application_xml_utf8); + break; + + case 0: + default: + out_headers.add(Winix::Header::content_type, Winix::Header::text_html_utf8); + } + } + } + } +} + + +void Request::PrepareHeaderStatus(int http_status) +{ + pt::WTextStream value; + Header::prepare_status_value(http_status, value, false); + AddHeader(L"Status", value); + + Log * plog = get_logger(); + + if( plog ) + { + (*plog) << log2 << "Request: http status: " << value << logend; + } +} + + +// we can improve SendHeaders and SendCookies methods by checking +// whether there is a new line character in either a name or a value +// and if such character exists and is being sent to the client it breaks the http headers and content +// and if compression is enabled the client's browser will not be able to decompress the stream +void Request::SendHeaders() +{ + pt::Space::ObjectType::iterator i; + pt::Space & headers = out_headers; + Log * plog = get_logger(); + + if( headers.is_object() ) + { + plugin->Call(WINIX_PREPARE_TO_SEND_HTTP_HEADERS, &headers); + + for(i=headers.value.value_object.begin() ; i != headers.value.value_object.end() ; ++i) + { + if( i->second->is_wstr() ) + { + pt::wide_to_utf8(i->first, aheader_name); + pt::wide_to_utf8(*i->second->get_wstr(), 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); + + if( config->log_http_answer_headers && plog ) + (*plog) << log1 << "HTTP Header: " << aheader_name << ": " << aheader_value << logend; + } + else + { + if( plog ) + { + (*plog) << log2 << "Skipping HTTP Header: " << i->first << " - it's not a wstr" << logend; + } + } + } + } +} + + + +void Request::SendCookies() +{ + pt::Space::ObjectType::iterator i; + pt::Space & cookies = out_cookies; + Log * plog = get_logger(); + + if( cookies.is_object() ) + { + plugin->Call(WINIX_PREPARE_TO_SEND_HTTP_COOKIES, &cookies); + + for(i=cookies.value.value_object.begin() ; i != cookies.value.value_object.end() ; ++i) + { + if( i->second->is_wstr() ) + { + pt::wide_to_utf8(i->first, aheader_name); + pt::wide_to_utf8(*i->second->get_wstr(), 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); + + if( config->log_http_answer_headers && plog ) + (*plog) << log1 << "HTTP Header: Set-Cookie: " << aheader_name << "=" << aheader_value << logend; + } + else + { + if( plog ) + { + (*plog) << log2 << "Skipping Cookie: " << i->first << " - it's not a wstr" << logend; + } + } + } + } +} + + + +bool Request::CreateStaticResourcePath(pt::WTextStream & out_path) +{ + bool status = false; + size_t i = 0; + Log * plog = get_logger(); + Dirs * dirs = get_dirs(); + + if( dirs && mount ) + { + Item * dir = dirs->GetDir(mount->dir_id); + + if( dir ) + { + size_t how_many_dirs = dirs->DirLevel(dir->id); + const wchar_t * path = SkipDirs(env_request_uri.c_str(), how_many_dirs); + + // the path begins with a slash only if how_many_dirs is zero + while( *path == '/' ) + path += 1; + + while( path[i]!=0 && path[i]!='?' && path[i]!='#' ) + ++i; + + if( i > 0 ) + out_path.write(path, i); + + status = true; + } + else + { + if( plog ) + { + (*plog) << log1 << "Request: cannot find the mount directory" << logend; + } + } + } + + return status; +} + + +bool Request::CanSendContent() +{ + if( !x_sendfile.empty() ) + { + // if there is a file to send then we do not send a content + return false; + } + + if( !redirect_to.empty() ) + { + // if there is a redirect and no json is requred then we do not send the content + return false; + } + + if( method == Request::head ) + { + return false; + } + + return true; +} + + + +void Request::LogRequestTime() +{ + pt::TextStream str; + timespec_to_stream_with_unit(timespec_req_diff, str); + + Log * plog = get_logger(); + + if( plog ) + { + (*plog) << log2 << "Request: request took: " << str << logend; + } +} + + + +void Request::FinishRequest() +{ + modify_status_code_if_needed(); // will be removed + SendAnswer(); + RequestEnds(); + LogRequestTime(); + + if( session ) + { + session->allow_to_delete = true; + } + + if( plugin ) + { + plugin->Call(WINIX_END_REQUEST, this); + } + + run_state = RunState::finished; + FCGX_Finish_r(&fcgi_request); + + if( templates ) + { + templates->ClearAfterRequest(); + } +} + + } // namespace Winix diff --git a/winixd/core/request.h b/winixd/core/request.h index 5185847..469cf62 100644 --- a/winixd/core/request.h +++ b/winixd/core/request.h @@ -51,6 +51,11 @@ #include "models.h" #include "models/winixmodel.h" #include "header.h" +#include "compress.h" +#include "plugin.h" +#include "mount.h" +#include "mounts.h" + namespace Winix @@ -60,7 +65,7 @@ namespace Winix class FunctionBase; - +class Templates; @@ -87,6 +92,15 @@ public: */ size_t id; + // the state of the request + // not_assigned - the object is not being used + // normal_run - run in the main thread, this state is set after a new request is made + // assigned_to_job - the request is preserved and a new job will be called + // job_run - run in the job thread (objects are locked) + // finished - the request is finished and the object can be removed + enum RunState { not_assigned = 0, normal_run, assigned_to_job, job_run, job_continuation_run, finished}; + + RunState run_state; /* * request start time @@ -230,13 +244,23 @@ public: // null if there is no a function FunctionBase * function; + // current session (if exists, can be null) + Session * session; + + // current mount point (can be null, it is treated as cms filesystem then) + Mount * mount; + // parameters (name:value) ParamTab param_tab; // this is a pointer either to the item (if exists) or to the last directory Item * last_item; + // can we use gzip compression algorithm when sending content to the client + bool accept_gzip; + // can we use deflate compression algorithm when sending content to the client + bool accept_deflate; /* @@ -412,16 +436,24 @@ public: std::vector item_tab; + /* + * FastCGI request structure with pointers to input/output streams + */ + FCGX_Request fcgi_request; - - - + long job_id; + pt::Space job; Request(); - void SetConfig(Config * pconfig); + + void SetConfig(Config * config); + void SetTemplates(Templates * templates); + void SetCompress(Compress * compress); + void SetPlugin(Plugin * plugin); + void SetMounts(Mounts * mounts); void fields(); @@ -473,10 +505,34 @@ public: bool has_frame(const wchar_t * frame); bool has_frame(const std::wstring & frame); + void create_job(long job_id); + void modify_status_code_if_needed(); + + // RENAMEME to add_header_if_not_exists + bool AddHeader(const wchar_t * name, const wchar_t * value); + bool AddHeader(const std::wstring & name, const std::wstring & value); + bool AddHeader(const wchar_t * name, const pt::WTextStream & value); + bool AddHeader(const std::wstring & name, const pt::WTextStream & value); + + void FinishRequest(); private: Config * config; + Templates * templates; + Compress * compress; + Plugin * plugin; + Mounts * mounts; + + BinaryPage output_8bit; + BinaryPage compressed_output; + pt::WTextStream output_tmp_filtered_stream; + pt::TextStream serialized_model; + std::string aheader_name, aheader_value; + std::wstring cookie_id_string; + std::string send_data_buf; + + // used in ParamValue() and PostVar() when there is no such a param const std::wstring str_empty; @@ -493,6 +549,45 @@ private: void http_status_error_title(EzcEnv & env); void http_status_error_description(EzcEnv & env); + void SendAnswer(); + void PrepareRawAnswer(); + void PrepareJsonAnswer(); + void PrepareXmlAnswer(); + void PrepareCsvAnswer(); + void PrepareContenerizedAnswer(); + void PutSeparatorIfNeeded(bool put_separator); + void SerializeFieldJson(const wchar_t * field_name); + void SerializeStream(const pt::WTextStream & input_stream, const wchar_t * field_name); + void SerializeStreamJson(const pt::WTextStream & input_stream, const wchar_t * field_name); + void SerializeStreamXml(const pt::WTextStream & input_stream, const wchar_t * field_name); + void SerializeStreamCsv(const pt::WTextStream & input_stream, const wchar_t * field_name); + void SerializeAllFrames(); + void SerializeSpecificFrames(); + void SerializeModels(); + void SerializeModel(morm::Wrapper & wrapper, const wchar_t * field_name); + void SerializeModelJson(morm::Wrapper & wrapper, const wchar_t * field_name); + void SerializeModelXml(morm::Wrapper & wrapper, const wchar_t * field_name); + void SerializeModelCsv(morm::Wrapper & wrapper, const wchar_t * field_name); + void FilterHtmlIfNeeded(const pt::WTextStream & input_stream, BinaryPage & output, bool clear_stream = true); + void Send8bitOutput(BinaryPage & output); + void SendData(const BinaryPage & page, FCGX_Stream * out); + void UseEzcGenerator(); + int SelectDeflateVersion(); + void SelectCompression(size_t source_len, bool & compression_allowed, int & compression_encoding); + void PrepareSessionCookie(); + void PrepareHeaders(bool compressing, int compress_encoding, size_t output_size); + void ModifyStatusForRedirect(); + void PrepareSendFileHeaderForStaticMountpoint(); + void PrepareSendFileHeader(); + void PrepareContentEncodingHeader(int compress_encoding); + void PrepareContentLengthHeader(size_t output_size); + void PrepareHeaderContentType(); + void PrepareHeaderStatus(int http_status); + void SendHeaders(); + void SendCookies(); + bool CreateStaticResourcePath(pt::WTextStream & out_path); + bool CanSendContent(); + void LogRequestTime(); MORM_MEMBER_FIELD(Request) diff --git a/winixd/core/session.cpp b/winixd/core/session.cpp index 27adf32..15bc283 100644 --- a/winixd/core/session.cpp +++ b/winixd/core/session.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -97,6 +97,7 @@ void Session::Clear(bool clear_plugin_data) new_session = true; spam_score = 0; remove_me = false; + allow_to_delete = true; start_time = 0; last_time = 0; @@ -121,6 +122,11 @@ void Session::ClearAfterRequest() } +bool Session::is_temporary_session() const +{ + return id == 0; +} + } // namespace Winix diff --git a/winixd/core/session.h b/winixd/core/session.h index c6c5ea5..16c18a2 100644 --- a/winixd/core/session.h +++ b/winixd/core/session.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2021, Tomasz Sowa + * Copyright (c) 2008-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -66,7 +66,7 @@ public: void ClearAfterRequest(); - // 0 - means that there is a temporary session + // 0 - means that this is a temporary session long id; // a session index @@ -101,10 +101,17 @@ public: bool remember_me; - // if true then this session will be removed by SessionManager - // without checking the time expiration + // if remove_me is true and if allow_to_delete is true then this session will be + // removed by SessionManager without checking the time expiration bool remove_me; + // if the session can be removed then this value is true (default) + // if we continue a request from a controller to a job + // then we set this value to false in order for the SessionManager + // to not delete this + bool allow_to_delete; + + PluginData plugin_data; @@ -133,6 +140,8 @@ public: + bool is_temporary_session() const; + }; diff --git a/winixd/core/sessioncontainer.cpp b/winixd/core/sessioncontainer.cpp index 9e69dc9..2cb0142 100644 --- a/winixd/core/sessioncontainer.cpp +++ b/winixd/core/sessioncontainer.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -82,7 +82,7 @@ Table::iterator i = table.begin(); { if( i->plugin_data.HasAllocatedData() ) { - plugin->Call(&*i, WINIX_PLUGIN_SESSION_DATA_REMOVE); // the session passed here is ok? + plugin->Call(model_connector, &log, &*i, nullptr, nullptr, WINIX_PLUGIN_SESSION_DATA_REMOVE, nullptr, nullptr, 0, 0); // the session passed here is ok? } //i->plugin_data.DeleteAll(); // it's better to call it here instead in the destructor @@ -116,7 +116,7 @@ IndexId::iterator i = index_id.find(id); if( i->second->plugin_data.HasAllocatedData() ) { - plugin->Call(&*(i->second), WINIX_PLUGIN_SESSION_DATA_REMOVE); // the session passed here is ok? + plugin->Call(model_connector, &log, &*(i->second), nullptr, nullptr, WINIX_PLUGIN_SESSION_DATA_REMOVE, nullptr, nullptr, 0, 0); // the session passed here is ok? } //i->second->plugin_data.DeleteAll(); diff --git a/winixd/core/sessionmanager.cpp b/winixd/core/sessionmanager.cpp index 3afb29f..5852598 100644 --- a/winixd/core/sessionmanager.cpp +++ b/winixd/core/sessionmanager.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2019, Tomasz Sowa + * Copyright (c) 2008-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -40,6 +40,7 @@ #include "session.h" #include "sessionparser.h" #include "functions/functionbase.h" +#include "system.h" @@ -558,7 +559,7 @@ SessionContainer::Iterator SessionManager::SessionEnd() - +// called from the main thread (from App::Close) void SessionManager::DeleteSessions() { SessionContainer::Iterator i; @@ -567,7 +568,7 @@ void SessionManager::DeleteSessions() { if( i->puser && !i->remember_me ) { - plugin->Call(&(*i), WINIX_PREPARE_USER_TO_LOGOUT, i->puser); + plugin->Call(main_model_connector, &main_log, &(*i), nullptr, nullptr, WINIX_PREPARE_USER_TO_LOGOUT, i->puser, nullptr, 0, 0); last_container->UserLogout(i->puser->id, i->id); } } @@ -599,7 +600,7 @@ SessionContainer::Iterator i = session_tab.FindById(old_id); } if( changed ) - plugin->Call(&(*i), WINIX_SESSION_CHANGED_ID, old_id, new_id); + plugin->Call(main_model_connector, &main_log, &(*i), nullptr, nullptr, WINIX_SESSION_CHANGED_ID, nullptr, nullptr, old_id, new_id); else main_log << log1 << "SM: I cannot create a new session id (still uses old one)" << logend; } @@ -612,19 +613,20 @@ return changed; } +// called from the main thread (from App::Init) void SessionManager::InitTmpSession() { Session * old_session = cur->session; main_log << log4 << "SM: initializing temporary session" << logend; cur->session = &temporary_session; - plugin->Call(WINIX_SESSION_CREATED); + plugin->Call(main_model_connector, &main_log, nullptr, WINIX_SESSION_CREATED); cur->session = old_session; } - +// called from the main thread at the and (from App::Close) void SessionManager::UninitTmpSession() { Session * old_session = cur->session; @@ -635,18 +637,16 @@ void SessionManager::UninitTmpSession() if( cur->session->plugin_data.HasAllocatedData() ) { - plugin->Call(cur->session, WINIX_PLUGIN_SESSION_DATA_REMOVE); + plugin->Call(main_model_connector, &main_log, cur->session, nullptr, nullptr, WINIX_PLUGIN_SESSION_DATA_REMOVE); } //cur->session->plugin_data.DeleteAll(); // this will call plugin.Call(WINIX_PLUGIN_SESSION_DATA_REMOVE); - cur->session->plugin_data.Resize(0); - cur->session = old_session; } - +// called from the main thread (from App::Init) void SessionManager::LoadSessions() { SessionParser sp; @@ -665,7 +665,7 @@ SessionContainer::Iterator i; for(i=session_tab.Begin() ; i != session_tab.End() ; ++i) { i->plugin_data.Resize(plugin->Size()); - plugin->Call(&(*i), WINIX_SESSION_CREATED); + plugin->Call(main_model_connector, &main_log, &(*i), nullptr, nullptr, WINIX_SESSION_CREATED); /* !! IMPROVE ME @@ -673,7 +673,7 @@ SessionContainer::Iterator i; */ if( i->puser ) - plugin->Call(&(*i), WINIX_USER_LOGGED); + plugin->Call(main_model_connector, &main_log, &(*i), nullptr, nullptr, WINIX_USER_LOGGED); } } else @@ -758,7 +758,7 @@ size_t SessionManager::MarkAllSessionsToRemove(long user_id) { if( i->puser && i->puser->id == user_id ) { - plugin->Call(&(*i), WINIX_PREPARE_USER_TO_LOGOUT, i->puser); + plugin->Call(main_model_connector, &main_log, &(*i), nullptr, nullptr, WINIX_PREPARE_USER_TO_LOGOUT, i->puser); last_container->UserLogout(i->puser->id, i->id); i->remove_me = true; i->puser = 0; @@ -871,7 +871,7 @@ const int deleted_max_at_once = 10; } else { - if( i->remove_me || IsSessionOutdated(*i) ) + if( i->allow_to_delete && (i->remove_me || IsSessionOutdated(*i)) ) { Session * ses = &(*i); ++i; @@ -917,16 +917,16 @@ void SessionManager::DeleteSession(Session * del_session) { if( del_session->puser ) { - plugin->Call(del_session, WINIX_PREPARE_USER_TO_LOGOUT, del_session->puser); + plugin->Call(model_connector, &log, del_session, nullptr, nullptr, WINIX_PREPARE_USER_TO_LOGOUT, del_session->puser, nullptr, 0, 0); last_container->UserLogout(del_session->puser->id, del_session->id); del_session->puser = 0; } long id = del_session->id; - plugin->Call(del_session, WINIX_PREPARE_SESSION_TO_REMOVE); + plugin->Call(model_connector, &log, del_session, nullptr, nullptr, WINIX_PREPARE_SESSION_TO_REMOVE, del_session->puser, nullptr, 0, 0); session_tab.EraseById(del_session->id); - plugin->Call((Session*)0, WINIX_SESSION_REMOVED, id); + plugin->Call(model_connector, &log, nullptr, WINIX_SESSION_REMOVED, nullptr, nullptr, id, 0); } diff --git a/winixd/core/sessionmanager.h b/winixd/core/sessionmanager.h index 564d2cf..b23368e 100644 --- a/winixd/core/sessionmanager.h +++ b/winixd/core/sessionmanager.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2019, Tomasz Sowa + * Copyright (c) 2008-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -43,7 +43,6 @@ #include "config.h" #include "request.h" #include "lastcontainer.h" -#include "system.h" #include "synchro.h" #include "basethread.h" #include "sessionidmanager.h" diff --git a/winixd/core/system.cpp b/winixd/core/system.cpp index 1408d08..b64f529 100644 --- a/winixd/core/system.cpp +++ b/winixd/core/system.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2021, Tomasz Sowa + * Copyright (c) 2010-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -137,7 +137,6 @@ bool System::Init() mounts.SkipStaticDirs(config->dont_use_static_dirs); mounts.SetDirs(&dirs); mounts.SetDb(db); - mounts.SetCur(cur); // only one method is using cur, can be passed as a parameter to the method mounts.CreateMounts(); mounts.ReadMounts(); @@ -168,6 +167,12 @@ bool System::Init() if( !thread_manager.Add(&image, L"image") ) return false; + job.SetCur(cur); + job.SetFunctions(functions); + job.SetLoadAvg(&load_avg); + job.SetMounts(&mounts); + job.SetReqTab(&req_tab); + // SetSynchro will be called by ThreadManager itself // job.ReadFromFile(); if( !thread_manager.Add(&job, L"job") ) @@ -1440,7 +1445,7 @@ bool System::FollowAllLinks(const std::wstring & link_to, log << log3 << "System: current directory changed and the new file loaded" << logend; } - mounts.CalcCurMount(); + mounts.CalcCurMount(cur->request); } else { @@ -1522,5 +1527,28 @@ bool System::AddCommonFileToVar(const wchar_t * file_path, const wchar_t * url, +void System::DeleteOldRequests(bool leave_one_object) +{ + std::list::iterator i = req_tab.begin(); + + while( i != req_tab.end() ) + { + // leave at least one object (even if it is finished) + if( i->run_state == Request::RunState::finished && (!leave_one_object || req_tab.size() > 1) ) + { + log << log3 << "System: removing finished request " << cur->request << logend; + std::list::iterator old_i = i; + ++i; + req_tab.erase(old_i); + } + else + { + ++i; + } + } +} + + + } // namespace Winix diff --git a/winixd/core/system.h b/winixd/core/system.h index 12ea422..18a3297 100644 --- a/winixd/core/system.h +++ b/winixd/core/system.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2018, Tomasz Sowa + * Copyright (c) 2010-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -108,6 +108,9 @@ public: // when winix starts TimeZones time_zones; + // list of requests, if a request is to be continued in a job then it is preserved in the req_tab + // and a new Request is inserted for the next incoming request + std::list req_tab; using WinixModelDeprecated::get_model_connector; @@ -221,6 +224,7 @@ public: void CreateItemLink(const Item & item, std::wstring & link, bool clear_str = true); + void DeleteOldRequests(bool leave_one_object = false); private: diff --git a/winixd/core/threadmanager.cpp b/winixd/core/threadmanager.cpp index 3347969..71b314c 100644 --- a/winixd/core/threadmanager.cpp +++ b/winixd/core/threadmanager.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2021, Tomasz Sowa + * Copyright (c) 2011-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -121,6 +121,7 @@ bool ThreadManager::Add(BaseThread * pbase, const wchar_t * thread_name) data.model_connector.set_winix_time_zones(nullptr); // null for a moment, may will be changed data.model_connector.set_winix_pattern_cacher(nullptr); // null for a moment, may will be changed + item.object->set_main_model_connector(get_model_connector()); item.object->set_model_connector(&data.model_connector); if( were_started ) diff --git a/winixd/core/winixbase.cpp b/winixd/core/winixbase.cpp index 010f322..ded799c 100644 --- a/winixd/core/winixbase.cpp +++ b/winixd/core/winixbase.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2018-2021, Tomasz Sowa + * Copyright (c) 2018-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -69,7 +69,7 @@ void WinixBase::set_log_buffer(pt::WTextStream * log_buffer) } -void WinixBase::set_file_log(FileLog * file_log) +void WinixBase::set_file_log(pt::FileLog * file_log) { log.set_file_log(file_log); } diff --git a/winixd/core/winixbase.h b/winixd/core/winixbase.h index 9eed0b8..882feed 100644 --- a/winixd/core/winixbase.h +++ b/winixd/core/winixbase.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2018-2021, Tomasz Sowa + * Copyright (c) 2018-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -59,7 +59,7 @@ public: void set_config(Config * config); void set_synchro(Synchro * synchro); void set_log_buffer(pt::WTextStream * log_buffer); - void set_file_log(FileLog * file_log); + void set_file_log(pt::FileLog * file_log); Log * get_logger(); diff --git a/winixd/core/winixmodeldeprecated.h b/winixd/core/winixmodeldeprecated.h index 97e265f..d77c56c 100644 --- a/winixd/core/winixmodeldeprecated.h +++ b/winixd/core/winixmodeldeprecated.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2018-2021, Tomasz Sowa + * Copyright (c) 2018-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -36,12 +36,16 @@ #define headerfile_winix_core_winixmodel #include "core/winixbase.h" -#include "plugin.h" #include "morm.h" namespace Winix { +/* + * Plugin class is based on WinixModelDeprecated so we cannot include plugin.h here + */ +class Plugin; + // may rename it to WinixConnector or WinixStorage? class WinixModelDeprecated : public WinixBase diff --git a/winixd/functions/cat.cpp b/winixd/functions/cat.cpp index 4a0734c..50ff4e9 100644 --- a/winixd/functions/cat.cpp +++ b/winixd/functions/cat.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2021, Tomasz Sowa + * Copyright (c) 2008-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -34,6 +34,7 @@ #include "cat.h" + namespace Winix { diff --git a/winixd/functions/functionbase.cpp b/winixd/functions/functionbase.cpp index 91acf93..149a6a4 100644 --- a/winixd/functions/functionbase.cpp +++ b/winixd/functions/functionbase.cpp @@ -167,6 +167,24 @@ void FunctionBase::Clear() +void FunctionBase::ContinueMakePost() +{ + // do nothing by default +} + + +void FunctionBase::ContinueMakeGet() +{ + // do nothing by default +} + +void FunctionBase::ContinueMakeDelete() +{ + // do nothing by default +} + + + } // namespace Winix diff --git a/winixd/functions/functionbase.h b/winixd/functions/functionbase.h index 80c786e..d257728 100644 --- a/winixd/functions/functionbase.h +++ b/winixd/functions/functionbase.h @@ -40,7 +40,6 @@ #include "db/db.h" #include "core/request.h" #include "core/config.h" -#include "core/system.h" #include "core/synchro.h" #include "notify/notify.h" #include "core/winixrequest.h" @@ -116,6 +115,14 @@ public: virtual void MakeDelete(); virtual void Clear(); + /* + * called from the jobs thread + * objects are locked + */ + virtual void ContinueMakePost(); + virtual void ContinueMakeGet(); + virtual void ContinueMakeDelete(); + //void SetConfig(Config * pconfig); //void SetCur(Cur * pcur); @@ -130,7 +137,6 @@ public: protected: //Config * config; - //Cur * cur; Db * db; // depracated //System * system; Functions * functions; diff --git a/winixd/functions/functionparser.cpp b/winixd/functions/functionparser.cpp index 51d7699..f119c59 100644 --- a/winixd/functions/functionparser.cpp +++ b/winixd/functions/functionparser.cpp @@ -50,22 +50,21 @@ FunctionParser::FunctionParser() } -bool FunctionParser::Parse(Cur * pcur, Db * pdb, Functions * pfunctions, System * psystem) +bool FunctionParser::Parse(Request * request, Dirs * dirs, Functions * functions) { - db = pdb; - cur = pcur; - system = psystem; - functions = pfunctions; + this->request = request; + this->dirs = dirs; + this->functions = functions; last_dir = nullptr; - path = cur->request->env_request_uri.c_str(); + path = request->env_request_uri.c_str(); status = true; // IMPROVEME put WINIX_URL_MAX_SIZE to the config - if( cur->request->env_request_uri.size() <= WINIX_URL_MAX_SIZE ) + if( request->env_request_uri.size() <= WINIX_URL_MAX_SIZE ) { - if( !cur->request->dir_tab.empty() ) + if( !request->dir_tab.empty() ) { - last_dir = cur->request->dir_tab.back(); + last_dir = request->dir_tab.back(); PrintCurrentDirs(); if( ParseDirsItemFunction() ) @@ -77,36 +76,74 @@ bool FunctionParser::Parse(Cur * pcur, Db * pdb, Functions * pfunctions, System else { status = false; - cur->request->http_status = Header::status_500_internal_server_error; + request->http_status = Header::status_500_internal_server_error; log << log1 << "FP: no root directory provided in the request dir_tab" << logend; } } else { status = false; - cur->request->http_status = Header::status_414_uri_too_long; - log << log1 << "FP: the URL is too long: " << cur->request->env_request_uri.size() << logend; + request->http_status = Header::status_414_uri_too_long; + log << log1 << "FP: the URL is too long: " << request->env_request_uri.size() << logend; } return status; } + +bool FunctionParser::ParseDirs(Request * request, Dirs * dirs) +{ + this->request = request; + this->dirs = dirs; + this->functions = nullptr; + last_dir = nullptr; + path = request->env_request_uri.c_str(); + status = true; + + // IMPROVEME put WINIX_URL_MAX_SIZE to the config + if( request->env_request_uri.size() <= WINIX_URL_MAX_SIZE ) + { + if( !request->dir_tab.empty() ) + { + last_dir = request->dir_tab.back(); + PrintCurrentDirs(); + ParseDirs(); + } + else + { + status = false; + request->http_status = Header::status_500_internal_server_error; + log << log1 << "FP: no root directory provided in the request dir_tab" << logend; + } + } + else + { + status = false; + request->http_status = Header::status_414_uri_too_long; + log << log1 << "FP: the URL is too long: " << request->env_request_uri.size() << logend; + } + + return status; +} + + + /* * there should be at least the root directory */ void FunctionParser::PrintCurrentDirs() { - std::vector::iterator i = cur->request->dir_tab.begin(); + std::vector::iterator i = request->dir_tab.begin(); - for( ; i != cur->request->dir_tab.end() ; ++i) + for( ; i != request->dir_tab.end() ; ++i) { LogDir(*i); } } -bool FunctionParser::ParseDirsItemFunction() +void FunctionParser::ParseDirs() { ReadName(); @@ -115,6 +152,12 @@ bool FunctionParser::ParseDirsItemFunction() AddDir(); ReadName(); } +} + + +bool FunctionParser::ParseDirsItemFunction() +{ + ParseDirs(); if( name.empty() ) { @@ -150,7 +193,7 @@ bool FunctionParser::ParseDirsItemFunction() if( !CheckAddFunction() ) { log << log3 << "FP: unknown function: " << name << logend; - cur->request->http_status = Header::status_404_not_found; + request->http_status = Header::status_404_not_found; status = false; return false; } @@ -167,7 +210,7 @@ bool FunctionParser::IsDir() if( name.empty() || !last_dir ) return false; - last_dir = system->dirs.GetDir(name, last_dir->id); + last_dir = dirs->GetDir(name, last_dir->id); return last_dir != nullptr; } @@ -175,8 +218,8 @@ bool FunctionParser::IsDir() bool FunctionParser::CheckAddItem() { - // cur->request->dir_tab has at least one element - long parent_id = cur->request->dir_tab.back()->id; + // request->dir_tab has at least one element + long parent_id = request->dir_tab.back()->id; morm::Finder finder(model_connector); finder. @@ -184,33 +227,36 @@ bool FunctionParser::CheckAddItem() where(). eq(L"parent_id", parent_id). eq(L"url", name). - get(cur->request->item); + get(request->item); - if( cur->request->item.found() ) + if( request->item.found() ) { - log << log3 << "FP: Item: id: " << cur->request->item.id << ", url: " << cur->request->item.url << logend; - cur->request->last_item = &cur->request->item; - cur->request->is_item = true; + log << log3 << "FP: Item: id: " << request->item.id << ", url: " << request->item.url << logend; + request->last_item = &request->item; + request->is_item = true; } else { log << log3 << "FP: No Item: url: " << name << logend; - cur->request->http_status = Header::status_404_not_found; + request->http_status = Header::status_404_not_found; status = false; } - return cur->request->item.found(); + return request->item.found(); } bool FunctionParser::CheckAddFunction() { - cur->request->function = functions->Find(name); - - if( cur->request->function ) + if( functions ) { - log << log3 << "FP: Function: " << cur->request->function->fun.url << logend; + request->function = functions->Find(name); + } + + if( request->function ) + { + log << log3 << "FP: Function: " << request->function->fun.url << logend; return true; } @@ -231,9 +277,9 @@ void FunctionParser::LogDir(Item * dir) void FunctionParser::AddDir() { - cur->request->dir_tab.push_back(last_dir); + request->dir_tab.push_back(last_dir); LogDir(last_dir); - cur->request->last_item = cur->request->dir_tab.back(); + request->last_item = request->dir_tab.back(); } @@ -302,7 +348,7 @@ void FunctionParser::AddParam() { param.name = name; param.value = value; - cur->request->param_tab.push_back(param); + request->param_tab.push_back(param); log << log3 << "FP: Param: name=" << param.name; @@ -323,15 +369,15 @@ void FunctionParser::ParseAnchor() while( *path ) name_ascii += GetChar(); - pt::utf8_to_wide(name_ascii, cur->request->anchor); + pt::utf8_to_wide(name_ascii, request->anchor); - if( !cur->request->anchor.empty() ) - log << log3 << "FP: anchor: " << cur->request->anchor << logend; + if( !request->anchor.empty() ) + log << log3 << "FP: anchor: " << request->anchor << logend; } else if( *path != 0 ) { - cur->request->http_status = Header::status_400_bad_request; + request->http_status = Header::status_400_bad_request; status = false; } } @@ -362,7 +408,7 @@ int FunctionParser::FromHex(int c) } else { - cur->request->http_status = Header::status_400_bad_request; + request->http_status = Header::status_400_bad_request; status = false; } @@ -383,7 +429,7 @@ int c; if( c == 0 && status ) { - cur->request->http_status = Header::status_400_bad_request; + request->http_status = Header::status_400_bad_request; status = false; } diff --git a/winixd/functions/functionparser.h b/winixd/functions/functionparser.h index 462f599..3432551 100644 --- a/winixd/functions/functionparser.h +++ b/winixd/functions/functionparser.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2021, Tomasz Sowa + * Copyright (c) 2008-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -40,7 +40,7 @@ #include "core/winixmodeldeprecated.h" #include "db/db.h" #include "core/cur.h" -#include "core/system.h" +#include "core/dirs.h" namespace Winix @@ -60,13 +60,15 @@ public: /* * if the method returns false then cur->request->http_status will be already set to a specific error */ - bool Parse(Cur * pcur, Db * pdb, Functions * pfunctions, System * psystem); + bool Parse(Request * request, Dirs * dirs, Functions * functions); + bool ParseDirs(Request * request, Dirs * dirs); + private: Db * db; - Cur * cur; - System * system; + Request * request; + Dirs * dirs; Functions * functions; const wchar_t * path; @@ -79,6 +81,7 @@ private: void SkipSlashes(); void PrintCurrentDirs(); + void ParseDirs(); bool ParseDirsItemFunction(); void ParseParams(); void ParseAnchor(); diff --git a/winixd/functions/functions.cpp b/winixd/functions/functions.cpp index a46e676..6e9b63d 100644 --- a/winixd/functions/functions.cpp +++ b/winixd/functions/functions.cpp @@ -170,6 +170,7 @@ Error Functions::CheckSpecialFile(const Item & item) cur->mount = system->mounts.GetEmptyMount(); system->mounts.ReadMounts(item.item_content.content_raw); + system->mounts.CalcCurMount(cur->request); cur->mount = system->mounts.pmount; templates->ReadNewIndexTemplates(); templates->ReadNewChangeTemplates(); @@ -275,7 +276,7 @@ void Functions::CreateFunctions() Add(fun_who); Add(fun_vim); - plugin->Call((Session*)0, WINIX_CREATE_FUNCTIONS); + plugin->Call(WINIX_CREATE_FUNCTIONS); } @@ -312,10 +313,15 @@ void Functions::Finish() bool Functions::Parse() { - return function_parser.Parse(cur, db, this, system); + return function_parser.Parse(cur->request, &system->dirs, this); } +bool Functions::ParseOnlyDirs() +{ + return function_parser.ParseDirs(cur->request, &system->dirs); +} + void Functions::SetDefaultFunctionForFile() { @@ -494,6 +500,56 @@ void Functions::MakeFunction() } +void Functions::ContinueMakeFunction() +{ + if( !cur->request->function ) + { + cur->request->status = WINIX_ERR_NO_FUNCTION; + log << log1 << "Functions: no function (neither cat nor ls)" << logend; + return; + } + +// if( !system->DirsHaveReadExecPerm() || +// !system->HasReadExecAccess(cur->request->function->fun) || +// !cur->request->function->HasAccess() ) +// { +// cur->request->status = WINIX_ERR_PERMISSION_DENIED; +// return; +// } + + if( cur->request->method == Request::get ) + { + log << log4 << "Functions: continuing method get for request " << cur->request + << " for function " << cur->request->function->fun.url << logend; + cur->request->function->ContinueMakeGet(); + } + else + if( cur->request->method == Request::post ) + { + log << log4 << "Functions: continuing method post for request " << cur->request + << " for function " << cur->request->function->fun.url << logend; + cur->request->function->ContinueMakePost(); + } + else + if( cur->request->method == Request::head ) + { + // do nothing + + // !! IMPROVE ME + // we should make a page similar like in a GET request but the content should not be returned only + } + else + if( cur->request->method == Request::delete_ ) + { + log << log4 << "Functions: continuing method delete for request " << cur->request + << " for function " << cur->request->function->fun.url << logend; + cur->request->function->ContinueMakeDelete(); + } + else + { + log << log1 << "Functions: cannot continue a request, unknown request method (skipping)" << logend; + } +} diff --git a/winixd/functions/functions.h b/winixd/functions/functions.h index fe39cb4..7552de0 100644 --- a/winixd/functions/functions.h +++ b/winixd/functions/functions.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2018, Tomasz Sowa + * Copyright (c) 2010-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -151,6 +151,7 @@ public: void Init(); void Finish(); bool Parse(); + bool ParseOnlyDirs(); size_t FunctionsSize(); Iterator Begin(); @@ -159,6 +160,12 @@ public: void CheckFunctionAndSymlink(); void MakeFunction(); + /* + * this function is called from the jobs thread + * objects are locked + */ + void ContinueMakeFunction(); + //void SetConfig(Config * pconfig); void SetCur(Cur * pcur); diff --git a/winixd/main/main.cpp b/winixd/main/main.cpp index 76b8770..37f0a55 100644 --- a/winixd/main/main.cpp +++ b/winixd/main/main.cpp @@ -40,20 +40,21 @@ #include #include #include +#include #include "core/app.h" #include "core/version.h" +#include "core/lock.h" #include "utf8/utf8.h" #include "mainoptions/mainoptionsparser.h" #include "pikotools/version.h" #include "tito.h" +#include "runstatus.h" namespace Winix { - - /* application object */ @@ -104,6 +105,42 @@ void print_syntax() +RunStatus ParseParameters(int argc, const char ** argv, pt::Space & options) +{ + pt::Space arguments; + pt::MainOptionsParser options_parser; + RunStatus run_status; + + arguments.add(L"c", 1); + arguments.add(L"config", 1); + + pt::MainOptionsParser::Status status = options_parser.parse(argc, argv, options, arguments); + + if( status != pt::MainOptionsParser::status_ok ) + { + Winix::print_syntax(); + run_status.exit_code = RunStatus::EXIT_CODE_PARAMETERS_SYNTAX_ERROR; + run_status.should_continue = false; + } + else + { + if( options.has_key(L"h") || options.has_key(L"help") || options.has_key(L"?") ) + { + Winix::print_syntax(); + run_status.should_continue = false; + } + + if( options.has_key(L"v") || options.has_key(L"version") ) + { + Winix::print_version(); + run_status.should_continue = false; + } + } + + return run_status; +} + + void CreateNewDescriptor(int des_dst, int flags) { int descriptor; @@ -278,50 +315,56 @@ bool ReadConfigs(const pt::Space & options, const char ** env) return status; } -} // namespace Winix - -int main(int argc, const char ** argv, const char ** env) +bool InitCurlLibrary() { -using Winix::app; + /* + * + * from documentation https://curl.se/libcurl/c/curl_global_init.html + * This function is thread-safe since libcurl 7.84.0 if curl_version_info has the CURL_VERSION_THREADSAFE + * feature bit set (most platforms). + * + * If this is not thread-safe, you must not call this function when any other thread in the program + * (i.e. a thread sharing the same memory) is running. This does not just mean no other thread that + * is using libcurl. Because curl_global_init calls functions of other libraries that are similarly + * thread unsafe, it could conflict with any other thread that uses these other libraries. + * + */ + CURLcode code = curl_global_init(CURL_GLOBAL_ALL); + bool ok = (code == CURLE_OK); - std::srand(std::time(0)); - app.system.system_start = time(0); - - pt::Space options; - pt::Space arguments; - pt::MainOptionsParser options_parser; - - arguments.add(L"c", 1); - arguments.add(L"config", 1); - - pt::MainOptionsParser::Status status = options_parser.parse(argc, argv, options, arguments); - - if( status != pt::MainOptionsParser::status_ok ) + if( !ok ) { - Winix::print_syntax(); - return 6; + std::cout << "Cannot initialize curl library, exiting" << std::endl; } - if( options.has_key(L"h") || options.has_key(L"help") || options.has_key(L"?") ) + return ok; +} + + +void CleanupCurlLibrary() +{ + curl_global_cleanup(); +} + + + +RunStatus InitializeWinix(Log & log, pt::Space & options, const char ** env) +{ + RunStatus run_status; + + if( !InitCurlLibrary() ) { - Winix::print_syntax(); - return 0; + run_status.exit_code = RunStatus::EXIT_CODE_CANNOT_INITIALIZE_CURL; + run_status.should_continue = false; + return run_status; } - if( options.has_key(L"v") || options.has_key(L"version") ) + if( !ReadConfigs(options, env) ) { - Winix::print_version(); - return 0; - } + pt::WTextStream * log_buffer = log.get_log_buffer(); - Winix::Log & log = app.GetMainLog(); - pt::WTextStream * log_buffer = log.get_log_buffer(); - Winix::LogInfo(log, Winix::log3, "UTC booting Winix", true, ""); // date will be printed as UTC because the time zones are not loaded yet - - if( !Winix::ReadConfigs(options, env) ) - { // we need to print the buffer by hand because the logger // is not fully initialized yet if( log_buffer && !log_buffer->empty() ) @@ -329,21 +372,26 @@ using Winix::app; pt::wide_stream_to_utf8(*log_buffer, std::cout); } - return 2; + run_status.exit_code = RunStatus::EXIT_CODE_CANNOT_CORRECTLY_READ_CONFIG; + run_status.should_continue = false; + return run_status; } if( options.has_key(L"dump-config") ) { + pt::WTextStream * log_buffer = log.get_log_buffer(); + if( log_buffer ) { log << "all read config options (some of the values could have been modified by winix" - << " but the modified values are not printed here):" << Winix::logend; + << " but the modified values are not printed here):" << logend; app.config.space.serialize_to_space_stream(*log_buffer, true); - log << Winix::logend; + log << logend; pt::wide_stream_to_utf8(*log_buffer, std::cout); } - return 0; + run_status.should_continue = false; + return run_status; } app.InitLoggers(); @@ -352,55 +400,105 @@ using Winix::app; app.config.log_stdout = false; if( !app.config.log_stdout ) - Winix::CloseDescriptors(); + CloseDescriptors(); if( app.config.demonize && !app.Demonize() ) { - log << Winix::logsave; - return 4; + log << logsave; + run_status.exit_code = RunStatus::EXIT_CODE_CANNOT_DEMONIZE; + run_status.should_continue = false; + return run_status; } if( !app.InitFCGI() ) { - log << Winix::logsave; - return 5; + /* + * WARNING: + * when there is a problem with initializing FastCGI FCGX_OpenSocket() will call exit() + * and we never reach here + */ + log << logsave; + run_status.exit_code = RunStatus::EXIT_CODE_CANNOT_INITIALIZE_FASTCGI; + run_status.should_continue = false; + return run_status; } if( !app.DropPrivileges() ) { - log << Winix::logsave; - return 3; + log << logsave; + run_status.exit_code = RunStatus::EXIT_CODE_CANNOT_DROP_PRIVILEGES; + run_status.should_continue = false; + return run_status; } app.LogUserGroups(); - Winix::SavePidFile(log); + SavePidFile(log); // app.Init() starts other threads as well (they will be waiting on the lock) if( !app.Init() ) { - Winix::RemovePidFile(); - log << Winix::logsave; - return 1; + run_status.exit_code = RunStatus::EXIT_CODE_CANNOT_INITIALIZE_APPLICATION; + run_status.should_continue = false; + return run_status; } - app.StartThreads(); - // now we have more threads, we should use Lock() and Unlock() - - // saving all starting logs - app.Lock(); - Winix::LogInfo(log, Winix::log1, "Winix", true, "started"); - log << Winix::logsave; - app.Unlock(); - - // main loop - app.Start(); - - app.Close(); - - Winix::LogInfo(log, Winix::log1, "Winix", true, "stopped"); - Winix::RemovePidFile(); - log << Winix::logsave; - -return 0; + return run_status; +} + + +void UninitializeWinix(Log & log) +{ + Winix::RemovePidFile(); + log << Winix::logsave; + Winix::CleanupCurlLibrary(); +} + + + +} // namespace Winix + + + +int main(int argc, const char ** argv, const char ** env) +{ + using Winix::app; + + Winix::RunStatus run_status; + pt::Space options; + + std::srand(std::time(0)); + app.system.system_start = time(0); + + run_status = Winix::ParseParameters(argc, argv, options); + + if( !run_status.should_continue ) + return run_status.exit_code; + + Winix::Log & log = app.GetMainLog(); + Winix::LogInfo(log, Winix::log3, "UTC booting Winix", true, ""); // date will be printed as UTC because the time zones are not loaded yet + + run_status = Winix::InitializeWinix(log, options, env); + + if( run_status.should_continue ) + { + app.StartThreads(); + // now we are in multi threaded environment, we should use our locking mechanism + + // saving all starting logs (logger can be used without locking) + Winix::LogInfo(log, Winix::log1, "Winix", true, "started"); + log << Winix::logsave; + + // start the main loop + app.Start(); + + // close winix + app.Close(); + // now all other threads are terminated, we are in single threaded environment again + } + + Winix::LogInfo(log, Winix::log1, "Winix", true, "stopped"); + UninitializeWinix(log); + + return run_status.exit_code; } diff --git a/winixd/main/runstatus.h b/winixd/main/runstatus.h new file mode 100644 index 0000000..a129f77 --- /dev/null +++ b/winixd/main/runstatus.h @@ -0,0 +1,69 @@ +/* + * This file is a part of Winix + * and is distributed under the 2-Clause BSD licence. + * Author: Tomasz Sowa + */ + +/* + * Copyright (c) 2022, Tomasz Sowa + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + */ + +#ifndef headerfile_winix_main_runstatus +#define headerfile_winix_main_runstatus + + +namespace Winix +{ + + +struct RunStatus +{ + const static int EXIT_CODE_OK = 0; + const static int EXIT_CODE_CANNOT_INITIALIZE_APPLICATION = 1; + const static int EXIT_CODE_CANNOT_CORRECTLY_READ_CONFIG = 2; + const static int EXIT_CODE_CANNOT_DROP_PRIVILEGES = 3; + const static int EXIT_CODE_CANNOT_DEMONIZE = 4; + const static int EXIT_CODE_CANNOT_INITIALIZE_FASTCGI = 5; + const static int EXIT_CODE_PARAMETERS_SYNTAX_ERROR = 6; + const static int EXIT_CODE_CANNOT_INITIALIZE_CURL = 7; + + int exit_code; + bool should_continue; + + RunStatus() + { + exit_code = EXIT_CODE_OK; + should_continue = true; + } +}; + + + +} + +#endif + diff --git a/winixd/notify/notify.cpp b/winixd/notify/notify.cpp index 9dc7c2f..2d07c3d 100644 --- a/winixd/notify/notify.cpp +++ b/winixd/notify/notify.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2018, Tomasz Sowa + * Copyright (c) 2008-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -104,7 +104,7 @@ bool Notify::Init() notify_template_activate_account = AddTemplate(L"notify_confirm_account.txt"); notify_template_reset_password = AddTemplate(L"notify_reset_password.txt"); - plugin->Call((Session*)0, WINIX_NOTIFY_ADD_TEMPLATE); + plugin->Call(WINIX_NOTIFY_ADD_TEMPLATE); return true; } diff --git a/winixd/notify/notifythread.cpp b/winixd/notify/notifythread.cpp index 2fa93bd..a3e48d4 100644 --- a/winixd/notify/notifythread.cpp +++ b/winixd/notify/notifythread.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2021, Tomasz Sowa + * Copyright (c) 2008-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -94,7 +94,7 @@ void NotifyThread::PatternsChanged() bool NotifyThread::Init() { TemplatesNotifyFunctions::CreateFunctions(); - plugin->Call((Session*)0, WINIX_NOTIFY_TEMPLATES_CREATEFUNCTIONS, &TemplatesNotifyFunctions::ezc_functions); + plugin->Call(WINIX_NOTIFY_TEMPLATES_CREATEFUNCTIONS, &TemplatesNotifyFunctions::ezc_functions); return true; } diff --git a/winixd/plugins/export/Makefile.dep b/winixd/plugins/export/Makefile.dep index d8cc0ef..062b3ce 100644 --- a/winixd/plugins/export/Makefile.dep +++ b/winixd/plugins/export/Makefile.dep @@ -96,10 +96,14 @@ ./edb.o: ../../../../winix/winixd/core/textstream.h ./edb.o: ../../../../winix/winixd/models/winixmodel.h ./edb.o: ../../../../winix/winixd/core/header.h -./edb.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./edb.o: ../../../../winix/winixd/core/compress.h ./edb.o: ../../../../winix/winixd/core/plugin.h ./edb.o: ../../../../winix/winixd/core/pluginmsg.h ./edb.o: ../../../../winix/winixd/core/plugindata.h +./edb.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./edb.o: ../../../../winix/winixd/core/mount.h +./edb.o: ../../../../winix/winixd/core/mounts.h +./edb.o: ../../../../winix/winixd/core/mountparser.h ./exportinfo.o: ../../../../winix/winixd/core/log.h exportinfo.h ./exportinfo.o: ../../../../winix/winixd/core/system.h ./exportinfo.o: ../../../../winix/winixd/core/job.h @@ -161,12 +165,9 @@ ./exportinfo.o: ../../../../winix/winixd/core/synchro.h ./exportinfo.o: ../../../../winix/winixd/core/filelog.h ./exportinfo.o: ../../../../winix/winixd/core/lock.h -./exportinfo.o: ../../../../winix/winixd/core/plugin.h -./exportinfo.o: ../../../../winix/winixd/core/pluginmsg.h -./exportinfo.o: ../../../../winix/winixd/core/plugindata.h -./exportinfo.o: ../../../../winix/winixd/core/winixbase.h -./exportinfo.o: ../../../../winix/winixd/core/dirs.h -./exportinfo.o: ../../../../winix/winixd/core/dircontainer.h +./exportinfo.o: ../../../../winix/winixd/core/jobtask.h +./exportinfo.o: ../../../../winix/winixd/core/request.h +./exportinfo.o: ../../../../winix/winixd/core/requesttypes.h ./exportinfo.o: ../../../../winix/winixd/models/item.h ./exportinfo.o: ../../../../winix/winixd/models/winixmodel.h ./exportinfo.o: ../../../../winix/winixd/models/winixmodelconnector.h @@ -185,6 +186,18 @@ ./exportinfo.o: ../../../../ezc/src/models.h ./exportinfo.o: ../../../../ezc/src/patternparser.h ./exportinfo.o: ../../../../winix/winixd/templates/htmltextstream.h +./exportinfo.o: ../../../../winix/winixd/core/error.h +./exportinfo.o: ../../../../winix/winixd/core/config.h +./exportinfo.o: ../../../../winix/winixd/core/textstream.h +./exportinfo.o: ../../../../winix/winixd/models/winixmodel.h +./exportinfo.o: ../../../../winix/winixd/core/header.h +./exportinfo.o: ../../../../winix/winixd/core/compress.h +./exportinfo.o: ../../../../winix/winixd/core/winixbase.h +./exportinfo.o: ../../../../winix/winixd/core/plugin.h +./exportinfo.o: ../../../../winix/winixd/core/pluginmsg.h +./exportinfo.o: ../../../../winix/winixd/core/plugindata.h +./exportinfo.o: ../../../../winix/winixd/core/mount.h +./exportinfo.o: ../../../../winix/winixd/core/mounts.h ./exportinfo.o: ../../../../winix/winixd/db/db.h ./exportinfo.o: ../../../../winix/winixd/db/dbbase.h ./exportinfo.o: ../../../../winix/winixd/models/user.h @@ -192,26 +205,20 @@ ./exportinfo.o: ../../../../winix/winixd/core/dircontainer.h ./exportinfo.o: ../../../../winix/winixd/core/ugcontainer.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: ../../../../winix/winixd/core/textstream.h -./exportinfo.o: ../../../../winix/winixd/models/winixmodel.h -./exportinfo.o: ../../../../winix/winixd/core/header.h -./exportinfo.o: ../../../../winix/winixd/core/mounts.h -./exportinfo.o: ../../../../winix/winixd/core/mount.h ./exportinfo.o: ../../../../winix/winixd/core/mountparser.h +./exportinfo.o: ../../../../winix/winixd/core/cur.h +./exportinfo.o: ../../../../winix/winixd/core/session.h +./exportinfo.o: ../../../../winix/winixd/core/rebus.h +./exportinfo.o: ../../../../winix/winixd/core/ipban.h +./exportinfo.o: ../../../../winix/winixd/core/loadavg.h +./exportinfo.o: ../../../../winix/winixd/core/dirs.h +./exportinfo.o: ../../../../winix/winixd/core/dircontainer.h ./exportinfo.o: ../../../../winix/winixd/core/crypt.h ./exportinfo.o: ../../../../winix/winixd/core/run.h ./exportinfo.o: ../../../../winix/winixd/core/users.h ./exportinfo.o: ../../../../winix/winixd/core/ugcontainer.h ./exportinfo.o: ../../../../winix/winixd/core/lastcontainer.h -./exportinfo.o: ../../../../winix/winixd/core/cur.h -./exportinfo.o: ../../../../winix/winixd/core/session.h -./exportinfo.o: ../../../../winix/winixd/core/rebus.h -./exportinfo.o: ../../../../winix/winixd/core/ipban.h ./exportinfo.o: ../../../../winix/winixd/core/groups.h -./exportinfo.o: ../../../../winix/winixd/core/loadavg.h ./exportinfo.o: ../../../../winix/winixd/core/image.h ./exportinfo.o: ../../../../winix/winixd/core/threadmanager.h ./exportinfo.o: ../../../../winix/winixd/models/winixmodelconnector.h @@ -355,33 +362,15 @@ ./funexport.o: ../../../../winix/winixd/core/textstream.h ./funexport.o: ../../../../winix/winixd/models/winixmodel.h ./funexport.o: ../../../../winix/winixd/core/header.h -./funexport.o: ../../../../winix/winixd/core/system.h -./funexport.o: ../../../../winix/winixd/core/job.h -./funexport.o: ../../../../winix/winixd/core/basethread.h -./funexport.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./funexport.o: ../../../../winix/winixd/core/compress.h ./funexport.o: ../../../../winix/winixd/core/plugin.h ./funexport.o: ../../../../winix/winixd/core/pluginmsg.h ./funexport.o: ../../../../winix/winixd/core/plugindata.h -./funexport.o: ../../../../winix/winixd/core/dirs.h -./funexport.o: ../../../../winix/winixd/core/dircontainer.h -./funexport.o: ../../../../winix/winixd/core/request.h -./funexport.o: ../../../../winix/winixd/core/mounts.h +./funexport.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./funexport.o: ../../../../winix/winixd/core/mount.h +./funexport.o: ../../../../winix/winixd/core/mounts.h +./funexport.o: ../../../../winix/winixd/core/request.h ./funexport.o: ../../../../winix/winixd/core/mountparser.h -./funexport.o: ../../../../winix/winixd/core/crypt.h -./funexport.o: ../../../../winix/winixd/core/run.h -./funexport.o: ../../../../winix/winixd/core/users.h -./funexport.o: ../../../../winix/winixd/core/ugcontainer.h -./funexport.o: ../../../../winix/winixd/core/lastcontainer.h -./funexport.o: ../../../../winix/winixd/core/cur.h -./funexport.o: ../../../../winix/winixd/core/session.h -./funexport.o: ../../../../winix/winixd/core/rebus.h -./funexport.o: ../../../../winix/winixd/core/ipban.h -./funexport.o: ../../../../winix/winixd/core/groups.h -./funexport.o: ../../../../winix/winixd/core/loadavg.h -./funexport.o: ../../../../winix/winixd/core/image.h -./funexport.o: ../../../../winix/winixd/core/threadmanager.h -./funexport.o: ../../../../winix/winixd/models/winixmodelconnector.h ./funexport.o: ../../../../winix/winixd/notify/notify.h ./funexport.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./funexport.o: ../../../../winix/winixd/notify/notifypool.h @@ -400,15 +389,34 @@ ./funexport.o: ../../../../winix/winixd/notify/templatesnotify.h ./funexport.o: ../../../../winix/winixd/core/textstream.h ./funexport.o: ../../../../winix/winixd/core/users.h -./funexport.o: ../../../../winix/winixd/core/timezones.h -./funexport.o: ../../../../winix/winixd/core/timezone.h ./funexport.o: ../../../../winix/winixd/core/winixrequest.h ./funexport.o: ../../../../winix/winixd/core/winixsystem.h +./funexport.o: ../../../../winix/winixd/core/system.h +./funexport.o: ../../../../winix/winixd/core/job.h +./funexport.o: ../../../../winix/winixd/core/basethread.h +./funexport.o: ../../../../winix/winixd/core/jobtask.h +./funexport.o: ../../../../winix/winixd/core/cur.h +./funexport.o: ../../../../winix/winixd/core/session.h +./funexport.o: ../../../../winix/winixd/core/rebus.h +./funexport.o: ../../../../winix/winixd/core/ipban.h +./funexport.o: ../../../../winix/winixd/core/loadavg.h +./funexport.o: ../../../../winix/winixd/core/dirs.h +./funexport.o: ../../../../winix/winixd/core/dircontainer.h +./funexport.o: ../../../../winix/winixd/core/crypt.h +./funexport.o: ../../../../winix/winixd/core/run.h +./funexport.o: ../../../../winix/winixd/core/users.h +./funexport.o: ../../../../winix/winixd/core/ugcontainer.h +./funexport.o: ../../../../winix/winixd/core/lastcontainer.h +./funexport.o: ../../../../winix/winixd/core/groups.h +./funexport.o: ../../../../winix/winixd/core/image.h +./funexport.o: ../../../../winix/winixd/core/threadmanager.h +./funexport.o: ../../../../winix/winixd/models/winixmodelconnector.h +./funexport.o: ../../../../winix/winixd/core/timezones.h +./funexport.o: ../../../../winix/winixd/core/timezone.h ./funexport.o: ../../../../winix/winixd/core/cur.h ./funexport.o: ../../../../winix/winixd/core/sessionmanager.h ./funexport.o: ../../../../winix/winixd/core/sessioncontainer.h ./funexport.o: ../../../../winix/winixd/core/ipbancontainer.h -./funexport.o: ../../../../winix/winixd/core/system.h ./funexport.o: ../../../../winix/winixd/core/sessionidmanager.h ./funexport.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./funexport.o: ../../../../winix/winixd/core/slog.h exportinfo.h export.h @@ -421,42 +429,35 @@ ./init.o: ../../../../winix/winixd/core/plugin.h ./init.o: ../../../../winix/winixd/core/pluginmsg.h ./init.o: ../../../../winix/winixd/core/plugindata.h -./init.o: ../../../../winix/winixd/core/winixbase.h -./init.o: ../../../../morm/src/modelconnector.h -./init.o: ../../../../morm/src/clearer.h -./init.o: ../../../../pikotools/src/date/date.h -./init.o: ../../../../pikotools/src/convert/inttostr.h -./init.o: ../../../../pikotools/src/space/space.h -./init.o: ../../../../pikotools/src/textstream/types.h -./init.o: ../../../../pikotools/src/utf8/utf8.h -./init.o: ../../../../pikotools/src/textstream/stream.h -./init.o: ../../../../pikotools/src/utf8/utf8_templates.h -./init.o: ../../../../pikotools/src/utf8/utf8_private.h -./init.o: ../../../../morm/src/ft.h ../../../../morm/src/dbconnector.h -./init.o: ../../../../pikotools/src/textstream/textstream.h -./init.o: ../../../../pikotools/src/textstream/stream.h -./init.o: ../../../../pikotools/src/membuffer/membuffer.h -./init.o: ../../../../pikotools/src/textstream/types.h -./init.o: ../../../../pikotools/src/utf8/utf8_stream.h -./init.o: ../../../../pikotools/src/log/log.h -./init.o: ../../../../pikotools/src/log/filelog.h -./init.o: ../../../../morm/src/queryresult.h -./init.o: ../../../../morm/src/flatconnector.h exportthread.h -./init.o: ../../../../winix/winixd/core/basethread.h message.h exportinfo.h -./init.o: ../../../../winix/winixd/core/system.h -./init.o: ../../../../winix/winixd/core/job.h -./init.o: ../../../../winix/winixd/core/basethread.h -./init.o: ../../../../winix/winixd/core/synchro.h ./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./init.o: ../../../../winix/winixd/core/winixbase.h ./init.o: ../../../../winix/winixd/core/config.h ./init.o: ../../../../pikotools/src/space/spaceparser.h ./init.o: ../../../../pikotools/src/space/space.h ./init.o: ../../../../pikotools/src/convert/baseparser.h +./init.o: ../../../../pikotools/src/textstream/textstream.h +./init.o: ../../../../pikotools/src/textstream/stream.h +./init.o: ../../../../pikotools/src/space/space.h +./init.o: ../../../../pikotools/src/textstream/types.h +./init.o: ../../../../pikotools/src/convert/inttostr.h +./init.o: ../../../../pikotools/src/utf8/utf8.h +./init.o: ../../../../pikotools/src/textstream/stream.h +./init.o: ../../../../pikotools/src/utf8/utf8_templates.h +./init.o: ../../../../pikotools/src/utf8/utf8_private.h +./init.o: ../../../../pikotools/src/date/date.h +./init.o: ../../../../pikotools/src/membuffer/membuffer.h +./init.o: ../../../../pikotools/src/textstream/types.h +./init.o: ../../../../pikotools/src/utf8/utf8_stream.h ./init.o: ../../../../winix/winixd/core/log.h ./init.o: ../../../../winix/winixd/core/logmanipulators.h -./init.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h -./init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h +./init.o: ../../../../pikotools/src/log/log.h +./init.o: ../../../../pikotools/src/log/filelog.h ../../../../morm/src/morm.h +./init.o: ../../../../morm/src/version.h ../../../../morm/src/morm_types.h +./init.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h +./init.o: ../../../../morm/src/clearer.h ../../../../morm/src/ft.h +./init.o: ../../../../morm/src/dbconnector.h +./init.o: ../../../../morm/src/queryresult.h +./init.o: ../../../../morm/src/flatconnector.h ./init.o: ../../../../morm/src/dbexpression.h ./init.o: ../../../../morm/src/baseexpression.h ./init.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h @@ -478,9 +479,15 @@ ./init.o: ../../../../winix/winixd/core/synchro.h ./init.o: ../../../../winix/winixd/core/filelog.h ./init.o: ../../../../winix/winixd/core/lock.h -./init.o: ../../../../winix/winixd/core/plugin.h -./init.o: ../../../../winix/winixd/core/dirs.h -./init.o: ../../../../winix/winixd/core/dircontainer.h +./init.o: ../../../../winix/winixd/core/synchro.h +./init.o: ../../../../winix/winixd/core/mount.h exportthread.h +./init.o: ../../../../winix/winixd/core/basethread.h message.h exportinfo.h +./init.o: ../../../../winix/winixd/core/system.h +./init.o: ../../../../winix/winixd/core/job.h +./init.o: ../../../../winix/winixd/core/basethread.h +./init.o: ../../../../winix/winixd/core/jobtask.h +./init.o: ../../../../winix/winixd/core/request.h +./init.o: ../../../../winix/winixd/core/requesttypes.h ./init.o: ../../../../winix/winixd/models/item.h ./init.o: ../../../../winix/winixd/models/winixmodel.h ./init.o: ../../../../winix/winixd/models/winixmodelconnector.h @@ -497,6 +504,15 @@ ./init.o: ../../../../ezc/src/expressionparser.h ../../../../ezc/src/models.h ./init.o: ../../../../ezc/src/patternparser.h ./init.o: ../../../../winix/winixd/templates/htmltextstream.h +./init.o: ../../../../winix/winixd/core/error.h +./init.o: ../../../../winix/winixd/core/config.h +./init.o: ../../../../winix/winixd/core/textstream.h +./init.o: ../../../../winix/winixd/models/winixmodel.h +./init.o: ../../../../winix/winixd/core/header.h +./init.o: ../../../../winix/winixd/core/compress.h +./init.o: ../../../../winix/winixd/core/winixbase.h +./init.o: ../../../../winix/winixd/core/plugin.h +./init.o: ../../../../winix/winixd/core/mounts.h ./init.o: ../../../../winix/winixd/db/db.h ./init.o: ../../../../winix/winixd/db/dbbase.h ./init.o: ../../../../winix/winixd/models/user.h @@ -504,26 +520,20 @@ ./init.o: ../../../../winix/winixd/core/dircontainer.h ./init.o: ../../../../winix/winixd/core/ugcontainer.h ./init.o: ../../../../winix/winixd/core/request.h -./init.o: ../../../../winix/winixd/core/requesttypes.h -./init.o: ../../../../winix/winixd/core/error.h -./init.o: ../../../../winix/winixd/core/config.h -./init.o: ../../../../winix/winixd/core/textstream.h -./init.o: ../../../../winix/winixd/models/winixmodel.h -./init.o: ../../../../winix/winixd/core/header.h -./init.o: ../../../../winix/winixd/core/mounts.h -./init.o: ../../../../winix/winixd/core/mount.h ./init.o: ../../../../winix/winixd/core/mountparser.h +./init.o: ../../../../winix/winixd/core/cur.h +./init.o: ../../../../winix/winixd/core/session.h +./init.o: ../../../../winix/winixd/core/rebus.h +./init.o: ../../../../winix/winixd/core/ipban.h +./init.o: ../../../../winix/winixd/core/loadavg.h +./init.o: ../../../../winix/winixd/core/dirs.h +./init.o: ../../../../winix/winixd/core/dircontainer.h ./init.o: ../../../../winix/winixd/core/crypt.h ./init.o: ../../../../winix/winixd/core/run.h ./init.o: ../../../../winix/winixd/core/users.h ./init.o: ../../../../winix/winixd/core/ugcontainer.h ./init.o: ../../../../winix/winixd/core/lastcontainer.h -./init.o: ../../../../winix/winixd/core/cur.h -./init.o: ../../../../winix/winixd/core/session.h -./init.o: ../../../../winix/winixd/core/rebus.h -./init.o: ../../../../winix/winixd/core/ipban.h ./init.o: ../../../../winix/winixd/core/groups.h -./init.o: ../../../../winix/winixd/core/loadavg.h ./init.o: ../../../../winix/winixd/core/image.h ./init.o: ../../../../winix/winixd/core/threadmanager.h ./init.o: ../../../../winix/winixd/models/winixmodelconnector.h @@ -552,14 +562,12 @@ ./init.o: ../../../../winix/winixd/core/error.h ./init.o: ../../../../winix/winixd/core/dirs.h funexport.h ./init.o: ../../../../winix/winixd/functions/functionbase.h -./init.o: ../../../../winix/winixd/core/request.h ./init.o: ../../../../winix/winixd/core/winixrequest.h ./init.o: ../../../../winix/winixd/core/winixsystem.h ./init.o: ../../../../winix/winixd/core/cur.h ./init.o: ../../../../winix/winixd/core/sessionmanager.h ./init.o: ../../../../winix/winixd/core/sessioncontainer.h ./init.o: ../../../../winix/winixd/core/ipbancontainer.h -./init.o: ../../../../winix/winixd/core/system.h ./init.o: ../../../../winix/winixd/core/sessionidmanager.h ./init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./init.o: ../../../../winix/winixd/core/slog.h diff --git a/winixd/plugins/export/init.cpp b/winixd/plugins/export/init.cpp index 3c71b77..9a2091d 100644 --- a/winixd/plugins/export/init.cpp +++ b/winixd/plugins/export/init.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2021, Tomasz Sowa + * Copyright (c) 2011-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -251,12 +251,12 @@ void Init(PluginInfo & info) { using namespace Export; - info.set_dependency_for(edb); + edb.set_dependency(info.functions); edb.SetConn(info.db->GetConn()); edb.LogQueries(info.config->log_db_query); edb.SetDirs(&info.system->dirs); - info.set_dependency_for(export_info); + export_info.set_dependency((WinixModelDeprecated*)info.functions); export_info.SetSystem(info.system); export_info.SetConfig(info.config); export_info.SetEDb(&edb); diff --git a/winixd/plugins/gallery/Makefile.dep b/winixd/plugins/gallery/Makefile.dep index cd5b074..4562542 100644 --- a/winixd/plugins/gallery/Makefile.dep +++ b/winixd/plugins/gallery/Makefile.dep @@ -98,33 +98,15 @@ ./gallery.o: ../../../../winix/winixd/core/textstream.h ./gallery.o: ../../../../winix/winixd/models/winixmodel.h ./gallery.o: ../../../../winix/winixd/core/header.h -./gallery.o: ../../../../winix/winixd/core/system.h -./gallery.o: ../../../../winix/winixd/core/job.h -./gallery.o: ../../../../winix/winixd/core/basethread.h -./gallery.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./gallery.o: ../../../../winix/winixd/core/compress.h ./gallery.o: ../../../../winix/winixd/core/plugin.h ./gallery.o: ../../../../winix/winixd/core/pluginmsg.h ./gallery.o: ../../../../winix/winixd/core/plugindata.h -./gallery.o: ../../../../winix/winixd/core/dirs.h -./gallery.o: ../../../../winix/winixd/core/dircontainer.h -./gallery.o: ../../../../winix/winixd/core/request.h -./gallery.o: ../../../../winix/winixd/core/mounts.h +./gallery.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./gallery.o: ../../../../winix/winixd/core/mount.h +./gallery.o: ../../../../winix/winixd/core/mounts.h +./gallery.o: ../../../../winix/winixd/core/request.h ./gallery.o: ../../../../winix/winixd/core/mountparser.h -./gallery.o: ../../../../winix/winixd/core/crypt.h -./gallery.o: ../../../../winix/winixd/core/run.h -./gallery.o: ../../../../winix/winixd/core/users.h -./gallery.o: ../../../../winix/winixd/core/ugcontainer.h -./gallery.o: ../../../../winix/winixd/core/lastcontainer.h -./gallery.o: ../../../../winix/winixd/core/cur.h -./gallery.o: ../../../../winix/winixd/core/session.h -./gallery.o: ../../../../winix/winixd/core/rebus.h -./gallery.o: ../../../../winix/winixd/core/ipban.h -./gallery.o: ../../../../winix/winixd/core/groups.h -./gallery.o: ../../../../winix/winixd/core/loadavg.h -./gallery.o: ../../../../winix/winixd/core/image.h -./gallery.o: ../../../../winix/winixd/core/threadmanager.h -./gallery.o: ../../../../winix/winixd/models/winixmodelconnector.h ./gallery.o: ../../../../winix/winixd/notify/notify.h ./gallery.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./gallery.o: ../../../../winix/winixd/notify/notifypool.h @@ -134,15 +116,34 @@ ./gallery.o: ../../../../winix/winixd/core/basethread.h ./gallery.o: ../../../../winix/winixd/notify/templatesnotify.h ./gallery.o: ../../../../winix/winixd/core/users.h -./gallery.o: ../../../../winix/winixd/core/timezones.h -./gallery.o: ../../../../winix/winixd/core/timezone.h +./gallery.o: ../../../../winix/winixd/core/ugcontainer.h +./gallery.o: ../../../../winix/winixd/core/lastcontainer.h +./gallery.o: ../../../../winix/winixd/core/cur.h +./gallery.o: ../../../../winix/winixd/core/session.h +./gallery.o: ../../../../winix/winixd/core/rebus.h +./gallery.o: ../../../../winix/winixd/core/ipban.h ./gallery.o: ../../../../winix/winixd/core/winixrequest.h ./gallery.o: ../../../../winix/winixd/core/winixsystem.h +./gallery.o: ../../../../winix/winixd/core/system.h +./gallery.o: ../../../../winix/winixd/core/job.h +./gallery.o: ../../../../winix/winixd/core/basethread.h +./gallery.o: ../../../../winix/winixd/core/jobtask.h +./gallery.o: ../../../../winix/winixd/core/loadavg.h +./gallery.o: ../../../../winix/winixd/core/dirs.h +./gallery.o: ../../../../winix/winixd/core/dircontainer.h +./gallery.o: ../../../../winix/winixd/core/crypt.h +./gallery.o: ../../../../winix/winixd/core/run.h +./gallery.o: ../../../../winix/winixd/core/users.h +./gallery.o: ../../../../winix/winixd/core/groups.h +./gallery.o: ../../../../winix/winixd/core/image.h +./gallery.o: ../../../../winix/winixd/core/threadmanager.h +./gallery.o: ../../../../winix/winixd/models/winixmodelconnector.h +./gallery.o: ../../../../winix/winixd/core/timezones.h +./gallery.o: ../../../../winix/winixd/core/timezone.h ./gallery.o: ../../../../winix/winixd/core/cur.h ./gallery.o: ../../../../winix/winixd/core/sessionmanager.h ./gallery.o: ../../../../winix/winixd/core/sessioncontainer.h ./gallery.o: ../../../../winix/winixd/core/ipbancontainer.h -./gallery.o: ../../../../winix/winixd/core/system.h ./gallery.o: ../../../../winix/winixd/core/sessionidmanager.h ./gallery.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./gallery.o: ../../../../winix/winixd/core/slog.h galleryinfo.h @@ -315,33 +316,15 @@ ./init.o: ../../../../winix/winixd/core/textstream.h ./init.o: ../../../../winix/winixd/models/winixmodel.h ./init.o: ../../../../winix/winixd/core/header.h -./init.o: ../../../../winix/winixd/core/system.h -./init.o: ../../../../winix/winixd/core/job.h -./init.o: ../../../../winix/winixd/core/basethread.h -./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./init.o: ../../../../winix/winixd/core/compress.h ./init.o: ../../../../winix/winixd/core/plugin.h ./init.o: ../../../../winix/winixd/core/pluginmsg.h ./init.o: ../../../../winix/winixd/core/plugindata.h -./init.o: ../../../../winix/winixd/core/dirs.h -./init.o: ../../../../winix/winixd/core/dircontainer.h -./init.o: ../../../../winix/winixd/core/request.h -./init.o: ../../../../winix/winixd/core/mounts.h +./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./init.o: ../../../../winix/winixd/core/mount.h +./init.o: ../../../../winix/winixd/core/mounts.h +./init.o: ../../../../winix/winixd/core/request.h ./init.o: ../../../../winix/winixd/core/mountparser.h -./init.o: ../../../../winix/winixd/core/crypt.h -./init.o: ../../../../winix/winixd/core/run.h -./init.o: ../../../../winix/winixd/core/users.h -./init.o: ../../../../winix/winixd/core/ugcontainer.h -./init.o: ../../../../winix/winixd/core/lastcontainer.h -./init.o: ../../../../winix/winixd/core/cur.h -./init.o: ../../../../winix/winixd/core/session.h -./init.o: ../../../../winix/winixd/core/rebus.h -./init.o: ../../../../winix/winixd/core/ipban.h -./init.o: ../../../../winix/winixd/core/groups.h -./init.o: ../../../../winix/winixd/core/loadavg.h -./init.o: ../../../../winix/winixd/core/image.h -./init.o: ../../../../winix/winixd/core/threadmanager.h -./init.o: ../../../../winix/winixd/models/winixmodelconnector.h ./init.o: ../../../../winix/winixd/notify/notify.h ./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./init.o: ../../../../winix/winixd/notify/notifypool.h @@ -351,15 +334,34 @@ ./init.o: ../../../../winix/winixd/core/basethread.h ./init.o: ../../../../winix/winixd/notify/templatesnotify.h ./init.o: ../../../../winix/winixd/core/users.h -./init.o: ../../../../winix/winixd/core/timezones.h -./init.o: ../../../../winix/winixd/core/timezone.h +./init.o: ../../../../winix/winixd/core/ugcontainer.h +./init.o: ../../../../winix/winixd/core/lastcontainer.h +./init.o: ../../../../winix/winixd/core/cur.h +./init.o: ../../../../winix/winixd/core/session.h +./init.o: ../../../../winix/winixd/core/rebus.h +./init.o: ../../../../winix/winixd/core/ipban.h ./init.o: ../../../../winix/winixd/core/winixrequest.h ./init.o: ../../../../winix/winixd/core/winixsystem.h +./init.o: ../../../../winix/winixd/core/system.h +./init.o: ../../../../winix/winixd/core/job.h +./init.o: ../../../../winix/winixd/core/basethread.h +./init.o: ../../../../winix/winixd/core/jobtask.h +./init.o: ../../../../winix/winixd/core/loadavg.h +./init.o: ../../../../winix/winixd/core/dirs.h +./init.o: ../../../../winix/winixd/core/dircontainer.h +./init.o: ../../../../winix/winixd/core/crypt.h +./init.o: ../../../../winix/winixd/core/run.h +./init.o: ../../../../winix/winixd/core/users.h +./init.o: ../../../../winix/winixd/core/groups.h +./init.o: ../../../../winix/winixd/core/image.h +./init.o: ../../../../winix/winixd/core/threadmanager.h +./init.o: ../../../../winix/winixd/models/winixmodelconnector.h +./init.o: ../../../../winix/winixd/core/timezones.h +./init.o: ../../../../winix/winixd/core/timezone.h ./init.o: ../../../../winix/winixd/core/cur.h ./init.o: ../../../../winix/winixd/core/sessionmanager.h ./init.o: ../../../../winix/winixd/core/sessioncontainer.h ./init.o: ../../../../winix/winixd/core/ipbancontainer.h -./init.o: ../../../../winix/winixd/core/system.h ./init.o: ../../../../winix/winixd/core/sessionidmanager.h ./init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./init.o: ../../../../winix/winixd/core/slog.h galleryinfo.h @@ -367,6 +369,7 @@ ./init.o: ../../../../winix/winixd/functions/functions.h ./init.o: ../../../../winix/winixd/functions/functionbase.h ./init.o: ../../../../winix/winixd/functions/functionparser.h +./init.o: ../../../../winix/winixd/core/dirs.h ./init.o: ../../../../winix/winixd/functions/account.h ./init.o: ../../../../winix/winixd/functions/adduser.h ./init.o: ../../../../winix/winixd/functions/cat.h @@ -511,33 +514,15 @@ ./templates.o: ../../../../winix/winixd/core/textstream.h ./templates.o: ../../../../winix/winixd/models/winixmodel.h ./templates.o: ../../../../winix/winixd/core/header.h -./templates.o: ../../../../winix/winixd/core/system.h -./templates.o: ../../../../winix/winixd/core/job.h -./templates.o: ../../../../winix/winixd/core/basethread.h -./templates.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./templates.o: ../../../../winix/winixd/core/compress.h ./templates.o: ../../../../winix/winixd/core/plugin.h ./templates.o: ../../../../winix/winixd/core/pluginmsg.h ./templates.o: ../../../../winix/winixd/core/plugindata.h -./templates.o: ../../../../winix/winixd/core/dirs.h -./templates.o: ../../../../winix/winixd/core/dircontainer.h -./templates.o: ../../../../winix/winixd/core/request.h -./templates.o: ../../../../winix/winixd/core/mounts.h +./templates.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./templates.o: ../../../../winix/winixd/core/mount.h +./templates.o: ../../../../winix/winixd/core/mounts.h +./templates.o: ../../../../winix/winixd/core/request.h ./templates.o: ../../../../winix/winixd/core/mountparser.h -./templates.o: ../../../../winix/winixd/core/crypt.h -./templates.o: ../../../../winix/winixd/core/run.h -./templates.o: ../../../../winix/winixd/core/users.h -./templates.o: ../../../../winix/winixd/core/ugcontainer.h -./templates.o: ../../../../winix/winixd/core/lastcontainer.h -./templates.o: ../../../../winix/winixd/core/cur.h -./templates.o: ../../../../winix/winixd/core/session.h -./templates.o: ../../../../winix/winixd/core/rebus.h -./templates.o: ../../../../winix/winixd/core/ipban.h -./templates.o: ../../../../winix/winixd/core/groups.h -./templates.o: ../../../../winix/winixd/core/loadavg.h -./templates.o: ../../../../winix/winixd/core/image.h -./templates.o: ../../../../winix/winixd/core/threadmanager.h -./templates.o: ../../../../winix/winixd/models/winixmodelconnector.h ./templates.o: ../../../../winix/winixd/notify/notify.h ./templates.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./templates.o: ../../../../winix/winixd/notify/notifypool.h @@ -547,15 +532,34 @@ ./templates.o: ../../../../winix/winixd/core/basethread.h ./templates.o: ../../../../winix/winixd/notify/templatesnotify.h ./templates.o: ../../../../winix/winixd/core/users.h -./templates.o: ../../../../winix/winixd/core/timezones.h -./templates.o: ../../../../winix/winixd/core/timezone.h +./templates.o: ../../../../winix/winixd/core/ugcontainer.h +./templates.o: ../../../../winix/winixd/core/lastcontainer.h +./templates.o: ../../../../winix/winixd/core/cur.h +./templates.o: ../../../../winix/winixd/core/session.h +./templates.o: ../../../../winix/winixd/core/rebus.h +./templates.o: ../../../../winix/winixd/core/ipban.h ./templates.o: ../../../../winix/winixd/core/winixrequest.h ./templates.o: ../../../../winix/winixd/core/winixsystem.h +./templates.o: ../../../../winix/winixd/core/system.h +./templates.o: ../../../../winix/winixd/core/job.h +./templates.o: ../../../../winix/winixd/core/basethread.h +./templates.o: ../../../../winix/winixd/core/jobtask.h +./templates.o: ../../../../winix/winixd/core/loadavg.h +./templates.o: ../../../../winix/winixd/core/dirs.h +./templates.o: ../../../../winix/winixd/core/dircontainer.h +./templates.o: ../../../../winix/winixd/core/crypt.h +./templates.o: ../../../../winix/winixd/core/run.h +./templates.o: ../../../../winix/winixd/core/users.h +./templates.o: ../../../../winix/winixd/core/groups.h +./templates.o: ../../../../winix/winixd/core/image.h +./templates.o: ../../../../winix/winixd/core/threadmanager.h +./templates.o: ../../../../winix/winixd/models/winixmodelconnector.h +./templates.o: ../../../../winix/winixd/core/timezones.h +./templates.o: ../../../../winix/winixd/core/timezone.h ./templates.o: ../../../../winix/winixd/core/cur.h ./templates.o: ../../../../winix/winixd/core/sessionmanager.h ./templates.o: ../../../../winix/winixd/core/sessioncontainer.h ./templates.o: ../../../../winix/winixd/core/ipbancontainer.h -./templates.o: ../../../../winix/winixd/core/system.h ./templates.o: ../../../../winix/winixd/core/sessionidmanager.h ./templates.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./templates.o: ../../../../winix/winixd/core/slog.h galleryinfo.h @@ -570,6 +574,7 @@ ./templates.o: ../../../../winix/winixd/functions/functions.h ./templates.o: ../../../../winix/winixd/functions/functionbase.h ./templates.o: ../../../../winix/winixd/functions/functionparser.h +./templates.o: ../../../../winix/winixd/core/dirs.h ./templates.o: ../../../../winix/winixd/functions/account.h ./templates.o: ../../../../winix/winixd/functions/adduser.h ./templates.o: ../../../../winix/winixd/functions/cat.h diff --git a/winixd/plugins/group/Makefile.dep b/winixd/plugins/group/Makefile.dep index 70fc52a..e67b827 100644 --- a/winixd/plugins/group/Makefile.dep +++ b/winixd/plugins/group/Makefile.dep @@ -88,6 +88,10 @@ # ../../../../winix/winixd/core/job.h includes: # basethread.h # space/space.h +# jobtask.h +# cur.h +# loadavg.h +# mounts.h ./groupinfo.o: ../../../../winix/winixd/core/basethread.h # ../../../../winix/winixd/core/basethread.h includes: # synchro.h @@ -96,7 +100,6 @@ ./groupinfo.o: ../../../../winix/winixd/core/winixmodeldeprecated.h # ../../../../winix/winixd/core/winixmodeldeprecated.h includes: # core/winixbase.h -# plugin.h # morm.h ./groupinfo.o: ../../../../winix/winixd/core/winixbase.h # ../../../../winix/winixd/core/winixbase.h includes: @@ -269,26 +272,32 @@ ./groupinfo.o: ../../../../winix/winixd/core/lock.h # ../../../../winix/winixd/core/lock.h includes: # synchro.h -./groupinfo.o: ../../../../winix/winixd/core/plugin.h -# ../../../../winix/winixd/core/plugin.h includes: -# pluginmsg.h -# plugindata.h -# winixbase.h -# modelconnector.h -./groupinfo.o: ../../../../winix/winixd/core/pluginmsg.h -./groupinfo.o: ../../../../winix/winixd/core/plugindata.h -./groupinfo.o: ../../../../winix/winixd/core/winixbase.h -./groupinfo.o: ../../../../winix/winixd/core/dirs.h -# ../../../../winix/winixd/core/dirs.h includes: -# dircontainer.h -# db/db.h -# request.h -# models/item.h -# winixmodeldeprecated.h -./groupinfo.o: ../../../../winix/winixd/core/dircontainer.h -# ../../../../winix/winixd/core/dircontainer.h includes: -# winixbase.h +./groupinfo.o: ../../../../winix/winixd/core/jobtask.h +# ../../../../winix/winixd/core/jobtask.h includes: +# space/space.h +# core/request.h +./groupinfo.o: ../../../../winix/winixd/core/request.h +# ../../../../winix/winixd/core/request.h includes: +# requesttypes.h # models/item.h +# error.h +# config.h +# textstream.h +# templates/htmltextstream.h +# date/date.h +# space/space.h +# textstream/textstream.h +# outstreams.h +# models.h +# models/winixmodel.h +# header.h +# compress.h +# plugin.h +# mount.h +# mounts.h +./groupinfo.o: ../../../../winix/winixd/core/requesttypes.h +# ../../../../winix/winixd/core/requesttypes.h includes: +# textstream/textstream.h ./groupinfo.o: ../../../../winix/winixd/models/item.h # ../../../../winix/winixd/models/item.h includes: # winixmodel.h @@ -401,6 +410,43 @@ # utf8/utf8.h # log/log.h ./groupinfo.o: ../../../../winix/winixd/templates/htmltextstream.h +./groupinfo.o: ../../../../winix/winixd/core/error.h +./groupinfo.o: ../../../../winix/winixd/core/config.h +./groupinfo.o: ../../../../winix/winixd/core/textstream.h +# ../../../../winix/winixd/core/textstream.h includes: +# misc.h +# space/space.h +# date/date.h +# textstream/textstream.h +# utf8/utf8.h +./groupinfo.o: ../../../../winix/winixd/models/winixmodel.h +./groupinfo.o: ../../../../winix/winixd/core/header.h +# ../../../../winix/winixd/core/header.h includes: +# log.h +# textstream/textstream.h +./groupinfo.o: ../../../../winix/winixd/core/compress.h +# ../../../../winix/winixd/core/compress.h includes: +# requesttypes.h +# winixbase.h +./groupinfo.o: ../../../../winix/winixd/core/winixbase.h +./groupinfo.o: ../../../../winix/winixd/core/plugin.h +# ../../../../winix/winixd/core/plugin.h includes: +# pluginmsg.h +# plugindata.h +# winixmodeldeprecated.h +# modelconnector.h +# mount.h +./groupinfo.o: ../../../../winix/winixd/core/pluginmsg.h +./groupinfo.o: ../../../../winix/winixd/core/plugindata.h +./groupinfo.o: ../../../../winix/winixd/core/mount.h +./groupinfo.o: ../../../../winix/winixd/core/mounts.h +# ../../../../winix/winixd/core/mounts.h includes: +# mount.h +# error.h +# db/db.h +# request.h +# mountparser.h +# winixmodeldeprecated.h ./groupinfo.o: ../../../../winix/winixd/db/db.h # ../../../../winix/winixd/db/db.h includes: # dbbase.h @@ -425,12 +471,6 @@ # core/textstream.h # textstream/textstream.h ./groupinfo.o: ../../../../winix/winixd/core/textstream.h -# ../../../../winix/winixd/core/textstream.h includes: -# misc.h -# space/space.h -# date/date.h -# textstream/textstream.h -# utf8/utf8.h ./groupinfo.o: ../../../../winix/winixd/core/error.h ./groupinfo.o: ../../../../winix/winixd/models/user.h # ../../../../winix/winixd/models/user.h includes: @@ -443,73 +483,18 @@ # ../../../../winix/winixd/models/group.h includes: # model.h ./groupinfo.o: ../../../../winix/winixd/core/dircontainer.h +# ../../../../winix/winixd/core/dircontainer.h includes: +# winixbase.h +# models/item.h ./groupinfo.o: ../../../../winix/winixd/core/ugcontainer.h # ../../../../winix/winixd/core/ugcontainer.h includes: # winixbase.h ./groupinfo.o: ../../../../winix/winixd/core/request.h -# ../../../../winix/winixd/core/request.h includes: -# requesttypes.h -# models/item.h -# error.h -# config.h -# textstream.h -# templates/htmltextstream.h -# date/date.h -# space/space.h -# textstream/textstream.h -# outstreams.h -# models.h -# models/winixmodel.h -# header.h -./groupinfo.o: ../../../../winix/winixd/core/requesttypes.h -# ../../../../winix/winixd/core/requesttypes.h includes: -# textstream/textstream.h -./groupinfo.o: ../../../../winix/winixd/core/error.h -./groupinfo.o: ../../../../winix/winixd/core/config.h -./groupinfo.o: ../../../../winix/winixd/core/textstream.h -./groupinfo.o: ../../../../winix/winixd/models/winixmodel.h -./groupinfo.o: ../../../../winix/winixd/core/header.h -# ../../../../winix/winixd/core/header.h includes: -# log.h -# textstream/textstream.h -./groupinfo.o: ../../../../winix/winixd/core/mounts.h -# ../../../../winix/winixd/core/mounts.h includes: -# mount.h -# error.h -# dirs.h -# db/db.h -# request.h -# mountparser.h -# winixmodeldeprecated.h -./groupinfo.o: ../../../../winix/winixd/core/mount.h ./groupinfo.o: ../../../../winix/winixd/core/mountparser.h # ../../../../winix/winixd/core/mountparser.h includes: # mount.h -# dirs.h # models/item.h # winixmodeldeprecated.h -./groupinfo.o: ../../../../winix/winixd/core/crypt.h -# ../../../../winix/winixd/core/crypt.h includes: -# run.h -# config.h -# models/user.h -# winixbase.h -./groupinfo.o: ../../../../winix/winixd/core/run.h -# ../../../../winix/winixd/core/run.h includes: -# winixbase.h -./groupinfo.o: ../../../../winix/winixd/core/users.h -# ../../../../winix/winixd/core/users.h includes: -# models/user.h -# ugcontainer.h -# lastcontainer.h -# cur.h -# db/db.h -# models/winixmodel.h -./groupinfo.o: ../../../../winix/winixd/core/ugcontainer.h -./groupinfo.o: ../../../../winix/winixd/core/lastcontainer.h -# ../../../../winix/winixd/core/lastcontainer.h includes: -# date/date.h -# winixbase.h ./groupinfo.o: ../../../../winix/winixd/core/cur.h # ../../../../winix/winixd/core/cur.h includes: # request.h @@ -532,6 +517,36 @@ # ../../../../winix/winixd/core/loadavg.h includes: # winixbase.h # request.h +./groupinfo.o: ../../../../winix/winixd/core/dirs.h +# ../../../../winix/winixd/core/dirs.h includes: +# dircontainer.h +# db/db.h +# request.h +# models/item.h +# winixmodeldeprecated.h +./groupinfo.o: ../../../../winix/winixd/core/dircontainer.h +./groupinfo.o: ../../../../winix/winixd/core/crypt.h +# ../../../../winix/winixd/core/crypt.h includes: +# run.h +# config.h +# models/user.h +# winixbase.h +./groupinfo.o: ../../../../winix/winixd/core/run.h +# ../../../../winix/winixd/core/run.h includes: +# winixbase.h +./groupinfo.o: ../../../../winix/winixd/core/users.h +# ../../../../winix/winixd/core/users.h includes: +# models/user.h +# ugcontainer.h +# lastcontainer.h +# cur.h +# db/db.h +# models/winixmodel.h +./groupinfo.o: ../../../../winix/winixd/core/ugcontainer.h +./groupinfo.o: ../../../../winix/winixd/core/lastcontainer.h +# ../../../../winix/winixd/core/lastcontainer.h includes: +# date/date.h +# winixbase.h ./groupinfo.o: ../../../../winix/winixd/core/image.h # ../../../../winix/winixd/core/image.h includes: # basethread.h @@ -596,7 +611,6 @@ # config.h # request.h # lastcontainer.h -# system.h # synchro.h # basethread.h # sessionidmanager.h @@ -610,7 +624,6 @@ # ../../../../winix/winixd/core/ipbancontainer.h includes: # ipban.h # winixmodeldeprecated.h -./groupinfo.o: ../../../../winix/winixd/core/system.h ./groupinfo.o: ../../../../winix/winixd/core/sessionidmanager.h # ../../../../winix/winixd/core/sessionidmanager.h includes: # base64.h @@ -685,12 +698,9 @@ ./groups.o: ../../../../winix/winixd/core/synchro.h ./groups.o: ../../../../winix/winixd/core/filelog.h ./groups.o: ../../../../winix/winixd/core/lock.h -./groups.o: ../../../../winix/winixd/core/plugin.h -./groups.o: ../../../../winix/winixd/core/pluginmsg.h -./groups.o: ../../../../winix/winixd/core/plugindata.h -./groups.o: ../../../../winix/winixd/core/winixbase.h -./groups.o: ../../../../winix/winixd/core/dirs.h -./groups.o: ../../../../winix/winixd/core/dircontainer.h +./groups.o: ../../../../winix/winixd/core/jobtask.h +./groups.o: ../../../../winix/winixd/core/request.h +./groups.o: ../../../../winix/winixd/core/requesttypes.h ./groups.o: ../../../../winix/winixd/models/item.h ./groups.o: ../../../../winix/winixd/models/winixmodel.h ./groups.o: ../../../../winix/winixd/models/winixmodelconnector.h @@ -710,6 +720,18 @@ ./groups.o: ../../../../ezc/src/expressionparser.h ./groups.o: ../../../../ezc/src/models.h ../../../../ezc/src/patternparser.h ./groups.o: ../../../../winix/winixd/templates/htmltextstream.h +./groups.o: ../../../../winix/winixd/core/error.h +./groups.o: ../../../../winix/winixd/core/config.h +./groups.o: ../../../../winix/winixd/core/textstream.h +./groups.o: ../../../../winix/winixd/models/winixmodel.h +./groups.o: ../../../../winix/winixd/core/header.h +./groups.o: ../../../../winix/winixd/core/compress.h +./groups.o: ../../../../winix/winixd/core/winixbase.h +./groups.o: ../../../../winix/winixd/core/plugin.h +./groups.o: ../../../../winix/winixd/core/pluginmsg.h +./groups.o: ../../../../winix/winixd/core/plugindata.h +./groups.o: ../../../../winix/winixd/core/mount.h +./groups.o: ../../../../winix/winixd/core/mounts.h ./groups.o: ../../../../winix/winixd/db/db.h ./groups.o: ../../../../winix/winixd/db/dbbase.h ./groups.o: ../../../../winix/winixd/db/dbconn.h @@ -721,25 +743,19 @@ ./groups.o: ../../../../winix/winixd/core/dircontainer.h ./groups.o: ../../../../winix/winixd/core/ugcontainer.h ./groups.o: ../../../../winix/winixd/core/request.h -./groups.o: ../../../../winix/winixd/core/requesttypes.h -./groups.o: ../../../../winix/winixd/core/error.h -./groups.o: ../../../../winix/winixd/core/config.h -./groups.o: ../../../../winix/winixd/core/textstream.h -./groups.o: ../../../../winix/winixd/models/winixmodel.h -./groups.o: ../../../../winix/winixd/core/header.h -./groups.o: ../../../../winix/winixd/core/mounts.h -./groups.o: ../../../../winix/winixd/core/mount.h ./groups.o: ../../../../winix/winixd/core/mountparser.h -./groups.o: ../../../../winix/winixd/core/crypt.h -./groups.o: ../../../../winix/winixd/core/run.h -./groups.o: ../../../../winix/winixd/core/users.h -./groups.o: ../../../../winix/winixd/core/ugcontainer.h -./groups.o: ../../../../winix/winixd/core/lastcontainer.h ./groups.o: ../../../../winix/winixd/core/cur.h ./groups.o: ../../../../winix/winixd/core/session.h ./groups.o: ../../../../winix/winixd/core/rebus.h ./groups.o: ../../../../winix/winixd/core/ipban.h ./groups.o: ../../../../winix/winixd/core/loadavg.h +./groups.o: ../../../../winix/winixd/core/dirs.h +./groups.o: ../../../../winix/winixd/core/dircontainer.h +./groups.o: ../../../../winix/winixd/core/crypt.h +./groups.o: ../../../../winix/winixd/core/run.h +./groups.o: ../../../../winix/winixd/core/users.h +./groups.o: ../../../../winix/winixd/core/ugcontainer.h +./groups.o: ../../../../winix/winixd/core/lastcontainer.h ./groups.o: ../../../../winix/winixd/core/image.h ./groups.o: ../../../../winix/winixd/core/threadmanager.h ./groups.o: ../../../../winix/winixd/models/winixmodelconnector.h @@ -758,7 +774,6 @@ ./groups.o: ../../../../winix/winixd/core/sessionmanager.h ./groups.o: ../../../../winix/winixd/core/sessioncontainer.h ./groups.o: ../../../../winix/winixd/core/ipbancontainer.h -./groups.o: ../../../../winix/winixd/core/system.h ./groups.o: ../../../../winix/winixd/core/sessionidmanager.h ./groups.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./groups.o: ../../../../winix/winixd/core/slog.h @@ -767,47 +782,40 @@ # ../../../../winix/winixd/core/plugin.h includes: # pluginmsg.h # plugindata.h -# winixbase.h +# winixmodeldeprecated.h # modelconnector.h +# mount.h ./init.o: ../../../../winix/winixd/core/pluginmsg.h ./init.o: ../../../../winix/winixd/core/plugindata.h +./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./init.o: ../../../../winix/winixd/core/winixbase.h -./init.o: ../../../../morm/src/modelconnector.h -./init.o: ../../../../morm/src/clearer.h -./init.o: ../../../../pikotools/src/date/date.h -./init.o: ../../../../pikotools/src/convert/inttostr.h -./init.o: ../../../../pikotools/src/space/space.h ../../../../morm/src/ft.h -./init.o: ../../../../morm/src/dbconnector.h -./init.o: ../../../../pikotools/src/textstream/textstream.h -./init.o: ../../../../pikotools/src/textstream/stream.h -./init.o: ../../../../pikotools/src/membuffer/membuffer.h +./init.o: ../../../../winix/winixd/core/config.h +./init.o: ../../../../pikotools/src/space/spaceparser.h +./init.o: ../../../../pikotools/src/space/space.h ./init.o: ../../../../pikotools/src/textstream/types.h +./init.o: ../../../../pikotools/src/convert/inttostr.h ./init.o: ../../../../pikotools/src/utf8/utf8.h ./init.o: ../../../../pikotools/src/textstream/stream.h ./init.o: ../../../../pikotools/src/utf8/utf8_templates.h ./init.o: ../../../../pikotools/src/utf8/utf8_private.h -./init.o: ../../../../pikotools/src/utf8/utf8_stream.h -./init.o: ../../../../pikotools/src/log/log.h -./init.o: ../../../../pikotools/src/log/filelog.h -./init.o: ../../../../morm/src/queryresult.h -./init.o: ../../../../morm/src/flatconnector.h groupinfo.h groups.h -./init.o: ../../../../pikotools/src/space/spaceparser.h -./init.o: ../../../../pikotools/src/space/space.h -./init.o: ../../../../pikotools/src/textstream/types.h ./init.o: ../../../../pikotools/src/convert/baseparser.h -./init.o: ../../../../winix/winixd/core/winixrequest.h -./init.o: ../../../../winix/winixd/core/winixsystem.h -./init.o: ../../../../winix/winixd/core/system.h -./init.o: ../../../../winix/winixd/core/job.h -./init.o: ../../../../winix/winixd/core/basethread.h -./init.o: ../../../../winix/winixd/core/synchro.h -./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h -./init.o: ../../../../winix/winixd/core/winixbase.h -./init.o: ../../../../winix/winixd/core/config.h +./init.o: ../../../../pikotools/src/textstream/textstream.h +./init.o: ../../../../pikotools/src/textstream/stream.h +./init.o: ../../../../pikotools/src/space/space.h +./init.o: ../../../../pikotools/src/date/date.h +./init.o: ../../../../pikotools/src/membuffer/membuffer.h +./init.o: ../../../../pikotools/src/textstream/types.h +./init.o: ../../../../pikotools/src/utf8/utf8_stream.h ./init.o: ../../../../winix/winixd/core/log.h ./init.o: ../../../../winix/winixd/core/logmanipulators.h -./init.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h -./init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h +./init.o: ../../../../pikotools/src/log/log.h +./init.o: ../../../../pikotools/src/log/filelog.h ../../../../morm/src/morm.h +./init.o: ../../../../morm/src/version.h ../../../../morm/src/morm_types.h +./init.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h +./init.o: ../../../../morm/src/clearer.h ../../../../morm/src/ft.h +./init.o: ../../../../morm/src/dbconnector.h +./init.o: ../../../../morm/src/queryresult.h +./init.o: ../../../../morm/src/flatconnector.h ./init.o: ../../../../morm/src/dbexpression.h ./init.o: ../../../../morm/src/baseexpression.h ./init.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h @@ -829,9 +837,16 @@ ./init.o: ../../../../winix/winixd/core/synchro.h ./init.o: ../../../../winix/winixd/core/filelog.h ./init.o: ../../../../winix/winixd/core/lock.h -./init.o: ../../../../winix/winixd/core/plugin.h -./init.o: ../../../../winix/winixd/core/dirs.h -./init.o: ../../../../winix/winixd/core/dircontainer.h +./init.o: ../../../../winix/winixd/core/synchro.h +./init.o: ../../../../winix/winixd/core/mount.h groupinfo.h groups.h +./init.o: ../../../../winix/winixd/core/winixrequest.h +./init.o: ../../../../winix/winixd/core/winixsystem.h +./init.o: ../../../../winix/winixd/core/system.h +./init.o: ../../../../winix/winixd/core/job.h +./init.o: ../../../../winix/winixd/core/basethread.h +./init.o: ../../../../winix/winixd/core/jobtask.h +./init.o: ../../../../winix/winixd/core/request.h +./init.o: ../../../../winix/winixd/core/requesttypes.h ./init.o: ../../../../winix/winixd/models/item.h ./init.o: ../../../../winix/winixd/models/winixmodel.h ./init.o: ../../../../winix/winixd/models/winixmodelconnector.h @@ -851,6 +866,15 @@ ./init.o: ../../../../ezc/src/expressionparser.h ../../../../ezc/src/models.h ./init.o: ../../../../ezc/src/patternparser.h ./init.o: ../../../../winix/winixd/templates/htmltextstream.h +./init.o: ../../../../winix/winixd/core/error.h +./init.o: ../../../../winix/winixd/core/config.h +./init.o: ../../../../winix/winixd/core/textstream.h +./init.o: ../../../../winix/winixd/models/winixmodel.h +./init.o: ../../../../winix/winixd/core/header.h +./init.o: ../../../../winix/winixd/core/compress.h +./init.o: ../../../../winix/winixd/core/winixbase.h +./init.o: ../../../../winix/winixd/core/plugin.h +./init.o: ../../../../winix/winixd/core/mounts.h ./init.o: ../../../../winix/winixd/db/db.h ./init.o: ../../../../winix/winixd/db/dbbase.h ./init.o: ../../../../winix/winixd/db/dbconn.h @@ -862,25 +886,19 @@ ./init.o: ../../../../winix/winixd/core/dircontainer.h ./init.o: ../../../../winix/winixd/core/ugcontainer.h ./init.o: ../../../../winix/winixd/core/request.h -./init.o: ../../../../winix/winixd/core/requesttypes.h -./init.o: ../../../../winix/winixd/core/error.h -./init.o: ../../../../winix/winixd/core/config.h -./init.o: ../../../../winix/winixd/core/textstream.h -./init.o: ../../../../winix/winixd/models/winixmodel.h -./init.o: ../../../../winix/winixd/core/header.h -./init.o: ../../../../winix/winixd/core/mounts.h -./init.o: ../../../../winix/winixd/core/mount.h ./init.o: ../../../../winix/winixd/core/mountparser.h -./init.o: ../../../../winix/winixd/core/crypt.h -./init.o: ../../../../winix/winixd/core/run.h -./init.o: ../../../../winix/winixd/core/users.h -./init.o: ../../../../winix/winixd/core/ugcontainer.h -./init.o: ../../../../winix/winixd/core/lastcontainer.h ./init.o: ../../../../winix/winixd/core/cur.h ./init.o: ../../../../winix/winixd/core/session.h ./init.o: ../../../../winix/winixd/core/rebus.h ./init.o: ../../../../winix/winixd/core/ipban.h ./init.o: ../../../../winix/winixd/core/loadavg.h +./init.o: ../../../../winix/winixd/core/dirs.h +./init.o: ../../../../winix/winixd/core/dircontainer.h +./init.o: ../../../../winix/winixd/core/crypt.h +./init.o: ../../../../winix/winixd/core/run.h +./init.o: ../../../../winix/winixd/core/users.h +./init.o: ../../../../winix/winixd/core/ugcontainer.h +./init.o: ../../../../winix/winixd/core/lastcontainer.h ./init.o: ../../../../winix/winixd/core/image.h ./init.o: ../../../../winix/winixd/core/threadmanager.h ./init.o: ../../../../winix/winixd/models/winixmodelconnector.h @@ -899,7 +917,6 @@ ./init.o: ../../../../winix/winixd/core/sessionmanager.h ./init.o: ../../../../winix/winixd/core/sessioncontainer.h ./init.o: ../../../../winix/winixd/core/ipbancontainer.h -./init.o: ../../../../winix/winixd/core/system.h ./init.o: ../../../../winix/winixd/core/sessionidmanager.h ./init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./init.o: ../../../../winix/winixd/core/slog.h @@ -959,18 +976,17 @@ # db/db.h # core/request.h # core/config.h -# core/system.h # core/synchro.h # notify/notify.h # core/winixrequest.h # models/item.h -./init.o: ../../../../winix/winixd/core/request.h ./init.o: ../../../../winix/winixd/functions/functionparser.h # ../../../../winix/winixd/functions/functionparser.h includes: # core/winixmodeldeprecated.h # db/db.h # core/cur.h -# core/system.h +# core/dirs.h +./init.o: ../../../../winix/winixd/core/dirs.h ./init.o: ../../../../winix/winixd/functions/account.h # ../../../../winix/winixd/functions/account.h includes: # functionbase.h @@ -1236,12 +1252,21 @@ ./templates.o: ../../../../winix/winixd/core/job.h ./templates.o: ../../../../winix/winixd/core/basethread.h ./templates.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./templates.o: ../../../../winix/winixd/core/jobtask.h +./templates.o: ../../../../winix/winixd/core/request.h +./templates.o: ../../../../winix/winixd/core/requesttypes.h +./templates.o: ../../../../winix/winixd/core/error.h +./templates.o: ../../../../winix/winixd/core/config.h +./templates.o: ../../../../winix/winixd/core/textstream.h +./templates.o: ../../../../winix/winixd/models/winixmodel.h +./templates.o: ../../../../winix/winixd/core/header.h +./templates.o: ../../../../winix/winixd/core/compress.h +./templates.o: ../../../../winix/winixd/core/winixbase.h ./templates.o: ../../../../winix/winixd/core/plugin.h ./templates.o: ../../../../winix/winixd/core/pluginmsg.h ./templates.o: ../../../../winix/winixd/core/plugindata.h -./templates.o: ../../../../winix/winixd/core/winixbase.h -./templates.o: ../../../../winix/winixd/core/dirs.h -./templates.o: ../../../../winix/winixd/core/dircontainer.h +./templates.o: ../../../../winix/winixd/core/mount.h +./templates.o: ../../../../winix/winixd/core/mounts.h ./templates.o: ../../../../winix/winixd/db/db.h ./templates.o: ../../../../winix/winixd/db/dbbase.h ./templates.o: ../../../../winix/winixd/db/dbconn.h @@ -1253,35 +1278,28 @@ ./templates.o: ../../../../winix/winixd/core/dircontainer.h ./templates.o: ../../../../winix/winixd/core/ugcontainer.h ./templates.o: ../../../../winix/winixd/core/request.h -./templates.o: ../../../../winix/winixd/core/requesttypes.h -./templates.o: ../../../../winix/winixd/core/error.h -./templates.o: ../../../../winix/winixd/core/config.h -./templates.o: ../../../../winix/winixd/core/textstream.h -./templates.o: ../../../../winix/winixd/models/winixmodel.h -./templates.o: ../../../../winix/winixd/core/header.h -./templates.o: ../../../../winix/winixd/core/mounts.h -./templates.o: ../../../../winix/winixd/core/mount.h ./templates.o: ../../../../winix/winixd/core/mountparser.h +./templates.o: ../../../../winix/winixd/core/cur.h +./templates.o: ../../../../winix/winixd/core/session.h +./templates.o: ../../../../winix/winixd/core/rebus.h +./templates.o: ../../../../winix/winixd/core/ipban.h +./templates.o: ../../../../winix/winixd/core/loadavg.h +./templates.o: ../../../../winix/winixd/core/dirs.h +./templates.o: ../../../../winix/winixd/core/dircontainer.h ./templates.o: ../../../../winix/winixd/core/crypt.h ./templates.o: ../../../../winix/winixd/core/run.h ./templates.o: ../../../../winix/winixd/core/users.h ./templates.o: ../../../../winix/winixd/core/ugcontainer.h -./templates.o: ../../../../winix/winixd/core/lastcontainer.h -./templates.o: ../../../../winix/winixd/core/cur.h -./templates.o: ../../../../winix/winixd/core/session.h -./templates.o: ../../../../winix/winixd/core/rebus.h -./templates.o: ../../../../winix/winixd/core/ipban.h groups.h +./templates.o: ../../../../winix/winixd/core/lastcontainer.h groups.h ./templates.o: ../../../../winix/winixd/core/winixrequest.h ./templates.o: ../../../../winix/winixd/core/winixsystem.h ./templates.o: ../../../../winix/winixd/core/sessionmanager.h ./templates.o: ../../../../winix/winixd/core/sessioncontainer.h ./templates.o: ../../../../winix/winixd/core/ipbancontainer.h -./templates.o: ../../../../winix/winixd/core/system.h ./templates.o: ../../../../winix/winixd/core/sessionidmanager.h ./templates.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./templates.o: ../../../../winix/winixd/core/slog.h ./templates.o: ../../../../winix/winixd/templates/locale.h -./templates.o: ../../../../winix/winixd/core/loadavg.h ./templates.o: ../../../../winix/winixd/core/image.h ./templates.o: ../../../../winix/winixd/core/threadmanager.h ./templates.o: ../../../../winix/winixd/models/winixmodelconnector.h diff --git a/winixd/plugins/group/init.cpp b/winixd/plugins/group/init.cpp index 23bdbd7..8293365 100644 --- a/winixd/plugins/group/init.cpp +++ b/winixd/plugins/group/init.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2018, Tomasz Sowa + * Copyright (c) 2011-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -97,7 +97,7 @@ using namespace GroupItem; info.plugin->Assign(WINIX_FSTAB_CHANGED, FstabChanged); info.plugin->Assign(WINIX_PROCESS_REQUEST, ProcessRequest); - info.set_dependency_for(group_info); + group_info.set_dependency((WinixModelDeprecated*)info.functions); group_info.SetSystem(info.system); group_info.SetConfig(info.config); diff --git a/winixd/plugins/mailregister/Makefile.dep b/winixd/plugins/mailregister/Makefile.dep index d9d84f4..13eb2d8 100644 --- a/winixd/plugins/mailregister/Makefile.dep +++ b/winixd/plugins/mailregister/Makefile.dep @@ -107,33 +107,15 @@ ./funregistermail.o: ../../../../winix/winixd/core/textstream.h ./funregistermail.o: ../../../../winix/winixd/models/winixmodel.h ./funregistermail.o: ../../../../winix/winixd/core/header.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/winixmodeldeprecated.h +./funregistermail.o: ../../../../winix/winixd/core/compress.h ./funregistermail.o: ../../../../winix/winixd/core/plugin.h ./funregistermail.o: ../../../../winix/winixd/core/pluginmsg.h ./funregistermail.o: ../../../../winix/winixd/core/plugindata.h -./funregistermail.o: ../../../../winix/winixd/core/dirs.h -./funregistermail.o: ../../../../winix/winixd/core/dircontainer.h -./funregistermail.o: ../../../../winix/winixd/core/request.h -./funregistermail.o: ../../../../winix/winixd/core/mounts.h +./funregistermail.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./funregistermail.o: ../../../../winix/winixd/core/mount.h +./funregistermail.o: ../../../../winix/winixd/core/mounts.h +./funregistermail.o: ../../../../winix/winixd/core/request.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/ugcontainer.h -./funregistermail.o: ../../../../winix/winixd/core/lastcontainer.h -./funregistermail.o: ../../../../winix/winixd/core/cur.h -./funregistermail.o: ../../../../winix/winixd/core/session.h -./funregistermail.o: ../../../../winix/winixd/core/rebus.h -./funregistermail.o: ../../../../winix/winixd/core/ipban.h -./funregistermail.o: ../../../../winix/winixd/core/groups.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/models/winixmodelconnector.h ./funregistermail.o: ../../../../winix/winixd/notify/notify.h ./funregistermail.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./funregistermail.o: ../../../../winix/winixd/notify/notifypool.h @@ -143,15 +125,34 @@ ./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/timezones.h -./funregistermail.o: ../../../../winix/winixd/core/timezone.h +./funregistermail.o: ../../../../winix/winixd/core/ugcontainer.h +./funregistermail.o: ../../../../winix/winixd/core/lastcontainer.h +./funregistermail.o: ../../../../winix/winixd/core/cur.h +./funregistermail.o: ../../../../winix/winixd/core/session.h +./funregistermail.o: ../../../../winix/winixd/core/rebus.h +./funregistermail.o: ../../../../winix/winixd/core/ipban.h ./funregistermail.o: ../../../../winix/winixd/core/winixrequest.h ./funregistermail.o: ../../../../winix/winixd/core/winixsystem.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/jobtask.h +./funregistermail.o: ../../../../winix/winixd/core/loadavg.h +./funregistermail.o: ../../../../winix/winixd/core/dirs.h +./funregistermail.o: ../../../../winix/winixd/core/dircontainer.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/image.h +./funregistermail.o: ../../../../winix/winixd/core/threadmanager.h +./funregistermail.o: ../../../../winix/winixd/models/winixmodelconnector.h +./funregistermail.o: ../../../../winix/winixd/core/timezones.h +./funregistermail.o: ../../../../winix/winixd/core/timezone.h ./funregistermail.o: ../../../../winix/winixd/core/cur.h ./funregistermail.o: ../../../../winix/winixd/core/sessionmanager.h ./funregistermail.o: ../../../../winix/winixd/core/sessioncontainer.h ./funregistermail.o: ../../../../winix/winixd/core/ipbancontainer.h -./funregistermail.o: ../../../../winix/winixd/core/system.h ./funregistermail.o: ../../../../winix/winixd/core/sessionidmanager.h ./funregistermail.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./funregistermail.o: ../../../../winix/winixd/core/slog.h registermail_info.h @@ -267,33 +268,15 @@ ./funregistermail_showusers.o: ../../../../winix/winixd/core/textstream.h ./funregistermail_showusers.o: ../../../../winix/winixd/models/winixmodel.h ./funregistermail_showusers.o: ../../../../winix/winixd/core/header.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/system.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/job.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/basethread.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/compress.h ./funregistermail_showusers.o: ../../../../winix/winixd/core/plugin.h ./funregistermail_showusers.o: ../../../../winix/winixd/core/pluginmsg.h ./funregistermail_showusers.o: ../../../../winix/winixd/core/plugindata.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/dirs.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/dircontainer.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/request.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/mounts.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./funregistermail_showusers.o: ../../../../winix/winixd/core/mount.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/mounts.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/request.h ./funregistermail_showusers.o: ../../../../winix/winixd/core/mountparser.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/crypt.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/run.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/users.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/ugcontainer.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/lastcontainer.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/cur.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/session.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/rebus.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/ipban.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/groups.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/loadavg.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/image.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/threadmanager.h -./funregistermail_showusers.o: ../../../../winix/winixd/models/winixmodelconnector.h ./funregistermail_showusers.o: ../../../../winix/winixd/notify/notify.h ./funregistermail_showusers.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./funregistermail_showusers.o: ../../../../winix/winixd/notify/notifypool.h @@ -303,15 +286,34 @@ ./funregistermail_showusers.o: ../../../../winix/winixd/core/basethread.h ./funregistermail_showusers.o: ../../../../winix/winixd/notify/templatesnotify.h ./funregistermail_showusers.o: ../../../../winix/winixd/core/users.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/timezones.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/timezone.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/ugcontainer.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/lastcontainer.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/cur.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/session.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/rebus.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/ipban.h ./funregistermail_showusers.o: ../../../../winix/winixd/core/winixrequest.h ./funregistermail_showusers.o: ../../../../winix/winixd/core/winixsystem.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/system.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/job.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/basethread.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/jobtask.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/loadavg.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/dirs.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/dircontainer.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/crypt.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/run.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/users.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/groups.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/image.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/threadmanager.h +./funregistermail_showusers.o: ../../../../winix/winixd/models/winixmodelconnector.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/timezones.h +./funregistermail_showusers.o: ../../../../winix/winixd/core/timezone.h ./funregistermail_showusers.o: ../../../../winix/winixd/core/cur.h ./funregistermail_showusers.o: ../../../../winix/winixd/core/sessionmanager.h ./funregistermail_showusers.o: ../../../../winix/winixd/core/sessioncontainer.h ./funregistermail_showusers.o: ../../../../winix/winixd/core/ipbancontainer.h -./funregistermail_showusers.o: ../../../../winix/winixd/core/system.h ./funregistermail_showusers.o: ../../../../winix/winixd/core/sessionidmanager.h ./funregistermail_showusers.o: ../../../../tito/src/base64.h ./funregistermail_showusers.o: ../../../../tito/src/aes.h @@ -323,53 +325,35 @@ ./init.o: ../../../../winix/winixd/core/plugin.h ./init.o: ../../../../winix/winixd/core/pluginmsg.h ./init.o: ../../../../winix/winixd/core/plugindata.h -./init.o: ../../../../winix/winixd/core/winixbase.h -./init.o: ../../../../morm/src/modelconnector.h -./init.o: ../../../../morm/src/clearer.h -./init.o: ../../../../pikotools/src/date/date.h -./init.o: ../../../../pikotools/src/convert/inttostr.h -./init.o: ../../../../pikotools/src/space/space.h -./init.o: ../../../../pikotools/src/textstream/types.h -./init.o: ../../../../pikotools/src/utf8/utf8.h -./init.o: ../../../../pikotools/src/textstream/stream.h -./init.o: ../../../../pikotools/src/utf8/utf8_templates.h -./init.o: ../../../../pikotools/src/utf8/utf8_private.h -./init.o: ../../../../morm/src/ft.h ../../../../morm/src/dbconnector.h -./init.o: ../../../../pikotools/src/textstream/textstream.h -./init.o: ../../../../pikotools/src/textstream/stream.h -./init.o: ../../../../pikotools/src/membuffer/membuffer.h -./init.o: ../../../../pikotools/src/textstream/types.h -./init.o: ../../../../pikotools/src/utf8/utf8_stream.h -./init.o: ../../../../pikotools/src/log/log.h -./init.o: ../../../../pikotools/src/log/filelog.h -./init.o: ../../../../morm/src/queryresult.h -./init.o: ../../../../morm/src/flatconnector.h mdb.h -./init.o: ../../../../winix/winixd/db/dbbase.h -./init.o: ../../../../winix/winixd/core/dirs.h funregistermail.h -./init.o: ../../../../winix/winixd/functions/functionbase.h -./init.o: ../../../../winix/winixd/db/db.h -./init.o: ../../../../winix/winixd/db/dbbase.h -./init.o: ../../../../winix/winixd/db/dbconn.h -./init.o: ../../../../winix/winixd/db/dbtextstream.h -./init.o: ../../../../winix/winixd/core/textstream.h -./init.o: ../../../../winix/winixd/core/misc.h -./init.o: ../../../../winix/winixd/core/requesttypes.h -./init.o: ../../../../winix/winixd/core/winix_const.h -./init.o: ../../../../pikotools/src/convert/convert.h -./init.o: ../../../../pikotools/src/convert/inttostr.h -./init.o: ../../../../pikotools/src/convert/patternreplacer.h -./init.o: ../../../../pikotools/src/convert/strtoint.h -./init.o: ../../../../pikotools/src/convert/text.h -./init.o: ../../../../pikotools/src/convert/double.h +./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./init.o: ../../../../winix/winixd/core/winixbase.h ./init.o: ../../../../winix/winixd/core/config.h ./init.o: ../../../../pikotools/src/space/spaceparser.h ./init.o: ../../../../pikotools/src/space/space.h ./init.o: ../../../../pikotools/src/convert/baseparser.h +./init.o: ../../../../pikotools/src/textstream/textstream.h +./init.o: ../../../../pikotools/src/textstream/stream.h +./init.o: ../../../../pikotools/src/space/space.h +./init.o: ../../../../pikotools/src/textstream/types.h +./init.o: ../../../../pikotools/src/convert/inttostr.h +./init.o: ../../../../pikotools/src/utf8/utf8.h +./init.o: ../../../../pikotools/src/textstream/stream.h +./init.o: ../../../../pikotools/src/utf8/utf8_templates.h +./init.o: ../../../../pikotools/src/utf8/utf8_private.h +./init.o: ../../../../pikotools/src/date/date.h +./init.o: ../../../../pikotools/src/membuffer/membuffer.h +./init.o: ../../../../pikotools/src/textstream/types.h +./init.o: ../../../../pikotools/src/utf8/utf8_stream.h ./init.o: ../../../../winix/winixd/core/log.h ./init.o: ../../../../winix/winixd/core/logmanipulators.h -./init.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h -./init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h +./init.o: ../../../../pikotools/src/log/log.h +./init.o: ../../../../pikotools/src/log/filelog.h ../../../../morm/src/morm.h +./init.o: ../../../../morm/src/version.h ../../../../morm/src/morm_types.h +./init.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h +./init.o: ../../../../morm/src/clearer.h ../../../../morm/src/ft.h +./init.o: ../../../../morm/src/dbconnector.h +./init.o: ../../../../morm/src/queryresult.h +./init.o: ../../../../morm/src/flatconnector.h ./init.o: ../../../../morm/src/dbexpression.h ./init.o: ../../../../morm/src/baseexpression.h ./init.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h @@ -392,6 +376,24 @@ ./init.o: ../../../../winix/winixd/core/filelog.h ./init.o: ../../../../winix/winixd/core/lock.h ./init.o: ../../../../winix/winixd/core/synchro.h +./init.o: ../../../../winix/winixd/core/mount.h mdb.h +./init.o: ../../../../winix/winixd/db/dbbase.h +./init.o: ../../../../winix/winixd/core/dirs.h funregistermail.h +./init.o: ../../../../winix/winixd/functions/functionbase.h +./init.o: ../../../../winix/winixd/db/db.h +./init.o: ../../../../winix/winixd/db/dbbase.h +./init.o: ../../../../winix/winixd/db/dbconn.h +./init.o: ../../../../winix/winixd/db/dbtextstream.h +./init.o: ../../../../winix/winixd/core/textstream.h +./init.o: ../../../../winix/winixd/core/misc.h +./init.o: ../../../../winix/winixd/core/requesttypes.h +./init.o: ../../../../winix/winixd/core/winix_const.h +./init.o: ../../../../pikotools/src/convert/convert.h +./init.o: ../../../../pikotools/src/convert/inttostr.h +./init.o: ../../../../pikotools/src/convert/patternreplacer.h +./init.o: ../../../../pikotools/src/convert/strtoint.h +./init.o: ../../../../pikotools/src/convert/text.h +./init.o: ../../../../pikotools/src/convert/double.h ./init.o: ../../../../winix/winixd/core/error.h ./init.o: ../../../../winix/winixd/models/user.h ./init.o: ../../../../winix/winixd/templates/misc.h @@ -409,6 +411,7 @@ ./init.o: ../../../../winix/winixd/models/winixmodelconnector.h ./init.o: ../../../../winix/winixd/models/group.h ./init.o: ../../../../winix/winixd/core/dircontainer.h +./init.o: ../../../../winix/winixd/core/winixbase.h ./init.o: ../../../../winix/winixd/models/item.h ./init.o: ../../../../winix/winixd/models/itemcontent.h ./init.o: ../../../../winix/winixd/templates/htmltextstream.h @@ -419,31 +422,11 @@ ./init.o: ../../../../winix/winixd/core/textstream.h ./init.o: ../../../../winix/winixd/models/winixmodel.h ./init.o: ../../../../winix/winixd/core/header.h -./init.o: ../../../../winix/winixd/core/system.h -./init.o: ../../../../winix/winixd/core/job.h -./init.o: ../../../../winix/winixd/core/basethread.h -./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./init.o: ../../../../winix/winixd/core/compress.h ./init.o: ../../../../winix/winixd/core/plugin.h -./init.o: ../../../../winix/winixd/core/dirs.h -./init.o: ../../../../winix/winixd/core/dircontainer.h -./init.o: ../../../../winix/winixd/core/request.h ./init.o: ../../../../winix/winixd/core/mounts.h -./init.o: ../../../../winix/winixd/core/mount.h +./init.o: ../../../../winix/winixd/core/request.h ./init.o: ../../../../winix/winixd/core/mountparser.h -./init.o: ../../../../winix/winixd/core/crypt.h -./init.o: ../../../../winix/winixd/core/run.h -./init.o: ../../../../winix/winixd/core/users.h -./init.o: ../../../../winix/winixd/core/ugcontainer.h -./init.o: ../../../../winix/winixd/core/lastcontainer.h -./init.o: ../../../../winix/winixd/core/cur.h -./init.o: ../../../../winix/winixd/core/session.h -./init.o: ../../../../winix/winixd/core/rebus.h -./init.o: ../../../../winix/winixd/core/ipban.h -./init.o: ../../../../winix/winixd/core/groups.h -./init.o: ../../../../winix/winixd/core/loadavg.h -./init.o: ../../../../winix/winixd/core/image.h -./init.o: ../../../../winix/winixd/core/threadmanager.h -./init.o: ../../../../winix/winixd/models/winixmodelconnector.h ./init.o: ../../../../winix/winixd/notify/notify.h ./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./init.o: ../../../../winix/winixd/notify/notifypool.h @@ -453,15 +436,34 @@ ./init.o: ../../../../winix/winixd/core/basethread.h ./init.o: ../../../../winix/winixd/notify/templatesnotify.h ./init.o: ../../../../winix/winixd/core/users.h -./init.o: ../../../../winix/winixd/core/timezones.h -./init.o: ../../../../winix/winixd/core/timezone.h +./init.o: ../../../../winix/winixd/core/ugcontainer.h +./init.o: ../../../../winix/winixd/core/lastcontainer.h +./init.o: ../../../../winix/winixd/core/cur.h +./init.o: ../../../../winix/winixd/core/session.h +./init.o: ../../../../winix/winixd/core/rebus.h +./init.o: ../../../../winix/winixd/core/ipban.h ./init.o: ../../../../winix/winixd/core/winixrequest.h ./init.o: ../../../../winix/winixd/core/winixsystem.h +./init.o: ../../../../winix/winixd/core/system.h +./init.o: ../../../../winix/winixd/core/job.h +./init.o: ../../../../winix/winixd/core/basethread.h +./init.o: ../../../../winix/winixd/core/jobtask.h +./init.o: ../../../../winix/winixd/core/loadavg.h +./init.o: ../../../../winix/winixd/core/dirs.h +./init.o: ../../../../winix/winixd/core/dircontainer.h +./init.o: ../../../../winix/winixd/core/crypt.h +./init.o: ../../../../winix/winixd/core/run.h +./init.o: ../../../../winix/winixd/core/users.h +./init.o: ../../../../winix/winixd/core/groups.h +./init.o: ../../../../winix/winixd/core/image.h +./init.o: ../../../../winix/winixd/core/threadmanager.h +./init.o: ../../../../winix/winixd/models/winixmodelconnector.h +./init.o: ../../../../winix/winixd/core/timezones.h +./init.o: ../../../../winix/winixd/core/timezone.h ./init.o: ../../../../winix/winixd/core/cur.h ./init.o: ../../../../winix/winixd/core/sessionmanager.h ./init.o: ../../../../winix/winixd/core/sessioncontainer.h ./init.o: ../../../../winix/winixd/core/ipbancontainer.h -./init.o: ../../../../winix/winixd/core/system.h ./init.o: ../../../../winix/winixd/core/sessionidmanager.h ./init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./init.o: ../../../../winix/winixd/core/slog.h registermail_info.h @@ -609,13 +611,21 @@ ./templates.o: ../../../../winix/winixd/core/system.h ./templates.o: ../../../../winix/winixd/core/job.h ./templates.o: ../../../../winix/winixd/core/basethread.h -./templates.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./templates.o: ../../../../winix/winixd/core/jobtask.h +./templates.o: ../../../../winix/winixd/core/request.h +./templates.o: ../../../../winix/winixd/core/error.h +./templates.o: ../../../../winix/winixd/core/config.h +./templates.o: ../../../../winix/winixd/core/textstream.h +./templates.o: ../../../../winix/winixd/models/winixmodel.h +./templates.o: ../../../../winix/winixd/core/header.h +./templates.o: ../../../../winix/winixd/core/compress.h +./templates.o: ../../../../winix/winixd/core/winixbase.h ./templates.o: ../../../../winix/winixd/core/plugin.h ./templates.o: ../../../../winix/winixd/core/pluginmsg.h ./templates.o: ../../../../winix/winixd/core/plugindata.h -./templates.o: ../../../../winix/winixd/core/winixbase.h -./templates.o: ../../../../winix/winixd/core/dirs.h -./templates.o: ../../../../winix/winixd/core/dircontainer.h +./templates.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./templates.o: ../../../../winix/winixd/core/mount.h +./templates.o: ../../../../winix/winixd/core/mounts.h ./templates.o: ../../../../winix/winixd/db/db.h ./templates.o: ../../../../winix/winixd/db/dbbase.h ./templates.o: ../../../../winix/winixd/db/dbconn.h @@ -627,24 +637,19 @@ ./templates.o: ../../../../winix/winixd/core/dircontainer.h ./templates.o: ../../../../winix/winixd/core/ugcontainer.h ./templates.o: ../../../../winix/winixd/core/request.h -./templates.o: ../../../../winix/winixd/core/mounts.h -./templates.o: ../../../../winix/winixd/core/mount.h -./templates.o: ../../../../winix/winixd/core/error.h ./templates.o: ../../../../winix/winixd/core/mountparser.h -./templates.o: ../../../../winix/winixd/core/config.h -./templates.o: ../../../../winix/winixd/core/crypt.h -./templates.o: ../../../../winix/winixd/core/run.h -./templates.o: ../../../../winix/winixd/core/users.h -./templates.o: ../../../../winix/winixd/core/ugcontainer.h -./templates.o: ../../../../winix/winixd/core/lastcontainer.h ./templates.o: ../../../../winix/winixd/core/cur.h ./templates.o: ../../../../winix/winixd/core/session.h ./templates.o: ../../../../winix/winixd/core/rebus.h -./templates.o: ../../../../winix/winixd/core/textstream.h ./templates.o: ../../../../winix/winixd/core/ipban.h -./templates.o: ../../../../winix/winixd/models/winixmodel.h -./templates.o: ../../../../winix/winixd/core/groups.h ./templates.o: ../../../../winix/winixd/core/loadavg.h +./templates.o: ../../../../winix/winixd/core/dirs.h +./templates.o: ../../../../winix/winixd/core/dircontainer.h +./templates.o: ../../../../winix/winixd/core/crypt.h +./templates.o: ../../../../winix/winixd/core/run.h +./templates.o: ../../../../winix/winixd/core/users.h +./templates.o: ../../../../winix/winixd/core/groups.h +./templates.o: ../../../../winix/winixd/core/ugcontainer.h ./templates.o: ../../../../winix/winixd/core/image.h ./templates.o: ../../../../winix/winixd/core/threadmanager.h ./templates.o: ../../../../winix/winixd/models/winixmodelconnector.h @@ -657,12 +662,12 @@ ./templates.o: ../../../../winix/winixd/core/basethread.h ./templates.o: ../../../../winix/winixd/notify/templatesnotify.h ./templates.o: ../../../../winix/winixd/core/users.h +./templates.o: ../../../../winix/winixd/core/lastcontainer.h ./templates.o: ../../../../winix/winixd/core/timezones.h ./templates.o: ../../../../winix/winixd/core/timezone.h ./templates.o: ../../../../winix/winixd/core/sessionmanager.h ./templates.o: ../../../../winix/winixd/core/sessioncontainer.h ./templates.o: ../../../../winix/winixd/core/ipbancontainer.h -./templates.o: ../../../../winix/winixd/core/system.h ./templates.o: ../../../../winix/winixd/core/sessionidmanager.h ./templates.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./templates.o: ../../../../pikotools/src/html/htmlparser.h diff --git a/winixd/plugins/menu/Makefile.dep b/winixd/plugins/menu/Makefile.dep index cccb954..1493061 100644 --- a/winixd/plugins/menu/Makefile.dep +++ b/winixd/plugins/menu/Makefile.dep @@ -92,10 +92,14 @@ ./cache.o: ../../../../winix/winixd/core/textstream.h ./cache.o: ../../../../winix/winixd/models/winixmodel.h ./cache.o: ../../../../winix/winixd/core/header.h -./cache.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./cache.o: ../../../../winix/winixd/core/compress.h ./cache.o: ../../../../winix/winixd/core/plugin.h ./cache.o: ../../../../winix/winixd/core/pluginmsg.h ./cache.o: ../../../../winix/winixd/core/plugindata.h +./cache.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./cache.o: ../../../../winix/winixd/core/mount.h +./cache.o: ../../../../winix/winixd/core/mounts.h +./cache.o: ../../../../winix/winixd/core/mountparser.h ./cache.o: ../../../../winix/winixd/core/misc.h ./cache.o: ../../../../winix/winixd/core/winix_const.h ./cache.o: ../../../../pikotools/src/convert/convert.h @@ -106,32 +110,27 @@ ./init.o: ../../../../winix/winixd/core/plugin.h ./init.o: ../../../../winix/winixd/core/pluginmsg.h ./init.o: ../../../../winix/winixd/core/plugindata.h +./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./init.o: ../../../../winix/winixd/core/winixbase.h -./init.o: ../../../../winix/winixd/core/config.h -./init.o: ../../../../pikotools/src/space/spaceparser.h -./init.o: ../../../../pikotools/src/space/space.h -./init.o: ../../../../pikotools/src/textstream/types.h -./init.o: ../../../../pikotools/src/convert/inttostr.h -./init.o: ../../../../pikotools/src/utf8/utf8.h -./init.o: ../../../../pikotools/src/textstream/stream.h -./init.o: ../../../../pikotools/src/utf8/utf8_templates.h -./init.o: ../../../../pikotools/src/utf8/utf8_private.h -./init.o: ../../../../pikotools/src/convert/baseparser.h +./init.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h +./init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h ./init.o: ../../../../pikotools/src/textstream/textstream.h ./init.o: ../../../../pikotools/src/textstream/stream.h ./init.o: ../../../../pikotools/src/space/space.h ./init.o: ../../../../pikotools/src/date/date.h +./init.o: ../../../../pikotools/src/convert/inttostr.h ./init.o: ../../../../pikotools/src/membuffer/membuffer.h ./init.o: ../../../../pikotools/src/textstream/types.h +./init.o: ../../../../pikotools/src/utf8/utf8.h +./init.o: ../../../../pikotools/src/textstream/stream.h +./init.o: ../../../../pikotools/src/utf8/utf8_templates.h +./init.o: ../../../../pikotools/src/utf8/utf8_private.h ./init.o: ../../../../pikotools/src/utf8/utf8_stream.h -./init.o: ../../../../winix/winixd/core/log.h -./init.o: ../../../../winix/winixd/core/logmanipulators.h -./init.o: ../../../../pikotools/src/log/log.h -./init.o: ../../../../pikotools/src/log/filelog.h ../../../../morm/src/morm.h -./init.o: ../../../../morm/src/version.h ../../../../morm/src/morm_types.h -./init.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h +./init.o: ../../../../morm/src/modelconnector.h ./init.o: ../../../../morm/src/clearer.h ../../../../morm/src/ft.h ./init.o: ../../../../morm/src/dbconnector.h +./init.o: ../../../../pikotools/src/log/log.h +./init.o: ../../../../pikotools/src/log/filelog.h ./init.o: ../../../../morm/src/queryresult.h ./init.o: ../../../../morm/src/flatconnector.h ./init.o: ../../../../morm/src/dbexpression.h @@ -152,12 +151,21 @@ ./init.o: ../../../../morm/src/postgresqlconnector.h ./init.o: ../../../../morm/src/postgresqlqueryresult.h ./init.o: ../../../../morm/src/transaction.h +./init.o: ../../../../winix/winixd/core/mount.h cache.h +./init.o: ../../../../winix/winixd/core/dirs.h +./init.o: ../../../../winix/winixd/core/dircontainer.h +./init.o: ../../../../winix/winixd/core/winixbase.h +./init.o: ../../../../winix/winixd/core/config.h +./init.o: ../../../../pikotools/src/space/spaceparser.h +./init.o: ../../../../pikotools/src/space/space.h +./init.o: ../../../../pikotools/src/textstream/types.h +./init.o: ../../../../pikotools/src/convert/baseparser.h +./init.o: ../../../../winix/winixd/core/log.h +./init.o: ../../../../winix/winixd/core/logmanipulators.h ./init.o: ../../../../winix/winixd/core/synchro.h ./init.o: ../../../../winix/winixd/core/filelog.h ./init.o: ../../../../winix/winixd/core/lock.h -./init.o: ../../../../winix/winixd/core/synchro.h cache.h -./init.o: ../../../../winix/winixd/core/dirs.h -./init.o: ../../../../winix/winixd/core/dircontainer.h +./init.o: ../../../../winix/winixd/core/synchro.h ./init.o: ../../../../winix/winixd/models/item.h ./init.o: ../../../../winix/winixd/models/winixmodel.h ./init.o: ../../../../winix/winixd/models/winixmodelconnector.h @@ -166,7 +174,6 @@ ./init.o: ../../../../winix/winixd/templates/misc.h ./init.o: ../../../../winix/winixd/templates/localefilter.h ./init.o: ../../../../winix/winixd/templates/locale.h -./init.o: ../../../../winix/winixd/core/winixbase.h ./init.o: ../../../../pikotools/src/convert/patternreplacer.h ./init.o: ../../../../pikotools/src/convert/strtoint.h ./init.o: ../../../../pikotools/src/convert/text.h @@ -194,8 +201,10 @@ ./init.o: ../../../../winix/winixd/core/textstream.h ./init.o: ../../../../winix/winixd/models/winixmodel.h ./init.o: ../../../../winix/winixd/core/header.h -./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./init.o: ../../../../winix/winixd/core/compress.h ./init.o: ../../../../winix/winixd/core/plugin.h +./init.o: ../../../../winix/winixd/core/mounts.h +./init.o: ../../../../winix/winixd/core/mountparser.h ./init.o: ../../../../winix/winixd/templates/templates.h ./init.o: ../../../../winix/winixd/templates/patterncacher.h ./init.o: ../../../../winix/winixd/templates/indexpatterns.h @@ -205,21 +214,20 @@ ./init.o: ../../../../winix/winixd/core/session.h ./init.o: ../../../../winix/winixd/core/rebus.h ./init.o: ../../../../winix/winixd/core/ipban.h -./init.o: ../../../../winix/winixd/core/mount.h ./init.o: ../../../../winix/winixd/core/system.h ./init.o: ../../../../winix/winixd/core/job.h ./init.o: ../../../../winix/winixd/core/basethread.h +./init.o: ../../../../winix/winixd/core/jobtask.h +./init.o: ../../../../winix/winixd/core/request.h +./init.o: ../../../../winix/winixd/core/cur.h +./init.o: ../../../../winix/winixd/core/loadavg.h ./init.o: ../../../../winix/winixd/core/dirs.h -./init.o: ../../../../winix/winixd/core/mounts.h -./init.o: ../../../../winix/winixd/core/mountparser.h ./init.o: ../../../../winix/winixd/core/crypt.h ./init.o: ../../../../winix/winixd/core/run.h ./init.o: ../../../../winix/winixd/core/users.h ./init.o: ../../../../winix/winixd/core/ugcontainer.h ./init.o: ../../../../winix/winixd/core/lastcontainer.h -./init.o: ../../../../winix/winixd/core/cur.h ./init.o: ../../../../winix/winixd/core/groups.h -./init.o: ../../../../winix/winixd/core/loadavg.h ./init.o: ../../../../winix/winixd/core/image.h ./init.o: ../../../../winix/winixd/core/threadmanager.h ./init.o: ../../../../winix/winixd/models/winixmodelconnector.h @@ -237,7 +245,6 @@ ./init.o: ../../../../winix/winixd/core/sessionmanager.h ./init.o: ../../../../winix/winixd/core/sessioncontainer.h ./init.o: ../../../../winix/winixd/core/ipbancontainer.h -./init.o: ../../../../winix/winixd/core/system.h ./init.o: ../../../../winix/winixd/core/sessionidmanager.h ./init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./init.o: ../../../../pikotools/src/html/htmlparser.h @@ -246,7 +253,6 @@ ./init.o: ../../../../winix/winixd/core/slog.h ./init.o: ../../../../winix/winixd/functions/functions.h ./init.o: ../../../../winix/winixd/functions/functionbase.h -./init.o: ../../../../winix/winixd/core/request.h ./init.o: ../../../../winix/winixd/functions/functionparser.h ./init.o: ../../../../winix/winixd/functions/account.h ./init.o: ../../../../winix/winixd/functions/adduser.h @@ -384,10 +390,14 @@ ./templates.o: ../../../../ezc/src/outstreams.h ../../../../ezc/src/models.h ./templates.o: ../../../../winix/winixd/models/winixmodel.h ./templates.o: ../../../../winix/winixd/core/header.h -./templates.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./templates.o: ../../../../winix/winixd/core/compress.h ./templates.o: ../../../../winix/winixd/core/plugin.h ./templates.o: ../../../../winix/winixd/core/pluginmsg.h ./templates.o: ../../../../winix/winixd/core/plugindata.h +./templates.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./templates.o: ../../../../winix/winixd/core/mount.h +./templates.o: ../../../../winix/winixd/core/mounts.h +./templates.o: ../../../../winix/winixd/core/mountparser.h ./templates.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/functions.h ./templates.o: ../../../../ezc/src/objects.h ./templates.o: ../../../../ezc/src/expressionparser.h @@ -400,21 +410,20 @@ ./templates.o: ../../../../winix/winixd/core/session.h ./templates.o: ../../../../winix/winixd/core/rebus.h ./templates.o: ../../../../winix/winixd/core/ipban.h -./templates.o: ../../../../winix/winixd/core/mount.h ./templates.o: ../../../../winix/winixd/core/system.h ./templates.o: ../../../../winix/winixd/core/job.h ./templates.o: ../../../../winix/winixd/core/basethread.h +./templates.o: ../../../../winix/winixd/core/jobtask.h +./templates.o: ../../../../winix/winixd/core/request.h +./templates.o: ../../../../winix/winixd/core/cur.h +./templates.o: ../../../../winix/winixd/core/loadavg.h ./templates.o: ../../../../winix/winixd/core/dirs.h -./templates.o: ../../../../winix/winixd/core/mounts.h -./templates.o: ../../../../winix/winixd/core/mountparser.h ./templates.o: ../../../../winix/winixd/core/crypt.h ./templates.o: ../../../../winix/winixd/core/run.h ./templates.o: ../../../../winix/winixd/core/users.h ./templates.o: ../../../../winix/winixd/core/ugcontainer.h ./templates.o: ../../../../winix/winixd/core/lastcontainer.h -./templates.o: ../../../../winix/winixd/core/cur.h ./templates.o: ../../../../winix/winixd/core/groups.h -./templates.o: ../../../../winix/winixd/core/loadavg.h ./templates.o: ../../../../winix/winixd/core/image.h ./templates.o: ../../../../winix/winixd/core/threadmanager.h ./templates.o: ../../../../winix/winixd/models/winixmodelconnector.h @@ -432,7 +441,6 @@ ./templates.o: ../../../../winix/winixd/core/sessionmanager.h ./templates.o: ../../../../winix/winixd/core/sessioncontainer.h ./templates.o: ../../../../winix/winixd/core/ipbancontainer.h -./templates.o: ../../../../winix/winixd/core/system.h ./templates.o: ../../../../winix/winixd/core/sessionidmanager.h ./templates.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./templates.o: ../../../../pikotools/src/html/htmlparser.h diff --git a/winixd/plugins/seo/Makefile.dep b/winixd/plugins/seo/Makefile.dep index 8526fac..23ef2f8 100644 --- a/winixd/plugins/seo/Makefile.dep +++ b/winixd/plugins/seo/Makefile.dep @@ -94,33 +94,15 @@ ./init.o: ../../../../winix/winixd/core/textstream.h ./init.o: ../../../../winix/winixd/models/winixmodel.h ./init.o: ../../../../winix/winixd/core/header.h -./init.o: ../../../../winix/winixd/core/system.h -./init.o: ../../../../winix/winixd/core/job.h -./init.o: ../../../../winix/winixd/core/basethread.h -./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./init.o: ../../../../winix/winixd/core/compress.h ./init.o: ../../../../winix/winixd/core/plugin.h ./init.o: ../../../../winix/winixd/core/pluginmsg.h ./init.o: ../../../../winix/winixd/core/plugindata.h -./init.o: ../../../../winix/winixd/core/dirs.h -./init.o: ../../../../winix/winixd/core/dircontainer.h -./init.o: ../../../../winix/winixd/core/request.h -./init.o: ../../../../winix/winixd/core/mounts.h +./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./init.o: ../../../../winix/winixd/core/mount.h +./init.o: ../../../../winix/winixd/core/mounts.h +./init.o: ../../../../winix/winixd/core/request.h ./init.o: ../../../../winix/winixd/core/mountparser.h -./init.o: ../../../../winix/winixd/core/crypt.h -./init.o: ../../../../winix/winixd/core/run.h -./init.o: ../../../../winix/winixd/core/users.h -./init.o: ../../../../winix/winixd/core/ugcontainer.h -./init.o: ../../../../winix/winixd/core/lastcontainer.h -./init.o: ../../../../winix/winixd/core/cur.h -./init.o: ../../../../winix/winixd/core/session.h -./init.o: ../../../../winix/winixd/core/rebus.h -./init.o: ../../../../winix/winixd/core/ipban.h -./init.o: ../../../../winix/winixd/core/groups.h -./init.o: ../../../../winix/winixd/core/loadavg.h -./init.o: ../../../../winix/winixd/core/image.h -./init.o: ../../../../winix/winixd/core/threadmanager.h -./init.o: ../../../../winix/winixd/models/winixmodelconnector.h ./init.o: ../../../../winix/winixd/notify/notify.h ./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./init.o: ../../../../winix/winixd/notify/notifypool.h @@ -130,21 +112,41 @@ ./init.o: ../../../../winix/winixd/core/basethread.h ./init.o: ../../../../winix/winixd/notify/templatesnotify.h ./init.o: ../../../../winix/winixd/core/users.h -./init.o: ../../../../winix/winixd/core/timezones.h -./init.o: ../../../../winix/winixd/core/timezone.h +./init.o: ../../../../winix/winixd/core/ugcontainer.h +./init.o: ../../../../winix/winixd/core/lastcontainer.h +./init.o: ../../../../winix/winixd/core/cur.h +./init.o: ../../../../winix/winixd/core/session.h +./init.o: ../../../../winix/winixd/core/rebus.h +./init.o: ../../../../winix/winixd/core/ipban.h ./init.o: ../../../../winix/winixd/core/winixrequest.h ./init.o: ../../../../winix/winixd/core/winixsystem.h +./init.o: ../../../../winix/winixd/core/system.h +./init.o: ../../../../winix/winixd/core/job.h +./init.o: ../../../../winix/winixd/core/basethread.h +./init.o: ../../../../winix/winixd/core/jobtask.h +./init.o: ../../../../winix/winixd/core/loadavg.h +./init.o: ../../../../winix/winixd/core/dirs.h +./init.o: ../../../../winix/winixd/core/dircontainer.h +./init.o: ../../../../winix/winixd/core/crypt.h +./init.o: ../../../../winix/winixd/core/run.h +./init.o: ../../../../winix/winixd/core/users.h +./init.o: ../../../../winix/winixd/core/groups.h +./init.o: ../../../../winix/winixd/core/image.h +./init.o: ../../../../winix/winixd/core/threadmanager.h +./init.o: ../../../../winix/winixd/models/winixmodelconnector.h +./init.o: ../../../../winix/winixd/core/timezones.h +./init.o: ../../../../winix/winixd/core/timezone.h ./init.o: ../../../../winix/winixd/core/cur.h ./init.o: ../../../../winix/winixd/core/sessionmanager.h ./init.o: ../../../../winix/winixd/core/sessioncontainer.h ./init.o: ../../../../winix/winixd/core/ipbancontainer.h -./init.o: ../../../../winix/winixd/core/system.h ./init.o: ../../../../winix/winixd/core/sessionidmanager.h ./init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./init.o: ../../../../winix/winixd/core/slog.h ./init.o: ../../../../winix/winixd/functions/functions.h ./init.o: ../../../../winix/winixd/functions/functionbase.h ./init.o: ../../../../winix/winixd/functions/functionparser.h +./init.o: ../../../../winix/winixd/core/dirs.h ./init.o: ../../../../winix/winixd/functions/account.h ./init.o: ../../../../winix/winixd/functions/adduser.h ./init.o: ../../../../winix/winixd/functions/cat.h @@ -283,33 +285,15 @@ ./seo.o: ../../../../winix/winixd/core/textstream.h ./seo.o: ../../../../winix/winixd/models/winixmodel.h ./seo.o: ../../../../winix/winixd/core/header.h -./seo.o: ../../../../winix/winixd/core/system.h -./seo.o: ../../../../winix/winixd/core/job.h -./seo.o: ../../../../winix/winixd/core/basethread.h -./seo.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./seo.o: ../../../../winix/winixd/core/compress.h ./seo.o: ../../../../winix/winixd/core/plugin.h ./seo.o: ../../../../winix/winixd/core/pluginmsg.h ./seo.o: ../../../../winix/winixd/core/plugindata.h -./seo.o: ../../../../winix/winixd/core/dirs.h -./seo.o: ../../../../winix/winixd/core/dircontainer.h -./seo.o: ../../../../winix/winixd/core/request.h -./seo.o: ../../../../winix/winixd/core/mounts.h +./seo.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./seo.o: ../../../../winix/winixd/core/mount.h +./seo.o: ../../../../winix/winixd/core/mounts.h +./seo.o: ../../../../winix/winixd/core/request.h ./seo.o: ../../../../winix/winixd/core/mountparser.h -./seo.o: ../../../../winix/winixd/core/crypt.h -./seo.o: ../../../../winix/winixd/core/run.h -./seo.o: ../../../../winix/winixd/core/users.h -./seo.o: ../../../../winix/winixd/core/ugcontainer.h -./seo.o: ../../../../winix/winixd/core/lastcontainer.h -./seo.o: ../../../../winix/winixd/core/cur.h -./seo.o: ../../../../winix/winixd/core/session.h -./seo.o: ../../../../winix/winixd/core/rebus.h -./seo.o: ../../../../winix/winixd/core/ipban.h -./seo.o: ../../../../winix/winixd/core/groups.h -./seo.o: ../../../../winix/winixd/core/loadavg.h -./seo.o: ../../../../winix/winixd/core/image.h -./seo.o: ../../../../winix/winixd/core/threadmanager.h -./seo.o: ../../../../winix/winixd/models/winixmodelconnector.h ./seo.o: ../../../../winix/winixd/notify/notify.h ./seo.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./seo.o: ../../../../winix/winixd/notify/notifypool.h @@ -319,21 +303,41 @@ ./seo.o: ../../../../winix/winixd/core/basethread.h ./seo.o: ../../../../winix/winixd/notify/templatesnotify.h ./seo.o: ../../../../winix/winixd/core/users.h -./seo.o: ../../../../winix/winixd/core/timezones.h -./seo.o: ../../../../winix/winixd/core/timezone.h +./seo.o: ../../../../winix/winixd/core/ugcontainer.h +./seo.o: ../../../../winix/winixd/core/lastcontainer.h +./seo.o: ../../../../winix/winixd/core/cur.h +./seo.o: ../../../../winix/winixd/core/session.h +./seo.o: ../../../../winix/winixd/core/rebus.h +./seo.o: ../../../../winix/winixd/core/ipban.h ./seo.o: ../../../../winix/winixd/core/winixrequest.h ./seo.o: ../../../../winix/winixd/core/winixsystem.h +./seo.o: ../../../../winix/winixd/core/system.h +./seo.o: ../../../../winix/winixd/core/job.h +./seo.o: ../../../../winix/winixd/core/basethread.h +./seo.o: ../../../../winix/winixd/core/jobtask.h +./seo.o: ../../../../winix/winixd/core/loadavg.h +./seo.o: ../../../../winix/winixd/core/dirs.h +./seo.o: ../../../../winix/winixd/core/dircontainer.h +./seo.o: ../../../../winix/winixd/core/crypt.h +./seo.o: ../../../../winix/winixd/core/run.h +./seo.o: ../../../../winix/winixd/core/users.h +./seo.o: ../../../../winix/winixd/core/groups.h +./seo.o: ../../../../winix/winixd/core/image.h +./seo.o: ../../../../winix/winixd/core/threadmanager.h +./seo.o: ../../../../winix/winixd/models/winixmodelconnector.h +./seo.o: ../../../../winix/winixd/core/timezones.h +./seo.o: ../../../../winix/winixd/core/timezone.h ./seo.o: ../../../../winix/winixd/core/cur.h ./seo.o: ../../../../winix/winixd/core/sessionmanager.h ./seo.o: ../../../../winix/winixd/core/sessioncontainer.h ./seo.o: ../../../../winix/winixd/core/ipbancontainer.h -./seo.o: ../../../../winix/winixd/core/system.h ./seo.o: ../../../../winix/winixd/core/sessionidmanager.h ./seo.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./seo.o: ../../../../winix/winixd/core/slog.h ./seo.o: ../../../../winix/winixd/functions/functions.h ./seo.o: ../../../../winix/winixd/functions/functionbase.h ./seo.o: ../../../../winix/winixd/functions/functionparser.h +./seo.o: ../../../../winix/winixd/core/dirs.h ./seo.o: ../../../../winix/winixd/functions/account.h ./seo.o: ../../../../winix/winixd/functions/adduser.h ./seo.o: ../../../../winix/winixd/functions/cat.h diff --git a/winixd/plugins/stats/Makefile.dep b/winixd/plugins/stats/Makefile.dep index b5ba75e..dca8cea 100644 --- a/winixd/plugins/stats/Makefile.dep +++ b/winixd/plugins/stats/Makefile.dep @@ -78,6 +78,14 @@ ./init.o: ../../../../winix/winixd/core/textstream.h ./init.o: ../../../../winix/winixd/models/winixmodel.h ./init.o: ../../../../winix/winixd/core/header.h +./init.o: ../../../../winix/winixd/core/compress.h +./init.o: ../../../../winix/winixd/core/winixbase.h +./init.o: ../../../../winix/winixd/core/plugin.h +./init.o: ../../../../winix/winixd/core/pluginmsg.h +./init.o: ../../../../winix/winixd/core/plugindata.h +./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./init.o: ../../../../winix/winixd/core/mount.h +./init.o: ../../../../winix/winixd/core/mounts.h ./init.o: ../../../../winix/winixd/db/db.h ./init.o: ../../../../winix/winixd/db/dbbase.h ./init.o: ../../../../winix/winixd/db/dbconn.h @@ -87,18 +95,14 @@ ./init.o: ../../../../winix/winixd/models/user.h ./init.o: ../../../../winix/winixd/models/group.h ./init.o: ../../../../winix/winixd/core/dircontainer.h -./init.o: ../../../../winix/winixd/core/winixbase.h ./init.o: ../../../../winix/winixd/core/ugcontainer.h -./init.o: ../../../../winix/winixd/core/cur.h ./init.o: ../../../../winix/winixd/core/request.h +./init.o: ../../../../winix/winixd/core/mountparser.h +./init.o: ../../../../winix/winixd/core/cur.h ./init.o: ../../../../winix/winixd/core/session.h -./init.o: ../../../../winix/winixd/core/plugindata.h ./init.o: ../../../../winix/winixd/core/rebus.h -./init.o: ../../../../winix/winixd/core/ipban.h -./init.o: ../../../../winix/winixd/core/mount.h bot.h stats.h -./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h -./init.o: ../../../../winix/winixd/core/plugin.h -./init.o: ../../../../winix/winixd/core/pluginmsg.h templates.h +./init.o: ../../../../winix/winixd/core/ipban.h bot.h stats.h +./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h templates.h ./init.o: ../../../../winix/winixd/core/plugin.h statssession.h ./init.o: ../../../../winix/winixd/core/plugindata.h ./stats.o: stats.h ../../../../winix/winixd/core/config.h @@ -121,7 +125,6 @@ ./stats.o: ../../../../winix/winixd/core/log.h ./stats.o: ../../../../pikotools/src/log/filelog.h ./stats.o: ../../../../winix/winixd/core/winixmodeldeprecated.h -./stats.o: ../../../../winix/winixd/core/winixbase.h ./stats.o: ../../../../winix/winixd/core/log.h ./stats.o: ../../../../winix/winixd/core/logmanipulators.h ./stats.o: ../../../../pikotools/src/log/log.h ../../../../morm/src/morm.h @@ -151,14 +154,6 @@ ./stats.o: ../../../../morm/src/postgresqlconnector.h ./stats.o: ../../../../morm/src/postgresqlqueryresult.h ./stats.o: ../../../../morm/src/transaction.h -./stats.o: ../../../../winix/winixd/core/synchro.h -./stats.o: ../../../../winix/winixd/core/filelog.h -./stats.o: ../../../../winix/winixd/core/lock.h -./stats.o: ../../../../winix/winixd/core/synchro.h -./stats.o: ../../../../winix/winixd/core/plugin.h -./stats.o: ../../../../winix/winixd/core/pluginmsg.h -./stats.o: ../../../../winix/winixd/core/plugindata.h -./stats.o: ../../../../winix/winixd/core/winixbase.h ./templates.o: templates.h ../../../../winix/winixd/core/plugin.h ./templates.o: ../../../../ezc/src/ezc.h ../../../../morm/src/version.h ./templates.o: ../../../../ezc/src/generator.h ../../../../ezc/src/blocks.h @@ -220,6 +215,9 @@ ./templates.o: ../../../../pikotools/src/convert/baseparser.h ./templates.o: ../../../../winix/winixd/core/log.h ./templates.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./templates.o: ../../../../winix/winixd/templates/misc.h +./templates.o: ../../../../winix/winixd/templates/localefilter.h +./templates.o: ../../../../winix/winixd/templates/locale.h ./templates.o: ../../../../winix/winixd/core/winixbase.h ./templates.o: ../../../../winix/winixd/core/log.h ./templates.o: ../../../../winix/winixd/core/logmanipulators.h @@ -235,12 +233,5 @@ ./templates.o: ../../../../winix/winixd/core/filelog.h ./templates.o: ../../../../winix/winixd/core/lock.h ./templates.o: ../../../../winix/winixd/core/synchro.h -./templates.o: ../../../../winix/winixd/core/plugin.h -./templates.o: ../../../../winix/winixd/core/pluginmsg.h -./templates.o: ../../../../winix/winixd/core/plugindata.h -./templates.o: ../../../../winix/winixd/core/winixbase.h -./templates.o: ../../../../winix/winixd/templates/misc.h -./templates.o: ../../../../winix/winixd/templates/localefilter.h -./templates.o: ../../../../winix/winixd/templates/locale.h ./templates.o: ../../../../pikotools/src/convert/patternreplacer.h ./templates.o: ../../../../winix/winixd/templates/htmltextstream.h diff --git a/winixd/plugins/stats/init.cpp b/winixd/plugins/stats/init.cpp index ada7365..b5ee82d 100644 --- a/winixd/plugins/stats/init.cpp +++ b/winixd/plugins/stats/init.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2018, Tomasz Sowa + * Copyright (c) 2010-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -149,16 +149,19 @@ StatsSession * stats_session = 0; -void SessionCreated(PluginInfo & info) +void SessionCreated(PluginInfo & env) { - StatsSession * d = new StatsSession(); - info.session->plugin_data.Assign(info.plugin->current_plugin, d); - - if( !info.cur->request->IsParam(nostat_param) ) + if( env.cur->session ) { - info.log << log4 << "Stats: created stats plugin data" - << ", plugin id: " << info.plugin_id - << ", pointer: " << d << logend; + StatsSession * d = new StatsSession(); + env.cur->session->plugin_data.Assign(env.plugin->current_plugin, d); + + if( !env.cur->request->IsParam(nostat_param) ) + { + env.log << log4 << "Stats: created stats plugin data" + << ", plugin id: " << env.plugin_id + << ", pointer: " << d << logend; + } } } @@ -170,7 +173,11 @@ void RemoveSession(PluginInfo & info) { // temporarily for debug // sometimes the pointer is null here - info.log << log1 << "Stats: why the info.plugin_data_base is zero? !!!!, ses_id: " << info.session->id << logend; + + if( info.cur->session ) + { + info.log << log1 << "Stats: why the info.plugin_data_base is zero? !!!!, ses_id: " << info.cur->session->id << logend; + } return; } @@ -230,11 +237,12 @@ using namespace Stats; info.plugin->Assign(WINIX_CONTENT_MAKE, ContentMake); info.plugin->Assign(WINIX_SESSION_CREATED, SessionCreated); info.plugin->Assign(WINIX_PLUGIN_SESSION_DATA_REMOVE, RemoveSession); - info.plugin->Assign(WINIX_PREPARE_TO_CLOSE, Close); + info.plugin->Assign(WINIX_PREPARE_TO_CLOSE, Close); info.plugin->Assign(WINIX_FILE_REMOVED, RemoveFile); info.plugin->Assign(WINIX_DIR_PREPARE_TO_REMOVE, RemoveDir); - info.set_dependency_for(stats); + stats.set_dependency((WinixModelDeprecated*)info.functions); + stats.ReadConfig(info.config); stats.ReadStats(); diff --git a/winixd/plugins/thread/Makefile.dep b/winixd/plugins/thread/Makefile.dep index e4012a8..d858342 100644 --- a/winixd/plugins/thread/Makefile.dep +++ b/winixd/plugins/thread/Makefile.dep @@ -103,32 +103,14 @@ ./createthread.o: ../../../../winix/winixd/core/textstream.h ./createthread.o: ../../../../winix/winixd/models/winixmodel.h ./createthread.o: ../../../../winix/winixd/core/header.h -./createthread.o: ../../../../winix/winixd/core/system.h -./createthread.o: ../../../../winix/winixd/core/job.h -./createthread.o: ../../../../winix/winixd/core/basethread.h -./createthread.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./createthread.o: ../../../../winix/winixd/core/compress.h ./createthread.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h ./createthread.o: ../../../../winix/winixd/core/plugindata.h -./createthread.o: ../../../../winix/winixd/core/dirs.h -./createthread.o: ../../../../winix/winixd/core/dircontainer.h -./createthread.o: ../../../../winix/winixd/core/request.h -./createthread.o: ../../../../winix/winixd/core/mounts.h +./createthread.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./createthread.o: ../../../../winix/winixd/core/mount.h +./createthread.o: ../../../../winix/winixd/core/mounts.h +./createthread.o: ../../../../winix/winixd/core/request.h ./createthread.o: ../../../../winix/winixd/core/mountparser.h -./createthread.o: ../../../../winix/winixd/core/crypt.h -./createthread.o: ../../../../winix/winixd/core/run.h -./createthread.o: ../../../../winix/winixd/core/users.h -./createthread.o: ../../../../winix/winixd/core/ugcontainer.h -./createthread.o: ../../../../winix/winixd/core/lastcontainer.h -./createthread.o: ../../../../winix/winixd/core/cur.h -./createthread.o: ../../../../winix/winixd/core/session.h -./createthread.o: ../../../../winix/winixd/core/rebus.h -./createthread.o: ../../../../winix/winixd/core/ipban.h -./createthread.o: ../../../../winix/winixd/core/groups.h -./createthread.o: ../../../../winix/winixd/core/loadavg.h -./createthread.o: ../../../../winix/winixd/core/image.h -./createthread.o: ../../../../winix/winixd/core/threadmanager.h -./createthread.o: ../../../../winix/winixd/models/winixmodelconnector.h ./createthread.o: ../../../../winix/winixd/notify/notify.h ./createthread.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./createthread.o: ../../../../winix/winixd/notify/notifypool.h @@ -138,15 +120,34 @@ ./createthread.o: ../../../../winix/winixd/core/basethread.h ./createthread.o: ../../../../winix/winixd/notify/templatesnotify.h ./createthread.o: ../../../../winix/winixd/core/users.h -./createthread.o: ../../../../winix/winixd/core/timezones.h -./createthread.o: ../../../../winix/winixd/core/timezone.h +./createthread.o: ../../../../winix/winixd/core/ugcontainer.h +./createthread.o: ../../../../winix/winixd/core/lastcontainer.h +./createthread.o: ../../../../winix/winixd/core/cur.h +./createthread.o: ../../../../winix/winixd/core/session.h +./createthread.o: ../../../../winix/winixd/core/rebus.h +./createthread.o: ../../../../winix/winixd/core/ipban.h ./createthread.o: ../../../../winix/winixd/core/winixrequest.h ./createthread.o: ../../../../winix/winixd/core/winixsystem.h +./createthread.o: ../../../../winix/winixd/core/system.h +./createthread.o: ../../../../winix/winixd/core/job.h +./createthread.o: ../../../../winix/winixd/core/basethread.h +./createthread.o: ../../../../winix/winixd/core/jobtask.h +./createthread.o: ../../../../winix/winixd/core/loadavg.h +./createthread.o: ../../../../winix/winixd/core/dirs.h +./createthread.o: ../../../../winix/winixd/core/dircontainer.h +./createthread.o: ../../../../winix/winixd/core/crypt.h +./createthread.o: ../../../../winix/winixd/core/run.h +./createthread.o: ../../../../winix/winixd/core/users.h +./createthread.o: ../../../../winix/winixd/core/groups.h +./createthread.o: ../../../../winix/winixd/core/image.h +./createthread.o: ../../../../winix/winixd/core/threadmanager.h +./createthread.o: ../../../../winix/winixd/models/winixmodelconnector.h +./createthread.o: ../../../../winix/winixd/core/timezones.h +./createthread.o: ../../../../winix/winixd/core/timezone.h ./createthread.o: ../../../../winix/winixd/core/cur.h ./createthread.o: ../../../../winix/winixd/core/sessionmanager.h ./createthread.o: ../../../../winix/winixd/core/sessioncontainer.h ./createthread.o: ../../../../winix/winixd/core/ipbancontainer.h -./createthread.o: ../../../../winix/winixd/core/system.h ./createthread.o: ../../../../winix/winixd/core/sessionidmanager.h ./createthread.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./createthread.o: ../../../../winix/winixd/core/slog.h tdb.h thread.h @@ -154,6 +155,7 @@ ./createthread.o: ../../../../winix/winixd/functions/functions.h ./createthread.o: ../../../../winix/winixd/functions/functionbase.h ./createthread.o: ../../../../winix/winixd/functions/functionparser.h +./createthread.o: ../../../../winix/winixd/core/dirs.h ./createthread.o: ../../../../winix/winixd/functions/account.h ./createthread.o: ../../../../winix/winixd/functions/adduser.h ./createthread.o: ../../../../winix/winixd/functions/cat.h @@ -299,32 +301,14 @@ ./funthread.o: ../../../../winix/winixd/core/textstream.h ./funthread.o: ../../../../winix/winixd/models/winixmodel.h ./funthread.o: ../../../../winix/winixd/core/header.h -./funthread.o: ../../../../winix/winixd/core/system.h -./funthread.o: ../../../../winix/winixd/core/job.h -./funthread.o: ../../../../winix/winixd/core/basethread.h -./funthread.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./funthread.o: ../../../../winix/winixd/core/compress.h ./funthread.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h ./funthread.o: ../../../../winix/winixd/core/plugindata.h -./funthread.o: ../../../../winix/winixd/core/dirs.h -./funthread.o: ../../../../winix/winixd/core/dircontainer.h -./funthread.o: ../../../../winix/winixd/core/request.h -./funthread.o: ../../../../winix/winixd/core/mounts.h +./funthread.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./funthread.o: ../../../../winix/winixd/core/mount.h +./funthread.o: ../../../../winix/winixd/core/mounts.h +./funthread.o: ../../../../winix/winixd/core/request.h ./funthread.o: ../../../../winix/winixd/core/mountparser.h -./funthread.o: ../../../../winix/winixd/core/crypt.h -./funthread.o: ../../../../winix/winixd/core/run.h -./funthread.o: ../../../../winix/winixd/core/users.h -./funthread.o: ../../../../winix/winixd/core/ugcontainer.h -./funthread.o: ../../../../winix/winixd/core/lastcontainer.h -./funthread.o: ../../../../winix/winixd/core/cur.h -./funthread.o: ../../../../winix/winixd/core/session.h -./funthread.o: ../../../../winix/winixd/core/rebus.h -./funthread.o: ../../../../winix/winixd/core/ipban.h -./funthread.o: ../../../../winix/winixd/core/groups.h -./funthread.o: ../../../../winix/winixd/core/loadavg.h -./funthread.o: ../../../../winix/winixd/core/image.h -./funthread.o: ../../../../winix/winixd/core/threadmanager.h -./funthread.o: ../../../../winix/winixd/models/winixmodelconnector.h ./funthread.o: ../../../../winix/winixd/notify/notify.h ./funthread.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./funthread.o: ../../../../winix/winixd/notify/notifypool.h @@ -334,15 +318,34 @@ ./funthread.o: ../../../../winix/winixd/core/basethread.h ./funthread.o: ../../../../winix/winixd/notify/templatesnotify.h ./funthread.o: ../../../../winix/winixd/core/users.h -./funthread.o: ../../../../winix/winixd/core/timezones.h -./funthread.o: ../../../../winix/winixd/core/timezone.h +./funthread.o: ../../../../winix/winixd/core/ugcontainer.h +./funthread.o: ../../../../winix/winixd/core/lastcontainer.h +./funthread.o: ../../../../winix/winixd/core/cur.h +./funthread.o: ../../../../winix/winixd/core/session.h +./funthread.o: ../../../../winix/winixd/core/rebus.h +./funthread.o: ../../../../winix/winixd/core/ipban.h ./funthread.o: ../../../../winix/winixd/core/winixrequest.h ./funthread.o: ../../../../winix/winixd/core/winixsystem.h +./funthread.o: ../../../../winix/winixd/core/system.h +./funthread.o: ../../../../winix/winixd/core/job.h +./funthread.o: ../../../../winix/winixd/core/basethread.h +./funthread.o: ../../../../winix/winixd/core/jobtask.h +./funthread.o: ../../../../winix/winixd/core/loadavg.h +./funthread.o: ../../../../winix/winixd/core/dirs.h +./funthread.o: ../../../../winix/winixd/core/dircontainer.h +./funthread.o: ../../../../winix/winixd/core/crypt.h +./funthread.o: ../../../../winix/winixd/core/run.h +./funthread.o: ../../../../winix/winixd/core/users.h +./funthread.o: ../../../../winix/winixd/core/groups.h +./funthread.o: ../../../../winix/winixd/core/image.h +./funthread.o: ../../../../winix/winixd/core/threadmanager.h +./funthread.o: ../../../../winix/winixd/models/winixmodelconnector.h +./funthread.o: ../../../../winix/winixd/core/timezones.h +./funthread.o: ../../../../winix/winixd/core/timezone.h ./funthread.o: ../../../../winix/winixd/core/cur.h ./funthread.o: ../../../../winix/winixd/core/sessionmanager.h ./funthread.o: ../../../../winix/winixd/core/sessioncontainer.h ./funthread.o: ../../../../winix/winixd/core/ipbancontainer.h -./funthread.o: ../../../../winix/winixd/core/system.h ./funthread.o: ../../../../winix/winixd/core/sessionidmanager.h ./funthread.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./funthread.o: ../../../../winix/winixd/core/slog.h tdb.h thread.h @@ -446,32 +449,14 @@ ./init.o: ../../../../winix/winixd/core/textstream.h ./init.o: ../../../../winix/winixd/models/winixmodel.h ./init.o: ../../../../winix/winixd/core/header.h -./init.o: ../../../../winix/winixd/core/system.h -./init.o: ../../../../winix/winixd/core/job.h -./init.o: ../../../../winix/winixd/core/basethread.h -./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./init.o: ../../../../winix/winixd/core/compress.h ./init.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h ./init.o: ../../../../winix/winixd/core/plugindata.h -./init.o: ../../../../winix/winixd/core/dirs.h -./init.o: ../../../../winix/winixd/core/dircontainer.h -./init.o: ../../../../winix/winixd/core/request.h -./init.o: ../../../../winix/winixd/core/mounts.h +./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./init.o: ../../../../winix/winixd/core/mount.h +./init.o: ../../../../winix/winixd/core/mounts.h +./init.o: ../../../../winix/winixd/core/request.h ./init.o: ../../../../winix/winixd/core/mountparser.h -./init.o: ../../../../winix/winixd/core/crypt.h -./init.o: ../../../../winix/winixd/core/run.h -./init.o: ../../../../winix/winixd/core/users.h -./init.o: ../../../../winix/winixd/core/ugcontainer.h -./init.o: ../../../../winix/winixd/core/lastcontainer.h -./init.o: ../../../../winix/winixd/core/cur.h -./init.o: ../../../../winix/winixd/core/session.h -./init.o: ../../../../winix/winixd/core/rebus.h -./init.o: ../../../../winix/winixd/core/ipban.h -./init.o: ../../../../winix/winixd/core/groups.h -./init.o: ../../../../winix/winixd/core/loadavg.h -./init.o: ../../../../winix/winixd/core/image.h -./init.o: ../../../../winix/winixd/core/threadmanager.h -./init.o: ../../../../winix/winixd/models/winixmodelconnector.h ./init.o: ../../../../winix/winixd/notify/notify.h ./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./init.o: ../../../../winix/winixd/notify/notifypool.h @@ -481,15 +466,34 @@ ./init.o: ../../../../winix/winixd/core/basethread.h ./init.o: ../../../../winix/winixd/notify/templatesnotify.h ./init.o: ../../../../winix/winixd/core/users.h -./init.o: ../../../../winix/winixd/core/timezones.h -./init.o: ../../../../winix/winixd/core/timezone.h +./init.o: ../../../../winix/winixd/core/ugcontainer.h +./init.o: ../../../../winix/winixd/core/lastcontainer.h +./init.o: ../../../../winix/winixd/core/cur.h +./init.o: ../../../../winix/winixd/core/session.h +./init.o: ../../../../winix/winixd/core/rebus.h +./init.o: ../../../../winix/winixd/core/ipban.h ./init.o: ../../../../winix/winixd/core/winixrequest.h ./init.o: ../../../../winix/winixd/core/winixsystem.h +./init.o: ../../../../winix/winixd/core/system.h +./init.o: ../../../../winix/winixd/core/job.h +./init.o: ../../../../winix/winixd/core/basethread.h +./init.o: ../../../../winix/winixd/core/jobtask.h +./init.o: ../../../../winix/winixd/core/loadavg.h +./init.o: ../../../../winix/winixd/core/dirs.h +./init.o: ../../../../winix/winixd/core/dircontainer.h +./init.o: ../../../../winix/winixd/core/crypt.h +./init.o: ../../../../winix/winixd/core/run.h +./init.o: ../../../../winix/winixd/core/users.h +./init.o: ../../../../winix/winixd/core/groups.h +./init.o: ../../../../winix/winixd/core/image.h +./init.o: ../../../../winix/winixd/core/threadmanager.h +./init.o: ../../../../winix/winixd/models/winixmodelconnector.h +./init.o: ../../../../winix/winixd/core/timezones.h +./init.o: ../../../../winix/winixd/core/timezone.h ./init.o: ../../../../winix/winixd/core/cur.h ./init.o: ../../../../winix/winixd/core/sessionmanager.h ./init.o: ../../../../winix/winixd/core/sessioncontainer.h ./init.o: ../../../../winix/winixd/core/ipbancontainer.h -./init.o: ../../../../winix/winixd/core/system.h ./init.o: ../../../../winix/winixd/core/sessionidmanager.h ./init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./init.o: ../../../../winix/winixd/core/slog.h threadinfo.h funthread.h @@ -498,6 +502,7 @@ ./init.o: ../../../../winix/winixd/functions/functions.h ./init.o: ../../../../winix/winixd/functions/functionbase.h ./init.o: ../../../../winix/winixd/functions/functionparser.h +./init.o: ../../../../winix/winixd/core/dirs.h ./init.o: ../../../../winix/winixd/functions/account.h ./init.o: ../../../../winix/winixd/functions/adduser.h ./init.o: ../../../../winix/winixd/functions/cat.h @@ -639,32 +644,14 @@ ./reply.o: ../../../../winix/winixd/core/textstream.h ./reply.o: ../../../../winix/winixd/models/winixmodel.h ./reply.o: ../../../../winix/winixd/core/header.h -./reply.o: ../../../../winix/winixd/core/system.h -./reply.o: ../../../../winix/winixd/core/job.h -./reply.o: ../../../../winix/winixd/core/basethread.h -./reply.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./reply.o: ../../../../winix/winixd/core/compress.h ./reply.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h ./reply.o: ../../../../winix/winixd/core/plugindata.h -./reply.o: ../../../../winix/winixd/core/dirs.h -./reply.o: ../../../../winix/winixd/core/dircontainer.h -./reply.o: ../../../../winix/winixd/core/request.h -./reply.o: ../../../../winix/winixd/core/mounts.h +./reply.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./reply.o: ../../../../winix/winixd/core/mount.h +./reply.o: ../../../../winix/winixd/core/mounts.h +./reply.o: ../../../../winix/winixd/core/request.h ./reply.o: ../../../../winix/winixd/core/mountparser.h -./reply.o: ../../../../winix/winixd/core/crypt.h -./reply.o: ../../../../winix/winixd/core/run.h -./reply.o: ../../../../winix/winixd/core/users.h -./reply.o: ../../../../winix/winixd/core/ugcontainer.h -./reply.o: ../../../../winix/winixd/core/lastcontainer.h -./reply.o: ../../../../winix/winixd/core/cur.h -./reply.o: ../../../../winix/winixd/core/session.h -./reply.o: ../../../../winix/winixd/core/rebus.h -./reply.o: ../../../../winix/winixd/core/ipban.h -./reply.o: ../../../../winix/winixd/core/groups.h -./reply.o: ../../../../winix/winixd/core/loadavg.h -./reply.o: ../../../../winix/winixd/core/image.h -./reply.o: ../../../../winix/winixd/core/threadmanager.h -./reply.o: ../../../../winix/winixd/models/winixmodelconnector.h ./reply.o: ../../../../winix/winixd/notify/notify.h ./reply.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./reply.o: ../../../../winix/winixd/notify/notifypool.h @@ -674,15 +661,34 @@ ./reply.o: ../../../../winix/winixd/core/basethread.h ./reply.o: ../../../../winix/winixd/notify/templatesnotify.h ./reply.o: ../../../../winix/winixd/core/users.h -./reply.o: ../../../../winix/winixd/core/timezones.h -./reply.o: ../../../../winix/winixd/core/timezone.h +./reply.o: ../../../../winix/winixd/core/ugcontainer.h +./reply.o: ../../../../winix/winixd/core/lastcontainer.h +./reply.o: ../../../../winix/winixd/core/cur.h +./reply.o: ../../../../winix/winixd/core/session.h +./reply.o: ../../../../winix/winixd/core/rebus.h +./reply.o: ../../../../winix/winixd/core/ipban.h ./reply.o: ../../../../winix/winixd/core/winixrequest.h ./reply.o: ../../../../winix/winixd/core/winixsystem.h +./reply.o: ../../../../winix/winixd/core/system.h +./reply.o: ../../../../winix/winixd/core/job.h +./reply.o: ../../../../winix/winixd/core/basethread.h +./reply.o: ../../../../winix/winixd/core/jobtask.h +./reply.o: ../../../../winix/winixd/core/loadavg.h +./reply.o: ../../../../winix/winixd/core/dirs.h +./reply.o: ../../../../winix/winixd/core/dircontainer.h +./reply.o: ../../../../winix/winixd/core/crypt.h +./reply.o: ../../../../winix/winixd/core/run.h +./reply.o: ../../../../winix/winixd/core/users.h +./reply.o: ../../../../winix/winixd/core/groups.h +./reply.o: ../../../../winix/winixd/core/image.h +./reply.o: ../../../../winix/winixd/core/threadmanager.h +./reply.o: ../../../../winix/winixd/models/winixmodelconnector.h +./reply.o: ../../../../winix/winixd/core/timezones.h +./reply.o: ../../../../winix/winixd/core/timezone.h ./reply.o: ../../../../winix/winixd/core/cur.h ./reply.o: ../../../../winix/winixd/core/sessionmanager.h ./reply.o: ../../../../winix/winixd/core/sessioncontainer.h ./reply.o: ../../../../winix/winixd/core/ipbancontainer.h -./reply.o: ../../../../winix/winixd/core/system.h ./reply.o: ../../../../winix/winixd/core/sessionidmanager.h ./reply.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./reply.o: ../../../../winix/winixd/core/slog.h tdb.h thread.h @@ -690,6 +696,7 @@ ./reply.o: ../../../../winix/winixd/functions/functions.h ./reply.o: ../../../../winix/winixd/functions/functionbase.h ./reply.o: ../../../../winix/winixd/functions/functionparser.h +./reply.o: ../../../../winix/winixd/core/dirs.h ./reply.o: ../../../../winix/winixd/functions/account.h ./reply.o: ../../../../winix/winixd/functions/adduser.h ./reply.o: ../../../../winix/winixd/functions/cat.h @@ -838,32 +845,14 @@ ./showthreads.o: ../../../../winix/winixd/core/textstream.h ./showthreads.o: ../../../../winix/winixd/models/winixmodel.h ./showthreads.o: ../../../../winix/winixd/core/header.h -./showthreads.o: ../../../../winix/winixd/core/system.h -./showthreads.o: ../../../../winix/winixd/core/job.h -./showthreads.o: ../../../../winix/winixd/core/basethread.h -./showthreads.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./showthreads.o: ../../../../winix/winixd/core/compress.h ./showthreads.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h ./showthreads.o: ../../../../winix/winixd/core/plugindata.h -./showthreads.o: ../../../../winix/winixd/core/dirs.h -./showthreads.o: ../../../../winix/winixd/core/dircontainer.h -./showthreads.o: ../../../../winix/winixd/core/request.h -./showthreads.o: ../../../../winix/winixd/core/mounts.h +./showthreads.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./showthreads.o: ../../../../winix/winixd/core/mount.h +./showthreads.o: ../../../../winix/winixd/core/mounts.h +./showthreads.o: ../../../../winix/winixd/core/request.h ./showthreads.o: ../../../../winix/winixd/core/mountparser.h -./showthreads.o: ../../../../winix/winixd/core/crypt.h -./showthreads.o: ../../../../winix/winixd/core/run.h -./showthreads.o: ../../../../winix/winixd/core/users.h -./showthreads.o: ../../../../winix/winixd/core/ugcontainer.h -./showthreads.o: ../../../../winix/winixd/core/lastcontainer.h -./showthreads.o: ../../../../winix/winixd/core/cur.h -./showthreads.o: ../../../../winix/winixd/core/session.h -./showthreads.o: ../../../../winix/winixd/core/rebus.h -./showthreads.o: ../../../../winix/winixd/core/ipban.h -./showthreads.o: ../../../../winix/winixd/core/groups.h -./showthreads.o: ../../../../winix/winixd/core/loadavg.h -./showthreads.o: ../../../../winix/winixd/core/image.h -./showthreads.o: ../../../../winix/winixd/core/threadmanager.h -./showthreads.o: ../../../../winix/winixd/models/winixmodelconnector.h ./showthreads.o: ../../../../winix/winixd/notify/notify.h ./showthreads.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./showthreads.o: ../../../../winix/winixd/notify/notifypool.h @@ -873,15 +862,34 @@ ./showthreads.o: ../../../../winix/winixd/core/basethread.h ./showthreads.o: ../../../../winix/winixd/notify/templatesnotify.h ./showthreads.o: ../../../../winix/winixd/core/users.h -./showthreads.o: ../../../../winix/winixd/core/timezones.h -./showthreads.o: ../../../../winix/winixd/core/timezone.h +./showthreads.o: ../../../../winix/winixd/core/ugcontainer.h +./showthreads.o: ../../../../winix/winixd/core/lastcontainer.h +./showthreads.o: ../../../../winix/winixd/core/cur.h +./showthreads.o: ../../../../winix/winixd/core/session.h +./showthreads.o: ../../../../winix/winixd/core/rebus.h +./showthreads.o: ../../../../winix/winixd/core/ipban.h ./showthreads.o: ../../../../winix/winixd/core/winixrequest.h ./showthreads.o: ../../../../winix/winixd/core/winixsystem.h +./showthreads.o: ../../../../winix/winixd/core/system.h +./showthreads.o: ../../../../winix/winixd/core/job.h +./showthreads.o: ../../../../winix/winixd/core/basethread.h +./showthreads.o: ../../../../winix/winixd/core/jobtask.h +./showthreads.o: ../../../../winix/winixd/core/loadavg.h +./showthreads.o: ../../../../winix/winixd/core/dirs.h +./showthreads.o: ../../../../winix/winixd/core/dircontainer.h +./showthreads.o: ../../../../winix/winixd/core/crypt.h +./showthreads.o: ../../../../winix/winixd/core/run.h +./showthreads.o: ../../../../winix/winixd/core/users.h +./showthreads.o: ../../../../winix/winixd/core/groups.h +./showthreads.o: ../../../../winix/winixd/core/image.h +./showthreads.o: ../../../../winix/winixd/core/threadmanager.h +./showthreads.o: ../../../../winix/winixd/models/winixmodelconnector.h +./showthreads.o: ../../../../winix/winixd/core/timezones.h +./showthreads.o: ../../../../winix/winixd/core/timezone.h ./showthreads.o: ../../../../winix/winixd/core/cur.h ./showthreads.o: ../../../../winix/winixd/core/sessionmanager.h ./showthreads.o: ../../../../winix/winixd/core/sessioncontainer.h ./showthreads.o: ../../../../winix/winixd/core/ipbancontainer.h -./showthreads.o: ../../../../winix/winixd/core/system.h ./showthreads.o: ../../../../winix/winixd/core/sessionidmanager.h ./showthreads.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./showthreads.o: ../../../../winix/winixd/core/slog.h tdb.h thread.h @@ -959,15 +967,6 @@ ./templates.o: threadinfo.h ../../../../winix/winixd/core/system.h ./templates.o: ../../../../winix/winixd/core/job.h ./templates.o: ../../../../winix/winixd/core/basethread.h -./templates.o: ../../../../winix/winixd/core/synchro.h -./templates.o: ../../../../winix/winixd/core/winixmodeldeprecated.h -./templates.o: ../../../../winix/winixd/core/winixbase.h -./templates.o: ../../../../winix/winixd/core/config.h -./templates.o: ../../../../pikotools/src/space/spaceparser.h -./templates.o: ../../../../pikotools/src/space/space.h -./templates.o: ../../../../pikotools/src/convert/baseparser.h -./templates.o: ../../../../pikotools/src/textstream/textstream.h -./templates.o: ../../../../pikotools/src/textstream/stream.h ./templates.o: ../../../../pikotools/src/space/space.h ./templates.o: ../../../../pikotools/src/textstream/types.h ./templates.o: ../../../../pikotools/src/convert/inttostr.h @@ -975,23 +974,28 @@ ./templates.o: ../../../../pikotools/src/textstream/stream.h ./templates.o: ../../../../pikotools/src/utf8/utf8_templates.h ./templates.o: ../../../../pikotools/src/utf8/utf8_private.h +./templates.o: ../../../../winix/winixd/core/jobtask.h +./templates.o: ../../../../winix/winixd/core/request.h +./templates.o: ../../../../winix/winixd/core/requesttypes.h +./templates.o: ../../../../pikotools/src/textstream/textstream.h +./templates.o: ../../../../pikotools/src/textstream/stream.h ./templates.o: ../../../../pikotools/src/date/date.h ./templates.o: ../../../../pikotools/src/membuffer/membuffer.h ./templates.o: ../../../../pikotools/src/textstream/types.h ./templates.o: ../../../../pikotools/src/utf8/utf8_stream.h -./templates.o: ../../../../winix/winixd/core/log.h -./templates.o: ../../../../winix/winixd/core/logmanipulators.h -./templates.o: ../../../../pikotools/src/log/log.h -./templates.o: ../../../../pikotools/src/log/filelog.h -./templates.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h -./templates.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h +./templates.o: ../../../../winix/winixd/models/item.h +./templates.o: ../../../../winix/winixd/models/winixmodel.h +./templates.o: ../../../../morm/src/model.h ./templates.o: ../../../../morm/src/modelconnector.h ./templates.o: ../../../../morm/src/clearer.h ../../../../morm/src/ft.h ./templates.o: ../../../../morm/src/dbconnector.h +./templates.o: ../../../../pikotools/src/log/log.h +./templates.o: ../../../../pikotools/src/log/filelog.h ./templates.o: ../../../../morm/src/queryresult.h ./templates.o: ../../../../morm/src/flatconnector.h ./templates.o: ../../../../morm/src/dbexpression.h ./templates.o: ../../../../morm/src/baseexpression.h +./templates.o: ../../../../morm/src/morm_types.h ./templates.o: ../../../../morm/src/modelenv.h ./templates.o: ../../../../morm/src/modeldata.h ./templates.o: ../../../../morm/src/cursorhelper.h @@ -1005,6 +1009,21 @@ ./templates.o: ../../../../ezc/src/item.h ./templates.o: ../../../../pikotools/src/convert/text.h ./templates.o: ../../../../morm/src/flatexpression.h +./templates.o: ../../../../winix/winixd/core/log.h +./templates.o: ../../../../winix/winixd/models/winixmodelconnector.h +./templates.o: ../../../../winix/winixd/models/itemcontent.h +./templates.o: ../../../../winix/winixd/templates/htmltextstream.h +./templates.o: ../../../../winix/winixd/templates/misc.h +./templates.o: ../../../../winix/winixd/templates/localefilter.h +./templates.o: ../../../../winix/winixd/templates/locale.h +./templates.o: ../../../../pikotools/src/space/spaceparser.h +./templates.o: ../../../../pikotools/src/space/space.h +./templates.o: ../../../../pikotools/src/convert/baseparser.h +./templates.o: ../../../../winix/winixd/core/winixbase.h +./templates.o: ../../../../winix/winixd/core/config.h +./templates.o: ../../../../winix/winixd/core/log.h +./templates.o: ../../../../winix/winixd/core/logmanipulators.h +./templates.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h ./templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h ./templates.o: ../../../../morm/src/jsonexpression.h ./templates.o: ../../../../morm/src/postgresqlexpression.h @@ -1012,34 +1031,10 @@ ./templates.o: ../../../../morm/src/postgresqlconnector.h ./templates.o: ../../../../morm/src/postgresqlqueryresult.h ./templates.o: ../../../../morm/src/transaction.h -./templates.o: ../../../../winix/winixd/core/log.h ./templates.o: ../../../../winix/winixd/core/synchro.h ./templates.o: ../../../../winix/winixd/core/filelog.h ./templates.o: ../../../../winix/winixd/core/lock.h -./templates.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h -./templates.o: ../../../../winix/winixd/core/plugindata.h -./templates.o: ../../../../winix/winixd/core/winixbase.h -./templates.o: ../../../../winix/winixd/core/dirs.h -./templates.o: ../../../../winix/winixd/core/dircontainer.h -./templates.o: ../../../../winix/winixd/db/db.h -./templates.o: ../../../../winix/winixd/db/dbbase.h -./templates.o: ../../../../winix/winixd/db/dbconn.h -./templates.o: ../../../../winix/winixd/db/dbtextstream.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: ../../../../pikotools/src/convert/convert.h -./templates.o: ../../../../pikotools/src/convert/inttostr.h -./templates.o: ../../../../pikotools/src/convert/patternreplacer.h -./templates.o: ../../../../pikotools/src/convert/strtoint.h -./templates.o: ../../../../pikotools/src/convert/text.h -./templates.o: ../../../../pikotools/src/convert/double.h -./templates.o: ../../../../winix/winixd/core/error.h -./templates.o: ../../../../winix/winixd/models/user.h -./templates.o: ../../../../winix/winixd/templates/misc.h -./templates.o: ../../../../winix/winixd/templates/localefilter.h -./templates.o: ../../../../winix/winixd/templates/locale.h +./templates.o: ../../../../winix/winixd/core/synchro.h ./templates.o: ../../../../pikotools/src/convert/patternreplacer.h ./templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h ./templates.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h @@ -1049,33 +1044,50 @@ ./templates.o: ../../../../ezc/src/models.h ./templates.o: ../../../../ezc/src/patternparser.h ./templates.o: ../../../../winix/winixd/templates/htmltextstream.h +./templates.o: ../../../../winix/winixd/core/error.h +./templates.o: ../../../../winix/winixd/core/config.h +./templates.o: ../../../../winix/winixd/core/textstream.h ./templates.o: ../../../../winix/winixd/models/winixmodel.h -./templates.o: ../../../../winix/winixd/models/winixmodelconnector.h +./templates.o: ../../../../winix/winixd/core/header.h +./templates.o: ../../../../winix/winixd/core/compress.h +./templates.o: ../../../../winix/winixd/core/winixbase.h +./templates.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h +./templates.o: ../../../../winix/winixd/core/plugindata.h +./templates.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./templates.o: ../../../../winix/winixd/core/mount.h +./templates.o: ../../../../winix/winixd/core/mounts.h +./templates.o: ../../../../winix/winixd/db/db.h +./templates.o: ../../../../winix/winixd/db/dbbase.h +./templates.o: ../../../../winix/winixd/db/dbconn.h +./templates.o: ../../../../winix/winixd/db/dbtextstream.h +./templates.o: ../../../../winix/winixd/core/textstream.h +./templates.o: ../../../../winix/winixd/core/misc.h +./templates.o: ../../../../winix/winixd/core/winix_const.h +./templates.o: ../../../../pikotools/src/convert/convert.h +./templates.o: ../../../../pikotools/src/convert/inttostr.h +./templates.o: ../../../../pikotools/src/convert/patternreplacer.h +./templates.o: ../../../../pikotools/src/convert/strtoint.h +./templates.o: ../../../../pikotools/src/convert/text.h +./templates.o: ../../../../pikotools/src/convert/double.h +./templates.o: ../../../../winix/winixd/core/error.h +./templates.o: ../../../../winix/winixd/models/user.h ./templates.o: ../../../../winix/winixd/models/group.h ./templates.o: ../../../../winix/winixd/core/dircontainer.h -./templates.o: ../../../../winix/winixd/models/item.h -./templates.o: ../../../../winix/winixd/models/itemcontent.h -./templates.o: ../../../../winix/winixd/templates/htmltextstream.h ./templates.o: ../../../../winix/winixd/core/ugcontainer.h ./templates.o: ../../../../winix/winixd/core/request.h -./templates.o: ../../../../winix/winixd/core/mounts.h -./templates.o: ../../../../winix/winixd/core/mount.h -./templates.o: ../../../../winix/winixd/core/error.h ./templates.o: ../../../../winix/winixd/core/mountparser.h -./templates.o: ../../../../winix/winixd/core/config.h -./templates.o: ../../../../winix/winixd/core/crypt.h -./templates.o: ../../../../winix/winixd/core/run.h -./templates.o: ../../../../winix/winixd/core/users.h -./templates.o: ../../../../winix/winixd/core/ugcontainer.h -./templates.o: ../../../../winix/winixd/core/lastcontainer.h ./templates.o: ../../../../winix/winixd/core/cur.h ./templates.o: ../../../../winix/winixd/core/session.h ./templates.o: ../../../../winix/winixd/core/rebus.h -./templates.o: ../../../../winix/winixd/core/textstream.h ./templates.o: ../../../../winix/winixd/core/ipban.h -./templates.o: ../../../../winix/winixd/models/winixmodel.h -./templates.o: ../../../../winix/winixd/core/groups.h ./templates.o: ../../../../winix/winixd/core/loadavg.h +./templates.o: ../../../../winix/winixd/core/dirs.h +./templates.o: ../../../../winix/winixd/core/dircontainer.h +./templates.o: ../../../../winix/winixd/core/crypt.h +./templates.o: ../../../../winix/winixd/core/run.h +./templates.o: ../../../../winix/winixd/core/users.h +./templates.o: ../../../../winix/winixd/core/groups.h +./templates.o: ../../../../winix/winixd/core/ugcontainer.h ./templates.o: ../../../../winix/winixd/core/image.h ./templates.o: ../../../../winix/winixd/core/threadmanager.h ./templates.o: ../../../../winix/winixd/models/winixmodelconnector.h @@ -1088,19 +1100,17 @@ ./templates.o: ../../../../winix/winixd/core/basethread.h ./templates.o: ../../../../winix/winixd/notify/templatesnotify.h ./templates.o: ../../../../winix/winixd/core/users.h +./templates.o: ../../../../winix/winixd/core/lastcontainer.h ./templates.o: ../../../../winix/winixd/core/timezones.h ./templates.o: ../../../../winix/winixd/core/timezone.h thread.h tdb.h ./templates.o: ../../../../winix/winixd/db/dbbase.h reply.h ./templates.o: ../../../../winix/winixd/functions/functionbase.h -./templates.o: ../../../../winix/winixd/core/request.h -./templates.o: ../../../../winix/winixd/core/header.h ./templates.o: ../../../../winix/winixd/core/winixrequest.h ./templates.o: ../../../../winix/winixd/core/winixsystem.h ./templates.o: ../../../../winix/winixd/core/cur.h ./templates.o: ../../../../winix/winixd/core/sessionmanager.h ./templates.o: ../../../../winix/winixd/core/sessioncontainer.h ./templates.o: ../../../../winix/winixd/core/ipbancontainer.h -./templates.o: ../../../../winix/winixd/core/system.h ./templates.o: ../../../../winix/winixd/core/sessionidmanager.h ./templates.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./templates.o: ../../../../winix/winixd/core/slog.h funthread.h threadfiles.h @@ -1116,6 +1126,7 @@ ./templates.o: ../../../../winix/winixd/functions/functions.h ./templates.o: ../../../../winix/winixd/functions/functionbase.h ./templates.o: ../../../../winix/winixd/functions/functionparser.h +./templates.o: ../../../../winix/winixd/core/dirs.h ./templates.o: ../../../../winix/winixd/functions/account.h ./templates.o: ../../../../winix/winixd/functions/adduser.h ./templates.o: ../../../../winix/winixd/functions/cat.h @@ -1271,15 +1282,6 @@ ./threadinfo.o: threadinfo.h ../../../../winix/winixd/core/system.h ./threadinfo.o: ../../../../winix/winixd/core/job.h ./threadinfo.o: ../../../../winix/winixd/core/basethread.h -./threadinfo.o: ../../../../winix/winixd/core/synchro.h -./threadinfo.o: ../../../../winix/winixd/core/winixmodeldeprecated.h -./threadinfo.o: ../../../../winix/winixd/core/winixbase.h -./threadinfo.o: ../../../../winix/winixd/core/config.h -./threadinfo.o: ../../../../pikotools/src/space/spaceparser.h -./threadinfo.o: ../../../../pikotools/src/space/space.h -./threadinfo.o: ../../../../pikotools/src/convert/baseparser.h -./threadinfo.o: ../../../../pikotools/src/textstream/textstream.h -./threadinfo.o: ../../../../pikotools/src/textstream/stream.h ./threadinfo.o: ../../../../pikotools/src/space/space.h ./threadinfo.o: ../../../../pikotools/src/textstream/types.h ./threadinfo.o: ../../../../pikotools/src/convert/inttostr.h @@ -1287,24 +1289,28 @@ ./threadinfo.o: ../../../../pikotools/src/textstream/stream.h ./threadinfo.o: ../../../../pikotools/src/utf8/utf8_templates.h ./threadinfo.o: ../../../../pikotools/src/utf8/utf8_private.h +./threadinfo.o: ../../../../winix/winixd/core/jobtask.h +./threadinfo.o: ../../../../winix/winixd/core/request.h +./threadinfo.o: ../../../../winix/winixd/core/requesttypes.h +./threadinfo.o: ../../../../pikotools/src/textstream/textstream.h +./threadinfo.o: ../../../../pikotools/src/textstream/stream.h ./threadinfo.o: ../../../../pikotools/src/date/date.h ./threadinfo.o: ../../../../pikotools/src/membuffer/membuffer.h ./threadinfo.o: ../../../../pikotools/src/textstream/types.h ./threadinfo.o: ../../../../pikotools/src/utf8/utf8_stream.h -./threadinfo.o: ../../../../winix/winixd/core/log.h -./threadinfo.o: ../../../../winix/winixd/core/logmanipulators.h -./threadinfo.o: ../../../../pikotools/src/log/log.h -./threadinfo.o: ../../../../pikotools/src/log/filelog.h -./threadinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h -./threadinfo.o: ../../../../morm/src/morm_types.h +./threadinfo.o: ../../../../winix/winixd/models/item.h +./threadinfo.o: ../../../../winix/winixd/models/winixmodel.h ./threadinfo.o: ../../../../morm/src/model.h ./threadinfo.o: ../../../../morm/src/modelconnector.h ./threadinfo.o: ../../../../morm/src/clearer.h ../../../../morm/src/ft.h ./threadinfo.o: ../../../../morm/src/dbconnector.h +./threadinfo.o: ../../../../pikotools/src/log/log.h +./threadinfo.o: ../../../../pikotools/src/log/filelog.h ./threadinfo.o: ../../../../morm/src/queryresult.h ./threadinfo.o: ../../../../morm/src/flatconnector.h ./threadinfo.o: ../../../../morm/src/dbexpression.h ./threadinfo.o: ../../../../morm/src/baseexpression.h +./threadinfo.o: ../../../../morm/src/morm_types.h ./threadinfo.o: ../../../../morm/src/modelenv.h ./threadinfo.o: ../../../../morm/src/modeldata.h ./threadinfo.o: ../../../../morm/src/cursorhelper.h @@ -1318,6 +1324,21 @@ ./threadinfo.o: ../../../../ezc/src/item.h ./threadinfo.o: ../../../../pikotools/src/convert/text.h ./threadinfo.o: ../../../../morm/src/flatexpression.h +./threadinfo.o: ../../../../winix/winixd/core/log.h +./threadinfo.o: ../../../../winix/winixd/models/winixmodelconnector.h +./threadinfo.o: ../../../../winix/winixd/models/itemcontent.h +./threadinfo.o: ../../../../winix/winixd/templates/htmltextstream.h +./threadinfo.o: ../../../../winix/winixd/templates/misc.h +./threadinfo.o: ../../../../winix/winixd/templates/localefilter.h +./threadinfo.o: ../../../../winix/winixd/templates/locale.h +./threadinfo.o: ../../../../pikotools/src/space/spaceparser.h +./threadinfo.o: ../../../../pikotools/src/space/space.h +./threadinfo.o: ../../../../pikotools/src/convert/baseparser.h +./threadinfo.o: ../../../../winix/winixd/core/winixbase.h +./threadinfo.o: ../../../../winix/winixd/core/config.h +./threadinfo.o: ../../../../winix/winixd/core/log.h +./threadinfo.o: ../../../../winix/winixd/core/logmanipulators.h +./threadinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h ./threadinfo.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h ./threadinfo.o: ../../../../morm/src/jsonexpression.h ./threadinfo.o: ../../../../morm/src/postgresqlexpression.h @@ -1325,34 +1346,10 @@ ./threadinfo.o: ../../../../morm/src/postgresqlconnector.h ./threadinfo.o: ../../../../morm/src/postgresqlqueryresult.h ./threadinfo.o: ../../../../morm/src/transaction.h -./threadinfo.o: ../../../../winix/winixd/core/log.h ./threadinfo.o: ../../../../winix/winixd/core/synchro.h ./threadinfo.o: ../../../../winix/winixd/core/filelog.h ./threadinfo.o: ../../../../winix/winixd/core/lock.h -./threadinfo.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h -./threadinfo.o: ../../../../winix/winixd/core/plugindata.h -./threadinfo.o: ../../../../winix/winixd/core/winixbase.h -./threadinfo.o: ../../../../winix/winixd/core/dirs.h -./threadinfo.o: ../../../../winix/winixd/core/dircontainer.h -./threadinfo.o: ../../../../winix/winixd/db/db.h -./threadinfo.o: ../../../../winix/winixd/db/dbbase.h -./threadinfo.o: ../../../../winix/winixd/db/dbconn.h -./threadinfo.o: ../../../../winix/winixd/db/dbtextstream.h -./threadinfo.o: ../../../../winix/winixd/core/textstream.h -./threadinfo.o: ../../../../winix/winixd/core/misc.h -./threadinfo.o: ../../../../winix/winixd/core/requesttypes.h -./threadinfo.o: ../../../../winix/winixd/core/winix_const.h -./threadinfo.o: ../../../../pikotools/src/convert/convert.h -./threadinfo.o: ../../../../pikotools/src/convert/inttostr.h -./threadinfo.o: ../../../../pikotools/src/convert/patternreplacer.h -./threadinfo.o: ../../../../pikotools/src/convert/strtoint.h -./threadinfo.o: ../../../../pikotools/src/convert/text.h -./threadinfo.o: ../../../../pikotools/src/convert/double.h -./threadinfo.o: ../../../../winix/winixd/core/error.h -./threadinfo.o: ../../../../winix/winixd/models/user.h -./threadinfo.o: ../../../../winix/winixd/templates/misc.h -./threadinfo.o: ../../../../winix/winixd/templates/localefilter.h -./threadinfo.o: ../../../../winix/winixd/templates/locale.h +./threadinfo.o: ../../../../winix/winixd/core/synchro.h ./threadinfo.o: ../../../../pikotools/src/convert/patternreplacer.h ./threadinfo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h ./threadinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h @@ -1363,33 +1360,50 @@ ./threadinfo.o: ../../../../ezc/src/models.h ./threadinfo.o: ../../../../ezc/src/patternparser.h ./threadinfo.o: ../../../../winix/winixd/templates/htmltextstream.h +./threadinfo.o: ../../../../winix/winixd/core/error.h +./threadinfo.o: ../../../../winix/winixd/core/config.h +./threadinfo.o: ../../../../winix/winixd/core/textstream.h ./threadinfo.o: ../../../../winix/winixd/models/winixmodel.h -./threadinfo.o: ../../../../winix/winixd/models/winixmodelconnector.h +./threadinfo.o: ../../../../winix/winixd/core/header.h +./threadinfo.o: ../../../../winix/winixd/core/compress.h +./threadinfo.o: ../../../../winix/winixd/core/winixbase.h +./threadinfo.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h +./threadinfo.o: ../../../../winix/winixd/core/plugindata.h +./threadinfo.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./threadinfo.o: ../../../../winix/winixd/core/mount.h +./threadinfo.o: ../../../../winix/winixd/core/mounts.h +./threadinfo.o: ../../../../winix/winixd/db/db.h +./threadinfo.o: ../../../../winix/winixd/db/dbbase.h +./threadinfo.o: ../../../../winix/winixd/db/dbconn.h +./threadinfo.o: ../../../../winix/winixd/db/dbtextstream.h +./threadinfo.o: ../../../../winix/winixd/core/textstream.h +./threadinfo.o: ../../../../winix/winixd/core/misc.h +./threadinfo.o: ../../../../winix/winixd/core/winix_const.h +./threadinfo.o: ../../../../pikotools/src/convert/convert.h +./threadinfo.o: ../../../../pikotools/src/convert/inttostr.h +./threadinfo.o: ../../../../pikotools/src/convert/patternreplacer.h +./threadinfo.o: ../../../../pikotools/src/convert/strtoint.h +./threadinfo.o: ../../../../pikotools/src/convert/text.h +./threadinfo.o: ../../../../pikotools/src/convert/double.h +./threadinfo.o: ../../../../winix/winixd/core/error.h +./threadinfo.o: ../../../../winix/winixd/models/user.h ./threadinfo.o: ../../../../winix/winixd/models/group.h ./threadinfo.o: ../../../../winix/winixd/core/dircontainer.h -./threadinfo.o: ../../../../winix/winixd/models/item.h -./threadinfo.o: ../../../../winix/winixd/models/itemcontent.h -./threadinfo.o: ../../../../winix/winixd/templates/htmltextstream.h ./threadinfo.o: ../../../../winix/winixd/core/ugcontainer.h ./threadinfo.o: ../../../../winix/winixd/core/request.h -./threadinfo.o: ../../../../winix/winixd/core/mounts.h -./threadinfo.o: ../../../../winix/winixd/core/mount.h -./threadinfo.o: ../../../../winix/winixd/core/error.h ./threadinfo.o: ../../../../winix/winixd/core/mountparser.h -./threadinfo.o: ../../../../winix/winixd/core/config.h -./threadinfo.o: ../../../../winix/winixd/core/crypt.h -./threadinfo.o: ../../../../winix/winixd/core/run.h -./threadinfo.o: ../../../../winix/winixd/core/users.h -./threadinfo.o: ../../../../winix/winixd/core/ugcontainer.h -./threadinfo.o: ../../../../winix/winixd/core/lastcontainer.h ./threadinfo.o: ../../../../winix/winixd/core/cur.h ./threadinfo.o: ../../../../winix/winixd/core/session.h ./threadinfo.o: ../../../../winix/winixd/core/rebus.h -./threadinfo.o: ../../../../winix/winixd/core/textstream.h ./threadinfo.o: ../../../../winix/winixd/core/ipban.h -./threadinfo.o: ../../../../winix/winixd/models/winixmodel.h -./threadinfo.o: ../../../../winix/winixd/core/groups.h ./threadinfo.o: ../../../../winix/winixd/core/loadavg.h +./threadinfo.o: ../../../../winix/winixd/core/dirs.h +./threadinfo.o: ../../../../winix/winixd/core/dircontainer.h +./threadinfo.o: ../../../../winix/winixd/core/crypt.h +./threadinfo.o: ../../../../winix/winixd/core/run.h +./threadinfo.o: ../../../../winix/winixd/core/users.h +./threadinfo.o: ../../../../winix/winixd/core/groups.h +./threadinfo.o: ../../../../winix/winixd/core/ugcontainer.h ./threadinfo.o: ../../../../winix/winixd/core/image.h ./threadinfo.o: ../../../../winix/winixd/core/threadmanager.h ./threadinfo.o: ../../../../winix/winixd/models/winixmodelconnector.h @@ -1402,6 +1416,7 @@ ./threadinfo.o: ../../../../winix/winixd/core/basethread.h ./threadinfo.o: ../../../../winix/winixd/notify/templatesnotify.h ./threadinfo.o: ../../../../winix/winixd/core/users.h +./threadinfo.o: ../../../../winix/winixd/core/lastcontainer.h ./threadinfo.o: ../../../../winix/winixd/core/timezones.h ./threadinfo.o: ../../../../winix/winixd/core/timezone.h thread.h tdb.h ./threadinfo.o: ../../../../winix/winixd/db/dbbase.h diff --git a/winixd/plugins/thread/init.cpp b/winixd/plugins/thread/init.cpp index 1a1a39b..982d4c0 100644 --- a/winixd/plugins/thread/init.cpp +++ b/winixd/plugins/thread/init.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2018, Tomasz Sowa + * Copyright (c) 2010-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -214,7 +214,7 @@ using namespace Thread; tdb.LogQueries(info.config->log_db_query); // thread_info and fun_show_threads are used in 'ticket' plugins too - info.set_dependency_for(thread_info); + thread_info.set_dependency((WinixModelDeprecated*)info.functions); thread_info.SetDb(info.db); thread_info.SetTDb(&tdb); diff --git a/winixd/plugins/ticket/Makefile.dep b/winixd/plugins/ticket/Makefile.dep index af312d0..4ac9954 100644 --- a/winixd/plugins/ticket/Makefile.dep +++ b/winixd/plugins/ticket/Makefile.dep @@ -104,32 +104,14 @@ ./createticket.o: ../../../../winix/winixd/core/textstream.h ./createticket.o: ../../../../winix/winixd/models/winixmodel.h ./createticket.o: ../../../../winix/winixd/core/header.h -./createticket.o: ../../../../winix/winixd/core/system.h -./createticket.o: ../../../../winix/winixd/core/job.h -./createticket.o: ../../../../winix/winixd/core/basethread.h -./createticket.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./createticket.o: ../../../../winix/winixd/core/compress.h ./createticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h ./createticket.o: ../../../../winix/winixd/core/plugindata.h -./createticket.o: ../../../../winix/winixd/core/dirs.h -./createticket.o: ../../../../winix/winixd/core/dircontainer.h -./createticket.o: ../../../../winix/winixd/core/request.h -./createticket.o: ../../../../winix/winixd/core/mounts.h +./createticket.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./createticket.o: ../../../../winix/winixd/core/mount.h +./createticket.o: ../../../../winix/winixd/core/mounts.h +./createticket.o: ../../../../winix/winixd/core/request.h ./createticket.o: ../../../../winix/winixd/core/mountparser.h -./createticket.o: ../../../../winix/winixd/core/crypt.h -./createticket.o: ../../../../winix/winixd/core/run.h -./createticket.o: ../../../../winix/winixd/core/users.h -./createticket.o: ../../../../winix/winixd/core/ugcontainer.h -./createticket.o: ../../../../winix/winixd/core/lastcontainer.h -./createticket.o: ../../../../winix/winixd/core/cur.h -./createticket.o: ../../../../winix/winixd/core/session.h -./createticket.o: ../../../../winix/winixd/core/rebus.h -./createticket.o: ../../../../winix/winixd/core/ipban.h -./createticket.o: ../../../../winix/winixd/core/groups.h -./createticket.o: ../../../../winix/winixd/core/loadavg.h -./createticket.o: ../../../../winix/winixd/core/image.h -./createticket.o: ../../../../winix/winixd/core/threadmanager.h -./createticket.o: ../../../../winix/winixd/models/winixmodelconnector.h ./createticket.o: ../../../../winix/winixd/notify/notify.h ./createticket.o: ../../../../winix/winixd/core/winixmodeldeprecated.h ./createticket.o: ../../../../winix/winixd/notify/notifypool.h @@ -139,21 +121,41 @@ ./createticket.o: ../../../../winix/winixd/core/basethread.h ./createticket.o: ../../../../winix/winixd/notify/templatesnotify.h ./createticket.o: ../../../../winix/winixd/core/users.h -./createticket.o: ../../../../winix/winixd/core/timezones.h -./createticket.o: ../../../../winix/winixd/core/timezone.h +./createticket.o: ../../../../winix/winixd/core/ugcontainer.h +./createticket.o: ../../../../winix/winixd/core/lastcontainer.h +./createticket.o: ../../../../winix/winixd/core/cur.h +./createticket.o: ../../../../winix/winixd/core/session.h +./createticket.o: ../../../../winix/winixd/core/rebus.h +./createticket.o: ../../../../winix/winixd/core/ipban.h ./createticket.o: ../../../../winix/winixd/core/winixrequest.h ./createticket.o: ../../../../winix/winixd/core/winixsystem.h +./createticket.o: ../../../../winix/winixd/core/system.h +./createticket.o: ../../../../winix/winixd/core/job.h +./createticket.o: ../../../../winix/winixd/core/basethread.h +./createticket.o: ../../../../winix/winixd/core/jobtask.h +./createticket.o: ../../../../winix/winixd/core/loadavg.h +./createticket.o: ../../../../winix/winixd/core/dirs.h +./createticket.o: ../../../../winix/winixd/core/dircontainer.h +./createticket.o: ../../../../winix/winixd/core/crypt.h +./createticket.o: ../../../../winix/winixd/core/run.h +./createticket.o: ../../../../winix/winixd/core/users.h +./createticket.o: ../../../../winix/winixd/core/groups.h +./createticket.o: ../../../../winix/winixd/core/image.h +./createticket.o: ../../../../winix/winixd/core/threadmanager.h +./createticket.o: ../../../../winix/winixd/models/winixmodelconnector.h +./createticket.o: ../../../../winix/winixd/core/timezones.h +./createticket.o: ../../../../winix/winixd/core/timezone.h ./createticket.o: ../../../../winix/winixd/core/cur.h ./createticket.o: ../../../../winix/winixd/core/sessionmanager.h ./createticket.o: ../../../../winix/winixd/core/sessioncontainer.h ./createticket.o: ../../../../winix/winixd/core/ipbancontainer.h -./createticket.o: ../../../../winix/winixd/core/system.h ./createticket.o: ../../../../winix/winixd/core/sessionidmanager.h ./createticket.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./createticket.o: ../../../../winix/winixd/core/slog.h ticketinfo.h ./createticket.o: ../../../../winix/winixd/functions/functions.h ./createticket.o: ../../../../winix/winixd/functions/functionbase.h ./createticket.o: ../../../../winix/winixd/functions/functionparser.h +./createticket.o: ../../../../winix/winixd/core/dirs.h ./createticket.o: ../../../../winix/winixd/functions/account.h ./createticket.o: ../../../../winix/winixd/functions/adduser.h ./createticket.o: ../../../../winix/winixd/functions/cat.h @@ -275,15 +277,13 @@ ./editticket.o: ../../../../winix/winixd/core/system.h ./editticket.o: ../../../../winix/winixd/core/job.h ./editticket.o: ../../../../winix/winixd/core/basethread.h -./editticket.o: ../../../../winix/winixd/core/winixmodeldeprecated.h -./editticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h -./editticket.o: ../../../../winix/winixd/core/plugindata.h -./editticket.o: ../../../../winix/winixd/core/winixbase.h -./editticket.o: ../../../../winix/winixd/core/dirs.h -./editticket.o: ../../../../winix/winixd/core/dircontainer.h -./editticket.o: ../../../../winix/winixd/db/db.h -./editticket.o: ../../../../winix/winixd/db/dbbase.h -./editticket.o: ../../../../winix/winixd/models/user.h +./editticket.o: ../../../../winix/winixd/core/jobtask.h +./editticket.o: ../../../../winix/winixd/core/request.h +./editticket.o: ../../../../winix/winixd/models/item.h +./editticket.o: ../../../../winix/winixd/models/winixmodel.h +./editticket.o: ../../../../winix/winixd/models/winixmodelconnector.h +./editticket.o: ../../../../winix/winixd/models/itemcontent.h +./editticket.o: ../../../../winix/winixd/templates/htmltextstream.h ./editticket.o: ../../../../winix/winixd/templates/misc.h ./editticket.o: ../../../../winix/winixd/templates/localefilter.h ./editticket.o: ../../../../winix/winixd/templates/locale.h @@ -297,33 +297,38 @@ ./editticket.o: ../../../../ezc/src/models.h ./editticket.o: ../../../../ezc/src/patternparser.h ./editticket.o: ../../../../winix/winixd/templates/htmltextstream.h +./editticket.o: ../../../../winix/winixd/core/error.h +./editticket.o: ../../../../winix/winixd/core/config.h +./editticket.o: ../../../../winix/winixd/core/textstream.h ./editticket.o: ../../../../winix/winixd/models/winixmodel.h -./editticket.o: ../../../../winix/winixd/models/winixmodelconnector.h +./editticket.o: ../../../../winix/winixd/core/header.h +./editticket.o: ../../../../winix/winixd/core/compress.h +./editticket.o: ../../../../winix/winixd/core/winixbase.h +./editticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h +./editticket.o: ../../../../winix/winixd/core/plugindata.h +./editticket.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./editticket.o: ../../../../winix/winixd/core/mount.h +./editticket.o: ../../../../winix/winixd/core/mounts.h +./editticket.o: ../../../../winix/winixd/db/db.h +./editticket.o: ../../../../winix/winixd/db/dbbase.h +./editticket.o: ../../../../winix/winixd/models/user.h ./editticket.o: ../../../../winix/winixd/models/group.h ./editticket.o: ../../../../winix/winixd/core/dircontainer.h -./editticket.o: ../../../../winix/winixd/models/item.h -./editticket.o: ../../../../winix/winixd/models/itemcontent.h -./editticket.o: ../../../../winix/winixd/templates/htmltextstream.h ./editticket.o: ../../../../winix/winixd/core/ugcontainer.h ./editticket.o: ../../../../winix/winixd/core/request.h -./editticket.o: ../../../../winix/winixd/core/mounts.h -./editticket.o: ../../../../winix/winixd/core/mount.h -./editticket.o: ../../../../winix/winixd/core/error.h ./editticket.o: ../../../../winix/winixd/core/mountparser.h -./editticket.o: ../../../../winix/winixd/core/config.h -./editticket.o: ../../../../winix/winixd/core/crypt.h -./editticket.o: ../../../../winix/winixd/core/run.h -./editticket.o: ../../../../winix/winixd/core/users.h -./editticket.o: ../../../../winix/winixd/core/ugcontainer.h -./editticket.o: ../../../../winix/winixd/core/lastcontainer.h ./editticket.o: ../../../../winix/winixd/core/cur.h ./editticket.o: ../../../../winix/winixd/core/session.h ./editticket.o: ../../../../winix/winixd/core/rebus.h -./editticket.o: ../../../../winix/winixd/core/textstream.h ./editticket.o: ../../../../winix/winixd/core/ipban.h -./editticket.o: ../../../../winix/winixd/models/winixmodel.h -./editticket.o: ../../../../winix/winixd/core/groups.h ./editticket.o: ../../../../winix/winixd/core/loadavg.h +./editticket.o: ../../../../winix/winixd/core/dirs.h +./editticket.o: ../../../../winix/winixd/core/dircontainer.h +./editticket.o: ../../../../winix/winixd/core/crypt.h +./editticket.o: ../../../../winix/winixd/core/run.h +./editticket.o: ../../../../winix/winixd/core/users.h +./editticket.o: ../../../../winix/winixd/core/groups.h +./editticket.o: ../../../../winix/winixd/core/ugcontainer.h ./editticket.o: ../../../../winix/winixd/core/image.h ./editticket.o: ../../../../winix/winixd/core/threadmanager.h ./editticket.o: ../../../../winix/winixd/models/winixmodelconnector.h @@ -336,19 +341,19 @@ ./editticket.o: ../../../../winix/winixd/core/basethread.h ./editticket.o: ../../../../winix/winixd/notify/templatesnotify.h ./editticket.o: ../../../../winix/winixd/core/users.h +./editticket.o: ../../../../winix/winixd/core/lastcontainer.h ./editticket.o: ../../../../winix/winixd/core/timezones.h ./editticket.o: ../../../../winix/winixd/core/timezone.h ./editticket.o: ../../../../winix/winixd/functions/functions.h ./editticket.o: ../../../../winix/winixd/functions/functionbase.h ./editticket.o: ../../../../winix/winixd/functions/functionparser.h ./editticket.o: ../../../../winix/winixd/core/cur.h +./editticket.o: ../../../../winix/winixd/core/dirs.h ./editticket.o: ../../../../winix/winixd/functions/account.h ./editticket.o: ../../../../winix/winixd/functions/adduser.h ./editticket.o: ../../../../winix/winixd/functions/cat.h ./editticket.o: ../../../../winix/winixd/functions/chmod.h ./editticket.o: ../../../../winix/winixd/functions/privchanger.h -./editticket.o: ../../../../winix/winixd/core/request.h -./editticket.o: ../../../../winix/winixd/core/header.h ./editticket.o: ../../../../winix/winixd/functions/chown.h ./editticket.o: ../../../../winix/winixd/functions/ckeditor.h ./editticket.o: ../../../../winix/winixd/functions/cp.h @@ -393,7 +398,6 @@ ./editticket.o: ../../../../winix/winixd/core/sessionmanager.h ./editticket.o: ../../../../winix/winixd/core/sessioncontainer.h ./editticket.o: ../../../../winix/winixd/core/ipbancontainer.h -./editticket.o: ../../../../winix/winixd/core/system.h ./editticket.o: ../../../../winix/winixd/core/sessionidmanager.h ./editticket.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./editticket.o: ../../../../winix/winixd/core/slog.h @@ -474,15 +478,13 @@ ./funticket.o: ../../../../winix/winixd/core/system.h ./funticket.o: ../../../../winix/winixd/core/job.h ./funticket.o: ../../../../winix/winixd/core/basethread.h -./funticket.o: ../../../../winix/winixd/core/winixmodeldeprecated.h -./funticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h -./funticket.o: ../../../../winix/winixd/core/plugindata.h -./funticket.o: ../../../../winix/winixd/core/winixbase.h -./funticket.o: ../../../../winix/winixd/core/dirs.h -./funticket.o: ../../../../winix/winixd/core/dircontainer.h -./funticket.o: ../../../../winix/winixd/db/db.h -./funticket.o: ../../../../winix/winixd/db/dbbase.h -./funticket.o: ../../../../winix/winixd/models/user.h +./funticket.o: ../../../../winix/winixd/core/jobtask.h +./funticket.o: ../../../../winix/winixd/core/request.h +./funticket.o: ../../../../winix/winixd/models/item.h +./funticket.o: ../../../../winix/winixd/models/winixmodel.h +./funticket.o: ../../../../winix/winixd/models/winixmodelconnector.h +./funticket.o: ../../../../winix/winixd/models/itemcontent.h +./funticket.o: ../../../../winix/winixd/templates/htmltextstream.h ./funticket.o: ../../../../winix/winixd/templates/misc.h ./funticket.o: ../../../../winix/winixd/templates/localefilter.h ./funticket.o: ../../../../winix/winixd/templates/locale.h @@ -495,33 +497,38 @@ ./funticket.o: ../../../../ezc/src/models.h ./funticket.o: ../../../../ezc/src/patternparser.h ./funticket.o: ../../../../winix/winixd/templates/htmltextstream.h +./funticket.o: ../../../../winix/winixd/core/error.h +./funticket.o: ../../../../winix/winixd/core/config.h +./funticket.o: ../../../../winix/winixd/core/textstream.h ./funticket.o: ../../../../winix/winixd/models/winixmodel.h -./funticket.o: ../../../../winix/winixd/models/winixmodelconnector.h +./funticket.o: ../../../../winix/winixd/core/header.h +./funticket.o: ../../../../winix/winixd/core/compress.h +./funticket.o: ../../../../winix/winixd/core/winixbase.h +./funticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h +./funticket.o: ../../../../winix/winixd/core/plugindata.h +./funticket.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./funticket.o: ../../../../winix/winixd/core/mount.h +./funticket.o: ../../../../winix/winixd/core/mounts.h +./funticket.o: ../../../../winix/winixd/db/db.h +./funticket.o: ../../../../winix/winixd/db/dbbase.h +./funticket.o: ../../../../winix/winixd/models/user.h ./funticket.o: ../../../../winix/winixd/models/group.h ./funticket.o: ../../../../winix/winixd/core/dircontainer.h -./funticket.o: ../../../../winix/winixd/models/item.h -./funticket.o: ../../../../winix/winixd/models/itemcontent.h -./funticket.o: ../../../../winix/winixd/templates/htmltextstream.h ./funticket.o: ../../../../winix/winixd/core/ugcontainer.h ./funticket.o: ../../../../winix/winixd/core/request.h -./funticket.o: ../../../../winix/winixd/core/mounts.h -./funticket.o: ../../../../winix/winixd/core/mount.h -./funticket.o: ../../../../winix/winixd/core/error.h ./funticket.o: ../../../../winix/winixd/core/mountparser.h -./funticket.o: ../../../../winix/winixd/core/config.h -./funticket.o: ../../../../winix/winixd/core/crypt.h -./funticket.o: ../../../../winix/winixd/core/run.h -./funticket.o: ../../../../winix/winixd/core/users.h -./funticket.o: ../../../../winix/winixd/core/ugcontainer.h -./funticket.o: ../../../../winix/winixd/core/lastcontainer.h ./funticket.o: ../../../../winix/winixd/core/cur.h ./funticket.o: ../../../../winix/winixd/core/session.h ./funticket.o: ../../../../winix/winixd/core/rebus.h -./funticket.o: ../../../../winix/winixd/core/textstream.h ./funticket.o: ../../../../winix/winixd/core/ipban.h -./funticket.o: ../../../../winix/winixd/models/winixmodel.h -./funticket.o: ../../../../winix/winixd/core/groups.h ./funticket.o: ../../../../winix/winixd/core/loadavg.h +./funticket.o: ../../../../winix/winixd/core/dirs.h +./funticket.o: ../../../../winix/winixd/core/dircontainer.h +./funticket.o: ../../../../winix/winixd/core/crypt.h +./funticket.o: ../../../../winix/winixd/core/run.h +./funticket.o: ../../../../winix/winixd/core/users.h +./funticket.o: ../../../../winix/winixd/core/groups.h +./funticket.o: ../../../../winix/winixd/core/ugcontainer.h ./funticket.o: ../../../../winix/winixd/core/image.h ./funticket.o: ../../../../winix/winixd/core/threadmanager.h ./funticket.o: ../../../../winix/winixd/models/winixmodelconnector.h @@ -534,19 +541,19 @@ ./funticket.o: ../../../../winix/winixd/core/basethread.h ./funticket.o: ../../../../winix/winixd/notify/templatesnotify.h ./funticket.o: ../../../../winix/winixd/core/users.h +./funticket.o: ../../../../winix/winixd/core/lastcontainer.h ./funticket.o: ../../../../winix/winixd/core/timezones.h ./funticket.o: ../../../../winix/winixd/core/timezone.h ./funticket.o: ../../../../winix/winixd/functions/functions.h ./funticket.o: ../../../../winix/winixd/functions/functionbase.h ./funticket.o: ../../../../winix/winixd/functions/functionparser.h ./funticket.o: ../../../../winix/winixd/core/cur.h +./funticket.o: ../../../../winix/winixd/core/dirs.h ./funticket.o: ../../../../winix/winixd/functions/account.h ./funticket.o: ../../../../winix/winixd/functions/adduser.h ./funticket.o: ../../../../winix/winixd/functions/cat.h ./funticket.o: ../../../../winix/winixd/functions/chmod.h ./funticket.o: ../../../../winix/winixd/functions/privchanger.h -./funticket.o: ../../../../winix/winixd/core/request.h -./funticket.o: ../../../../winix/winixd/core/header.h ./funticket.o: ../../../../winix/winixd/functions/chown.h ./funticket.o: ../../../../winix/winixd/functions/ckeditor.h ./funticket.o: ../../../../winix/winixd/functions/cp.h @@ -591,7 +598,6 @@ ./funticket.o: ../../../../winix/winixd/core/sessionmanager.h ./funticket.o: ../../../../winix/winixd/core/sessioncontainer.h ./funticket.o: ../../../../winix/winixd/core/ipbancontainer.h -./funticket.o: ../../../../winix/winixd/core/system.h ./funticket.o: ../../../../winix/winixd/core/sessionidmanager.h ./funticket.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./funticket.o: ../../../../winix/winixd/core/slog.h @@ -665,15 +671,13 @@ ./init.o: ../../../../winix/winixd/core/system.h ./init.o: ../../../../winix/winixd/core/job.h ./init.o: ../../../../winix/winixd/core/basethread.h -./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h -./init.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h -./init.o: ../../../../winix/winixd/core/plugindata.h -./init.o: ../../../../winix/winixd/core/winixbase.h -./init.o: ../../../../winix/winixd/core/dirs.h -./init.o: ../../../../winix/winixd/core/dircontainer.h -./init.o: ../../../../winix/winixd/db/db.h -./init.o: ../../../../winix/winixd/db/dbbase.h -./init.o: ../../../../winix/winixd/models/user.h +./init.o: ../../../../winix/winixd/core/jobtask.h +./init.o: ../../../../winix/winixd/core/request.h +./init.o: ../../../../winix/winixd/models/item.h +./init.o: ../../../../winix/winixd/models/winixmodel.h +./init.o: ../../../../winix/winixd/models/winixmodelconnector.h +./init.o: ../../../../winix/winixd/models/itemcontent.h +./init.o: ../../../../winix/winixd/templates/htmltextstream.h ./init.o: ../../../../winix/winixd/templates/misc.h ./init.o: ../../../../winix/winixd/templates/localefilter.h ./init.o: ../../../../winix/winixd/templates/locale.h @@ -685,33 +689,38 @@ ./init.o: ../../../../ezc/src/expressionparser.h ../../../../ezc/src/models.h ./init.o: ../../../../ezc/src/patternparser.h ./init.o: ../../../../winix/winixd/templates/htmltextstream.h +./init.o: ../../../../winix/winixd/core/error.h +./init.o: ../../../../winix/winixd/core/config.h +./init.o: ../../../../winix/winixd/core/textstream.h ./init.o: ../../../../winix/winixd/models/winixmodel.h -./init.o: ../../../../winix/winixd/models/winixmodelconnector.h +./init.o: ../../../../winix/winixd/core/header.h +./init.o: ../../../../winix/winixd/core/compress.h +./init.o: ../../../../winix/winixd/core/winixbase.h +./init.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h +./init.o: ../../../../winix/winixd/core/plugindata.h +./init.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./init.o: ../../../../winix/winixd/core/mount.h +./init.o: ../../../../winix/winixd/core/mounts.h +./init.o: ../../../../winix/winixd/db/db.h +./init.o: ../../../../winix/winixd/db/dbbase.h +./init.o: ../../../../winix/winixd/models/user.h ./init.o: ../../../../winix/winixd/models/group.h ./init.o: ../../../../winix/winixd/core/dircontainer.h -./init.o: ../../../../winix/winixd/models/item.h -./init.o: ../../../../winix/winixd/models/itemcontent.h -./init.o: ../../../../winix/winixd/templates/htmltextstream.h ./init.o: ../../../../winix/winixd/core/ugcontainer.h ./init.o: ../../../../winix/winixd/core/request.h -./init.o: ../../../../winix/winixd/core/mounts.h -./init.o: ../../../../winix/winixd/core/mount.h -./init.o: ../../../../winix/winixd/core/error.h ./init.o: ../../../../winix/winixd/core/mountparser.h -./init.o: ../../../../winix/winixd/core/config.h -./init.o: ../../../../winix/winixd/core/crypt.h -./init.o: ../../../../winix/winixd/core/run.h -./init.o: ../../../../winix/winixd/core/users.h -./init.o: ../../../../winix/winixd/core/ugcontainer.h -./init.o: ../../../../winix/winixd/core/lastcontainer.h ./init.o: ../../../../winix/winixd/core/cur.h ./init.o: ../../../../winix/winixd/core/session.h ./init.o: ../../../../winix/winixd/core/rebus.h -./init.o: ../../../../winix/winixd/core/textstream.h ./init.o: ../../../../winix/winixd/core/ipban.h -./init.o: ../../../../winix/winixd/models/winixmodel.h -./init.o: ../../../../winix/winixd/core/groups.h ./init.o: ../../../../winix/winixd/core/loadavg.h +./init.o: ../../../../winix/winixd/core/dirs.h +./init.o: ../../../../winix/winixd/core/dircontainer.h +./init.o: ../../../../winix/winixd/core/crypt.h +./init.o: ../../../../winix/winixd/core/run.h +./init.o: ../../../../winix/winixd/core/users.h +./init.o: ../../../../winix/winixd/core/groups.h +./init.o: ../../../../winix/winixd/core/ugcontainer.h ./init.o: ../../../../winix/winixd/core/image.h ./init.o: ../../../../winix/winixd/core/threadmanager.h ./init.o: ../../../../winix/winixd/models/winixmodelconnector.h @@ -724,19 +733,19 @@ ./init.o: ../../../../winix/winixd/core/basethread.h ./init.o: ../../../../winix/winixd/notify/templatesnotify.h ./init.o: ../../../../winix/winixd/core/users.h +./init.o: ../../../../winix/winixd/core/lastcontainer.h ./init.o: ../../../../winix/winixd/core/timezones.h ./init.o: ../../../../winix/winixd/core/timezone.h ./init.o: ../../../../winix/winixd/functions/functions.h ./init.o: ../../../../winix/winixd/functions/functionbase.h ./init.o: ../../../../winix/winixd/functions/functionparser.h ./init.o: ../../../../winix/winixd/core/cur.h +./init.o: ../../../../winix/winixd/core/dirs.h ./init.o: ../../../../winix/winixd/functions/account.h ./init.o: ../../../../winix/winixd/functions/adduser.h ./init.o: ../../../../winix/winixd/functions/cat.h ./init.o: ../../../../winix/winixd/functions/chmod.h ./init.o: ../../../../winix/winixd/functions/privchanger.h -./init.o: ../../../../winix/winixd/core/request.h -./init.o: ../../../../winix/winixd/core/header.h ./init.o: ../../../../winix/winixd/functions/chown.h ./init.o: ../../../../winix/winixd/functions/ckeditor.h ./init.o: ../../../../winix/winixd/functions/cp.h @@ -781,7 +790,6 @@ ./init.o: ../../../../winix/winixd/core/sessionmanager.h ./init.o: ../../../../winix/winixd/core/sessioncontainer.h ./init.o: ../../../../winix/winixd/core/ipbancontainer.h -./init.o: ../../../../winix/winixd/core/system.h ./init.o: ../../../../winix/winixd/core/sessionidmanager.h ./init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./init.o: ../../../../winix/winixd/core/slog.h @@ -877,15 +885,13 @@ ./showtickets.o: ../../../../winix/winixd/core/system.h ./showtickets.o: ../../../../winix/winixd/core/job.h ./showtickets.o: ../../../../winix/winixd/core/basethread.h -./showtickets.o: ../../../../winix/winixd/core/winixmodeldeprecated.h -./showtickets.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h -./showtickets.o: ../../../../winix/winixd/core/plugindata.h -./showtickets.o: ../../../../winix/winixd/core/winixbase.h -./showtickets.o: ../../../../winix/winixd/core/dirs.h -./showtickets.o: ../../../../winix/winixd/core/dircontainer.h -./showtickets.o: ../../../../winix/winixd/db/db.h -./showtickets.o: ../../../../winix/winixd/db/dbbase.h -./showtickets.o: ../../../../winix/winixd/models/user.h +./showtickets.o: ../../../../winix/winixd/core/jobtask.h +./showtickets.o: ../../../../winix/winixd/core/request.h +./showtickets.o: ../../../../winix/winixd/models/item.h +./showtickets.o: ../../../../winix/winixd/models/winixmodel.h +./showtickets.o: ../../../../winix/winixd/models/winixmodelconnector.h +./showtickets.o: ../../../../winix/winixd/models/itemcontent.h +./showtickets.o: ../../../../winix/winixd/templates/htmltextstream.h ./showtickets.o: ../../../../winix/winixd/templates/misc.h ./showtickets.o: ../../../../winix/winixd/templates/localefilter.h ./showtickets.o: ../../../../winix/winixd/templates/locale.h @@ -899,33 +905,38 @@ ./showtickets.o: ../../../../ezc/src/models.h ./showtickets.o: ../../../../ezc/src/patternparser.h ./showtickets.o: ../../../../winix/winixd/templates/htmltextstream.h +./showtickets.o: ../../../../winix/winixd/core/error.h +./showtickets.o: ../../../../winix/winixd/core/config.h +./showtickets.o: ../../../../winix/winixd/core/textstream.h ./showtickets.o: ../../../../winix/winixd/models/winixmodel.h -./showtickets.o: ../../../../winix/winixd/models/winixmodelconnector.h +./showtickets.o: ../../../../winix/winixd/core/header.h +./showtickets.o: ../../../../winix/winixd/core/compress.h +./showtickets.o: ../../../../winix/winixd/core/winixbase.h +./showtickets.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h +./showtickets.o: ../../../../winix/winixd/core/plugindata.h +./showtickets.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./showtickets.o: ../../../../winix/winixd/core/mount.h +./showtickets.o: ../../../../winix/winixd/core/mounts.h +./showtickets.o: ../../../../winix/winixd/db/db.h +./showtickets.o: ../../../../winix/winixd/db/dbbase.h +./showtickets.o: ../../../../winix/winixd/models/user.h ./showtickets.o: ../../../../winix/winixd/models/group.h ./showtickets.o: ../../../../winix/winixd/core/dircontainer.h -./showtickets.o: ../../../../winix/winixd/models/item.h -./showtickets.o: ../../../../winix/winixd/models/itemcontent.h -./showtickets.o: ../../../../winix/winixd/templates/htmltextstream.h ./showtickets.o: ../../../../winix/winixd/core/ugcontainer.h ./showtickets.o: ../../../../winix/winixd/core/request.h -./showtickets.o: ../../../../winix/winixd/core/mounts.h -./showtickets.o: ../../../../winix/winixd/core/mount.h -./showtickets.o: ../../../../winix/winixd/core/error.h ./showtickets.o: ../../../../winix/winixd/core/mountparser.h -./showtickets.o: ../../../../winix/winixd/core/config.h -./showtickets.o: ../../../../winix/winixd/core/crypt.h -./showtickets.o: ../../../../winix/winixd/core/run.h -./showtickets.o: ../../../../winix/winixd/core/users.h -./showtickets.o: ../../../../winix/winixd/core/ugcontainer.h -./showtickets.o: ../../../../winix/winixd/core/lastcontainer.h ./showtickets.o: ../../../../winix/winixd/core/cur.h ./showtickets.o: ../../../../winix/winixd/core/session.h ./showtickets.o: ../../../../winix/winixd/core/rebus.h -./showtickets.o: ../../../../winix/winixd/core/textstream.h ./showtickets.o: ../../../../winix/winixd/core/ipban.h -./showtickets.o: ../../../../winix/winixd/models/winixmodel.h -./showtickets.o: ../../../../winix/winixd/core/groups.h ./showtickets.o: ../../../../winix/winixd/core/loadavg.h +./showtickets.o: ../../../../winix/winixd/core/dirs.h +./showtickets.o: ../../../../winix/winixd/core/dircontainer.h +./showtickets.o: ../../../../winix/winixd/core/crypt.h +./showtickets.o: ../../../../winix/winixd/core/run.h +./showtickets.o: ../../../../winix/winixd/core/users.h +./showtickets.o: ../../../../winix/winixd/core/groups.h +./showtickets.o: ../../../../winix/winixd/core/ugcontainer.h ./showtickets.o: ../../../../winix/winixd/core/image.h ./showtickets.o: ../../../../winix/winixd/core/threadmanager.h ./showtickets.o: ../../../../winix/winixd/models/winixmodelconnector.h @@ -938,19 +949,19 @@ ./showtickets.o: ../../../../winix/winixd/core/basethread.h ./showtickets.o: ../../../../winix/winixd/notify/templatesnotify.h ./showtickets.o: ../../../../winix/winixd/core/users.h +./showtickets.o: ../../../../winix/winixd/core/lastcontainer.h ./showtickets.o: ../../../../winix/winixd/core/timezones.h ./showtickets.o: ../../../../winix/winixd/core/timezone.h ./showtickets.o: ../../../../winix/winixd/functions/functions.h ./showtickets.o: ../../../../winix/winixd/functions/functionbase.h ./showtickets.o: ../../../../winix/winixd/functions/functionparser.h ./showtickets.o: ../../../../winix/winixd/core/cur.h +./showtickets.o: ../../../../winix/winixd/core/dirs.h ./showtickets.o: ../../../../winix/winixd/functions/account.h ./showtickets.o: ../../../../winix/winixd/functions/adduser.h ./showtickets.o: ../../../../winix/winixd/functions/cat.h ./showtickets.o: ../../../../winix/winixd/functions/chmod.h ./showtickets.o: ../../../../winix/winixd/functions/privchanger.h -./showtickets.o: ../../../../winix/winixd/core/request.h -./showtickets.o: ../../../../winix/winixd/core/header.h ./showtickets.o: ../../../../winix/winixd/functions/chown.h ./showtickets.o: ../../../../winix/winixd/functions/ckeditor.h ./showtickets.o: ../../../../winix/winixd/functions/cp.h @@ -995,7 +1006,6 @@ ./showtickets.o: ../../../../winix/winixd/core/sessionmanager.h ./showtickets.o: ../../../../winix/winixd/core/sessioncontainer.h ./showtickets.o: ../../../../winix/winixd/core/ipbancontainer.h -./showtickets.o: ../../../../winix/winixd/core/system.h ./showtickets.o: ../../../../winix/winixd/core/sessionidmanager.h ./showtickets.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./showtickets.o: ../../../../winix/winixd/core/slog.h @@ -1113,13 +1123,23 @@ ./templates.o: ../../../../winix/winixd/core/system.h ./templates.o: ../../../../winix/winixd/core/job.h ./templates.o: ../../../../winix/winixd/core/basethread.h -./templates.o: ../../../../winix/winixd/core/synchro.h -./templates.o: ../../../../winix/winixd/core/winixmodeldeprecated.h -./templates.o: ../../../../winix/winixd/core/winixbase.h -./templates.o: ../../../../winix/winixd/core/config.h +./templates.o: ../../../../winix/winixd/core/jobtask.h +./templates.o: ../../../../winix/winixd/core/request.h +./templates.o: ../../../../winix/winixd/core/requesttypes.h +./templates.o: ../../../../winix/winixd/models/item.h +./templates.o: ../../../../winix/winixd/models/winixmodel.h +./templates.o: ../../../../winix/winixd/core/log.h +./templates.o: ../../../../winix/winixd/models/winixmodelconnector.h +./templates.o: ../../../../winix/winixd/models/itemcontent.h +./templates.o: ../../../../winix/winixd/templates/htmltextstream.h +./templates.o: ../../../../winix/winixd/templates/misc.h +./templates.o: ../../../../winix/winixd/templates/localefilter.h +./templates.o: ../../../../winix/winixd/templates/locale.h ./templates.o: ../../../../pikotools/src/space/spaceparser.h ./templates.o: ../../../../pikotools/src/space/space.h ./templates.o: ../../../../pikotools/src/convert/baseparser.h +./templates.o: ../../../../winix/winixd/core/winixbase.h +./templates.o: ../../../../winix/winixd/core/config.h ./templates.o: ../../../../winix/winixd/core/log.h ./templates.o: ../../../../winix/winixd/core/logmanipulators.h ./templates.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h @@ -1130,50 +1150,44 @@ ./templates.o: ../../../../morm/src/postgresqlconnector.h ./templates.o: ../../../../morm/src/postgresqlqueryresult.h ./templates.o: ../../../../morm/src/transaction.h -./templates.o: ../../../../winix/winixd/core/log.h ./templates.o: ../../../../winix/winixd/core/synchro.h ./templates.o: ../../../../winix/winixd/core/filelog.h ./templates.o: ../../../../winix/winixd/core/lock.h +./templates.o: ../../../../winix/winixd/core/synchro.h +./templates.o: ../../../../pikotools/src/convert/patternreplacer.h +./templates.o: ../../../../winix/winixd/templates/htmltextstream.h +./templates.o: ../../../../winix/winixd/core/error.h +./templates.o: ../../../../winix/winixd/core/config.h +./templates.o: ../../../../winix/winixd/core/textstream.h +./templates.o: ../../../../winix/winixd/models/winixmodel.h +./templates.o: ../../../../winix/winixd/core/header.h +./templates.o: ../../../../winix/winixd/core/compress.h +./templates.o: ../../../../winix/winixd/core/winixbase.h ./templates.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h ./templates.o: ../../../../winix/winixd/core/plugindata.h -./templates.o: ../../../../winix/winixd/core/winixbase.h -./templates.o: ../../../../winix/winixd/core/dirs.h -./templates.o: ../../../../winix/winixd/core/dircontainer.h +./templates.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./templates.o: ../../../../winix/winixd/core/mount.h +./templates.o: ../../../../winix/winixd/core/mounts.h ./templates.o: ../../../../winix/winixd/db/db.h ./templates.o: ../../../../winix/winixd/db/dbbase.h ./templates.o: ../../../../winix/winixd/models/user.h -./templates.o: ../../../../winix/winixd/templates/misc.h -./templates.o: ../../../../winix/winixd/templates/localefilter.h -./templates.o: ../../../../winix/winixd/templates/locale.h -./templates.o: ../../../../pikotools/src/convert/patternreplacer.h -./templates.o: ../../../../winix/winixd/templates/htmltextstream.h -./templates.o: ../../../../winix/winixd/models/winixmodel.h -./templates.o: ../../../../winix/winixd/models/winixmodelconnector.h ./templates.o: ../../../../winix/winixd/models/group.h ./templates.o: ../../../../winix/winixd/core/dircontainer.h -./templates.o: ../../../../winix/winixd/models/item.h -./templates.o: ../../../../winix/winixd/models/itemcontent.h -./templates.o: ../../../../winix/winixd/templates/htmltextstream.h ./templates.o: ../../../../winix/winixd/core/ugcontainer.h ./templates.o: ../../../../winix/winixd/core/request.h -./templates.o: ../../../../winix/winixd/core/mounts.h -./templates.o: ../../../../winix/winixd/core/mount.h -./templates.o: ../../../../winix/winixd/core/error.h ./templates.o: ../../../../winix/winixd/core/mountparser.h -./templates.o: ../../../../winix/winixd/core/config.h -./templates.o: ../../../../winix/winixd/core/crypt.h -./templates.o: ../../../../winix/winixd/core/run.h -./templates.o: ../../../../winix/winixd/core/users.h -./templates.o: ../../../../winix/winixd/core/ugcontainer.h -./templates.o: ../../../../winix/winixd/core/lastcontainer.h ./templates.o: ../../../../winix/winixd/core/cur.h ./templates.o: ../../../../winix/winixd/core/session.h ./templates.o: ../../../../winix/winixd/core/rebus.h -./templates.o: ../../../../winix/winixd/core/textstream.h ./templates.o: ../../../../winix/winixd/core/ipban.h -./templates.o: ../../../../winix/winixd/models/winixmodel.h -./templates.o: ../../../../winix/winixd/core/groups.h ./templates.o: ../../../../winix/winixd/core/loadavg.h +./templates.o: ../../../../winix/winixd/core/dirs.h +./templates.o: ../../../../winix/winixd/core/dircontainer.h +./templates.o: ../../../../winix/winixd/core/crypt.h +./templates.o: ../../../../winix/winixd/core/run.h +./templates.o: ../../../../winix/winixd/core/users.h +./templates.o: ../../../../winix/winixd/core/groups.h +./templates.o: ../../../../winix/winixd/core/ugcontainer.h ./templates.o: ../../../../winix/winixd/core/image.h ./templates.o: ../../../../winix/winixd/core/threadmanager.h ./templates.o: ../../../../winix/winixd/models/winixmodelconnector.h @@ -1183,7 +1197,6 @@ ./templates.o: ../../../../winix/winixd/templates/locale.h ./templates.o: ../../../../winix/winixd/templates/patterns.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/src/convert/convert.h ./templates.o: ../../../../pikotools/src/convert/inttostr.h @@ -1196,19 +1209,19 @@ ./templates.o: ../../../../winix/winixd/notify/templatesnotify.h ./templates.o: ../../../../winix/winixd/core/textstream.h ./templates.o: ../../../../winix/winixd/core/users.h +./templates.o: ../../../../winix/winixd/core/lastcontainer.h ./templates.o: ../../../../winix/winixd/core/timezones.h ./templates.o: ../../../../winix/winixd/core/timezone.h ./templates.o: ../../../../winix/winixd/functions/functions.h ./templates.o: ../../../../winix/winixd/functions/functionbase.h ./templates.o: ../../../../winix/winixd/functions/functionparser.h ./templates.o: ../../../../winix/winixd/core/cur.h +./templates.o: ../../../../winix/winixd/core/dirs.h ./templates.o: ../../../../winix/winixd/functions/account.h ./templates.o: ../../../../winix/winixd/functions/adduser.h ./templates.o: ../../../../winix/winixd/functions/cat.h ./templates.o: ../../../../winix/winixd/functions/chmod.h ./templates.o: ../../../../winix/winixd/functions/privchanger.h -./templates.o: ../../../../winix/winixd/core/request.h -./templates.o: ../../../../winix/winixd/core/header.h ./templates.o: ../../../../winix/winixd/functions/chown.h ./templates.o: ../../../../winix/winixd/functions/ckeditor.h ./templates.o: ../../../../winix/winixd/functions/cp.h @@ -1253,7 +1266,6 @@ ./templates.o: ../../../../winix/winixd/core/sessionmanager.h ./templates.o: ../../../../winix/winixd/core/sessioncontainer.h ./templates.o: ../../../../winix/winixd/core/ipbancontainer.h -./templates.o: ../../../../winix/winixd/core/system.h ./templates.o: ../../../../winix/winixd/core/sessionidmanager.h ./templates.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./templates.o: ../../../../winix/winixd/core/slog.h tdb.h @@ -1275,15 +1287,6 @@ ./ticketinfo.o: ticketinfo.h ticket.h ../../../../winix/winixd/core/system.h ./ticketinfo.o: ../../../../winix/winixd/core/job.h ./ticketinfo.o: ../../../../winix/winixd/core/basethread.h -./ticketinfo.o: ../../../../winix/winixd/core/synchro.h -./ticketinfo.o: ../../../../winix/winixd/core/winixmodeldeprecated.h -./ticketinfo.o: ../../../../winix/winixd/core/winixbase.h -./ticketinfo.o: ../../../../winix/winixd/core/config.h -./ticketinfo.o: ../../../../pikotools/src/space/spaceparser.h -./ticketinfo.o: ../../../../pikotools/src/space/space.h -./ticketinfo.o: ../../../../pikotools/src/convert/baseparser.h -./ticketinfo.o: ../../../../pikotools/src/textstream/textstream.h -./ticketinfo.o: ../../../../pikotools/src/textstream/stream.h ./ticketinfo.o: ../../../../pikotools/src/space/space.h ./ticketinfo.o: ../../../../pikotools/src/textstream/types.h ./ticketinfo.o: ../../../../pikotools/src/convert/inttostr.h @@ -1291,24 +1294,28 @@ ./ticketinfo.o: ../../../../pikotools/src/textstream/stream.h ./ticketinfo.o: ../../../../pikotools/src/utf8/utf8_templates.h ./ticketinfo.o: ../../../../pikotools/src/utf8/utf8_private.h +./ticketinfo.o: ../../../../winix/winixd/core/jobtask.h +./ticketinfo.o: ../../../../winix/winixd/core/request.h +./ticketinfo.o: ../../../../winix/winixd/core/requesttypes.h +./ticketinfo.o: ../../../../pikotools/src/textstream/textstream.h +./ticketinfo.o: ../../../../pikotools/src/textstream/stream.h ./ticketinfo.o: ../../../../pikotools/src/date/date.h ./ticketinfo.o: ../../../../pikotools/src/membuffer/membuffer.h ./ticketinfo.o: ../../../../pikotools/src/textstream/types.h ./ticketinfo.o: ../../../../pikotools/src/utf8/utf8_stream.h -./ticketinfo.o: ../../../../winix/winixd/core/log.h -./ticketinfo.o: ../../../../winix/winixd/core/logmanipulators.h -./ticketinfo.o: ../../../../pikotools/src/log/log.h -./ticketinfo.o: ../../../../pikotools/src/log/filelog.h -./ticketinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h -./ticketinfo.o: ../../../../morm/src/morm_types.h +./ticketinfo.o: ../../../../winix/winixd/models/item.h +./ticketinfo.o: ../../../../winix/winixd/models/winixmodel.h ./ticketinfo.o: ../../../../morm/src/model.h ./ticketinfo.o: ../../../../morm/src/modelconnector.h ./ticketinfo.o: ../../../../morm/src/clearer.h ../../../../morm/src/ft.h ./ticketinfo.o: ../../../../morm/src/dbconnector.h +./ticketinfo.o: ../../../../pikotools/src/log/log.h +./ticketinfo.o: ../../../../pikotools/src/log/filelog.h ./ticketinfo.o: ../../../../morm/src/queryresult.h ./ticketinfo.o: ../../../../morm/src/flatconnector.h ./ticketinfo.o: ../../../../morm/src/dbexpression.h ./ticketinfo.o: ../../../../morm/src/baseexpression.h +./ticketinfo.o: ../../../../morm/src/morm_types.h ./ticketinfo.o: ../../../../morm/src/modelenv.h ./ticketinfo.o: ../../../../morm/src/modeldata.h ./ticketinfo.o: ../../../../morm/src/cursorhelper.h @@ -1322,6 +1329,21 @@ ./ticketinfo.o: ../../../../ezc/src/item.h ./ticketinfo.o: ../../../../pikotools/src/convert/text.h ./ticketinfo.o: ../../../../morm/src/flatexpression.h +./ticketinfo.o: ../../../../winix/winixd/core/log.h +./ticketinfo.o: ../../../../winix/winixd/models/winixmodelconnector.h +./ticketinfo.o: ../../../../winix/winixd/models/itemcontent.h +./ticketinfo.o: ../../../../winix/winixd/templates/htmltextstream.h +./ticketinfo.o: ../../../../winix/winixd/templates/misc.h +./ticketinfo.o: ../../../../winix/winixd/templates/localefilter.h +./ticketinfo.o: ../../../../winix/winixd/templates/locale.h +./ticketinfo.o: ../../../../pikotools/src/space/spaceparser.h +./ticketinfo.o: ../../../../pikotools/src/space/space.h +./ticketinfo.o: ../../../../pikotools/src/convert/baseparser.h +./ticketinfo.o: ../../../../winix/winixd/core/winixbase.h +./ticketinfo.o: ../../../../winix/winixd/core/config.h +./ticketinfo.o: ../../../../winix/winixd/core/log.h +./ticketinfo.o: ../../../../winix/winixd/core/logmanipulators.h +./ticketinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/version.h ./ticketinfo.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h ./ticketinfo.o: ../../../../morm/src/jsonexpression.h ./ticketinfo.o: ../../../../morm/src/postgresqlexpression.h @@ -1329,21 +1351,10 @@ ./ticketinfo.o: ../../../../morm/src/postgresqlconnector.h ./ticketinfo.o: ../../../../morm/src/postgresqlqueryresult.h ./ticketinfo.o: ../../../../morm/src/transaction.h -./ticketinfo.o: ../../../../winix/winixd/core/log.h ./ticketinfo.o: ../../../../winix/winixd/core/synchro.h ./ticketinfo.o: ../../../../winix/winixd/core/filelog.h ./ticketinfo.o: ../../../../winix/winixd/core/lock.h -./ticketinfo.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h -./ticketinfo.o: ../../../../winix/winixd/core/plugindata.h -./ticketinfo.o: ../../../../winix/winixd/core/winixbase.h -./ticketinfo.o: ../../../../winix/winixd/core/dirs.h -./ticketinfo.o: ../../../../winix/winixd/core/dircontainer.h -./ticketinfo.o: ../../../../winix/winixd/db/db.h -./ticketinfo.o: ../../../../winix/winixd/db/dbbase.h -./ticketinfo.o: ../../../../winix/winixd/models/user.h -./ticketinfo.o: ../../../../winix/winixd/templates/misc.h -./ticketinfo.o: ../../../../winix/winixd/templates/localefilter.h -./ticketinfo.o: ../../../../winix/winixd/templates/locale.h +./ticketinfo.o: ../../../../winix/winixd/core/synchro.h ./ticketinfo.o: ../../../../pikotools/src/convert/patternreplacer.h ./ticketinfo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h ./ticketinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h @@ -1354,33 +1365,38 @@ ./ticketinfo.o: ../../../../ezc/src/models.h ./ticketinfo.o: ../../../../ezc/src/patternparser.h ./ticketinfo.o: ../../../../winix/winixd/templates/htmltextstream.h +./ticketinfo.o: ../../../../winix/winixd/core/error.h +./ticketinfo.o: ../../../../winix/winixd/core/config.h +./ticketinfo.o: ../../../../winix/winixd/core/textstream.h ./ticketinfo.o: ../../../../winix/winixd/models/winixmodel.h -./ticketinfo.o: ../../../../winix/winixd/models/winixmodelconnector.h +./ticketinfo.o: ../../../../winix/winixd/core/header.h +./ticketinfo.o: ../../../../winix/winixd/core/compress.h +./ticketinfo.o: ../../../../winix/winixd/core/winixbase.h +./ticketinfo.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h +./ticketinfo.o: ../../../../winix/winixd/core/plugindata.h +./ticketinfo.o: ../../../../winix/winixd/core/winixmodeldeprecated.h +./ticketinfo.o: ../../../../winix/winixd/core/mount.h +./ticketinfo.o: ../../../../winix/winixd/core/mounts.h +./ticketinfo.o: ../../../../winix/winixd/db/db.h +./ticketinfo.o: ../../../../winix/winixd/db/dbbase.h +./ticketinfo.o: ../../../../winix/winixd/models/user.h ./ticketinfo.o: ../../../../winix/winixd/models/group.h ./ticketinfo.o: ../../../../winix/winixd/core/dircontainer.h -./ticketinfo.o: ../../../../winix/winixd/models/item.h -./ticketinfo.o: ../../../../winix/winixd/models/itemcontent.h -./ticketinfo.o: ../../../../winix/winixd/templates/htmltextstream.h ./ticketinfo.o: ../../../../winix/winixd/core/ugcontainer.h ./ticketinfo.o: ../../../../winix/winixd/core/request.h -./ticketinfo.o: ../../../../winix/winixd/core/mounts.h -./ticketinfo.o: ../../../../winix/winixd/core/mount.h -./ticketinfo.o: ../../../../winix/winixd/core/error.h ./ticketinfo.o: ../../../../winix/winixd/core/mountparser.h -./ticketinfo.o: ../../../../winix/winixd/core/config.h -./ticketinfo.o: ../../../../winix/winixd/core/crypt.h -./ticketinfo.o: ../../../../winix/winixd/core/run.h -./ticketinfo.o: ../../../../winix/winixd/core/users.h -./ticketinfo.o: ../../../../winix/winixd/core/ugcontainer.h -./ticketinfo.o: ../../../../winix/winixd/core/lastcontainer.h ./ticketinfo.o: ../../../../winix/winixd/core/cur.h ./ticketinfo.o: ../../../../winix/winixd/core/session.h ./ticketinfo.o: ../../../../winix/winixd/core/rebus.h -./ticketinfo.o: ../../../../winix/winixd/core/textstream.h ./ticketinfo.o: ../../../../winix/winixd/core/ipban.h -./ticketinfo.o: ../../../../winix/winixd/models/winixmodel.h -./ticketinfo.o: ../../../../winix/winixd/core/groups.h ./ticketinfo.o: ../../../../winix/winixd/core/loadavg.h +./ticketinfo.o: ../../../../winix/winixd/core/dirs.h +./ticketinfo.o: ../../../../winix/winixd/core/dircontainer.h +./ticketinfo.o: ../../../../winix/winixd/core/crypt.h +./ticketinfo.o: ../../../../winix/winixd/core/run.h +./ticketinfo.o: ../../../../winix/winixd/core/users.h +./ticketinfo.o: ../../../../winix/winixd/core/groups.h +./ticketinfo.o: ../../../../winix/winixd/core/ugcontainer.h ./ticketinfo.o: ../../../../winix/winixd/core/image.h ./ticketinfo.o: ../../../../winix/winixd/core/threadmanager.h ./ticketinfo.o: ../../../../winix/winixd/models/winixmodelconnector.h @@ -1390,7 +1406,6 @@ ./ticketinfo.o: ../../../../winix/winixd/templates/locale.h ./ticketinfo.o: ../../../../winix/winixd/templates/patterns.h ./ticketinfo.o: ../../../../winix/winixd/core/misc.h -./ticketinfo.o: ../../../../winix/winixd/core/requesttypes.h ./ticketinfo.o: ../../../../winix/winixd/core/winix_const.h ./ticketinfo.o: ../../../../pikotools/src/convert/convert.h ./ticketinfo.o: ../../../../pikotools/src/convert/inttostr.h @@ -1403,19 +1418,19 @@ ./ticketinfo.o: ../../../../winix/winixd/notify/templatesnotify.h ./ticketinfo.o: ../../../../winix/winixd/core/textstream.h ./ticketinfo.o: ../../../../winix/winixd/core/users.h +./ticketinfo.o: ../../../../winix/winixd/core/lastcontainer.h ./ticketinfo.o: ../../../../winix/winixd/core/timezones.h ./ticketinfo.o: ../../../../winix/winixd/core/timezone.h ./ticketinfo.o: ../../../../winix/winixd/functions/functions.h ./ticketinfo.o: ../../../../winix/winixd/functions/functionbase.h ./ticketinfo.o: ../../../../winix/winixd/functions/functionparser.h ./ticketinfo.o: ../../../../winix/winixd/core/cur.h +./ticketinfo.o: ../../../../winix/winixd/core/dirs.h ./ticketinfo.o: ../../../../winix/winixd/functions/account.h ./ticketinfo.o: ../../../../winix/winixd/functions/adduser.h ./ticketinfo.o: ../../../../winix/winixd/functions/cat.h ./ticketinfo.o: ../../../../winix/winixd/functions/chmod.h ./ticketinfo.o: ../../../../winix/winixd/functions/privchanger.h -./ticketinfo.o: ../../../../winix/winixd/core/request.h -./ticketinfo.o: ../../../../winix/winixd/core/header.h ./ticketinfo.o: ../../../../winix/winixd/functions/chown.h ./ticketinfo.o: ../../../../winix/winixd/functions/ckeditor.h ./ticketinfo.o: ../../../../winix/winixd/functions/cp.h @@ -1460,7 +1475,6 @@ ./ticketinfo.o: ../../../../winix/winixd/core/sessionmanager.h ./ticketinfo.o: ../../../../winix/winixd/core/sessioncontainer.h ./ticketinfo.o: ../../../../winix/winixd/core/ipbancontainer.h -./ticketinfo.o: ../../../../winix/winixd/core/system.h ./ticketinfo.o: ../../../../winix/winixd/core/sessionidmanager.h ./ticketinfo.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h ./ticketinfo.o: ../../../../winix/winixd/core/slog.h tdb.h diff --git a/winixd/plugins/ticket/init.cpp b/winixd/plugins/ticket/init.cpp index c7294cd..f12f759 100644 --- a/winixd/plugins/ticket/init.cpp +++ b/winixd/plugins/ticket/init.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2010-2018, Tomasz Sowa + * Copyright (c) 2010-2022, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -142,11 +142,14 @@ void AddNotifyTemplate(PluginInfo & info) void CreateSession(PluginInfo & info) { - SessionData * p = new SessionData(); + if( info.cur->session ) + { + SessionData * p = new SessionData(); - p->fun_rm = &info.functions->fun_rm; - info.session->plugin_data.Assign(info.plugin->current_plugin, p); - info.log << log4 << "Ticket: created ticket plugin data: " << (void*)p << logend; + p->fun_rm = &info.functions->fun_rm; + info.cur->session->plugin_data.Assign(info.plugin->current_plugin, p); + info.log << log4 << "Ticket: created ticket plugin data: " << (void*)p << logend; + } } @@ -205,7 +208,7 @@ using namespace Ticket; tdb.SetConn(info.db->GetConn()); tdb.LogQueries(info.config->log_db_query); - info.set_dependency_for(ticket_info); + ticket_info.set_dependency((WinixRequest*)info.functions); ticket_info.SetDb(info.db); ticket_info.SetTDb(&tdb); //ticket_info.SetConfig(info.config); diff --git a/winixd/templates/templates.cpp b/winixd/templates/templates.cpp index df757e3..e953b88 100644 --- a/winixd/templates/templates.cpp +++ b/winixd/templates/templates.cpp @@ -646,7 +646,7 @@ void Templates::CreateFunctions() ezc_functions.Insert("content", content); - plugin->Call((Session*)0, WINIX_TEMPLATES_CREATEFUNCTIONS, &ezc_functions, &ezc_objects); + plugin->Call(WINIX_TEMPLATES_CREATEFUNCTIONS, &ezc_functions, &ezc_objects); Ezc::Objects::Iterator i = ezc_objects.Begin(); @@ -840,7 +840,7 @@ using namespace TemplatesFunctions; ReadIndexTemplates(); ReadChangeTemplates(); - plugin->Call((Session*)0, WINIX_ADD_TEMPLATE); + plugin->Call(WINIX_ADD_TEMPLATE); patterns.RebuildCache(); ezc_blocks.CacheObjects(ezc_objects); diff --git a/winixd/utils/http.cpp b/winixd/utils/http.cpp new file mode 100644 index 0000000..b57b793 --- /dev/null +++ b/winixd/utils/http.cpp @@ -0,0 +1,581 @@ +/* + * This file is a part of Winix + * and is distributed under the 2-Clause BSD licence. + * Author: Tomasz Sowa + */ + +/* + * Copyright (c) 2010-2022, Tomasz Sowa + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + */ + +#include "http.h" +#include "core/lock.h" +#include "core/log.h" +#include "utf8/utf8.h" +#include "core/header.h" + + + +namespace Winix +{ + + + +Http::Http() +{ + curl = nullptr; + synchro = nullptr; + browser_name = "Winix"; + conn_timeout = 30; + http_headers = nullptr; + read_function_input = nullptr; + read_function_index = 0; + additional_headers_to_send = nullptr; + bearer_token = nullptr; + output_headers_space = nullptr; + change_header_names_to_lower = true; + output_content_type = nullptr; +} + + +Http::~Http() +{ + uninitialize_curl(); +} + + + +Http & Http::add_input_headers(pt::Space * headers) +{ + additional_headers_to_send = headers; + return *this; +} + + +Http & Http::get_output_headers_to(pt::Space * out_headers, bool change_names_to_lower) +{ + this->output_headers_space = out_headers; + this->change_header_names_to_lower = change_names_to_lower; + return *this; +} + + +Http & Http::get_output_content_type_to(std::wstring * out_content_type) +{ + this->output_content_type = out_content_type; + return *this; +} + + +Http & Http::add_bearer_token(const wchar_t * token) +{ + this->bearer_token = token; + return *this; +} + + +Http & Http::add_bearer_token(const std::wstring & token) +{ + this->bearer_token = token.c_str(); + return *this; +} + + +bool Http::get(const wchar_t * url, std::wstring & out, bool clear_str) +{ + std::string url_ascii; + pt::TextStream out_stream; + + pt::wide_to_utf8(url, url_ascii); + + reset_headers(); + bool status = fetch_internal(url_ascii.c_str(), nullptr, out_stream); + + // IMPROVE pikotools, add: pt::UTF8ToInt(out_stream, out); + std::string temp; + out_stream.to_str(temp); + pt::utf8_to_wide(temp, out, clear_str); + + return status; +} + + +bool Http::get(const std::wstring & url, std::wstring & out, bool clear_str) +{ + return get(url.c_str(), out, clear_str); +} + + +bool Http::get(const pt::WTextStream & url, std::wstring & out, bool clear_str) +{ + std::wstring url_str; + url.to_str(url_str); + return get(url_str, out, clear_str); +} + + +bool Http::get(const wchar_t * url, pt::WTextStream & out, bool clear_stream) +{ + std::string url_ascii; + pt::TextStream out_stream; + + pt::wide_to_utf8(url, url_ascii); + + reset_headers(); + bool status = fetch_internal(url_ascii.c_str(), nullptr, out_stream); + + // IMPROVE pikotools, add: pt::UTF8ToInt(out_stream, out); + std::string temp; + out_stream.to_str(temp); + + // similar, improve pikotools + std::wstring temp_wide; + pt::utf8_to_wide(temp, temp_wide); + + if( clear_stream ) + { + out.clear(); + } + + out << temp_wide; + + return status; +} + + +bool Http::get(const std::wstring & url, pt::WTextStream & out, bool clear_stream) +{ + return get(url.c_str(), out, clear_stream); +} + + + +bool Http::get(const pt::WTextStream & url, pt::WTextStream & out, bool clear_stream) +{ + std::wstring url_str; + url.to_str(url_str); + return get(url_str, out, clear_stream); +} + + +bool Http::put(const wchar_t * url, const std::string & in, pt::WTextStream & out, bool clear_stream) +{ + std::string url_ascii; + pt::TextStream out_stream; + + if( clear_stream ) + { + out.clear(); + } + + pt::wide_to_utf8(url, url_ascii); + + reset_headers(); + bool status = fetch_internal(url_ascii.c_str(), &in, out_stream); + out << out_stream; + + return status; +} + + +bool Http::put(const std::wstring & url, const std::string & in, pt::WTextStream & out, bool clear_stream) +{ + return put(url.c_str(), in, out, clear_stream); +} + + +bool Http::put(const wchar_t * url, pt::WTextStream & in, pt::WTextStream & out, bool clear_stream) +{ + std::string in_ascii; + in.to_str(in_ascii); + + return put(url, in_ascii, out, clear_stream); +} + + +long Http::get_status() +{ + long status = -1; + + if( curl ) + { + curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &status); + } + + return status; +} + + + +void Http::reset_headers() +{ + if( http_headers ) + { + curl_slist_free_all(http_headers); + http_headers = nullptr; + } +} + + +void Http::add_additional_headers() +{ + if( additional_headers_to_send && additional_headers_to_send->is_object() ) + { + pt::WTextStream header; + pt::Space::ObjectType::iterator i = additional_headers_to_send->value.value_object.begin(); + + while( i != additional_headers_to_send->value.value_object.end() ) + { + header.clear(); + + header << i->first << ": "; + header << i->second->to_wstr(); + add_header(header); + + ++i; + } + } +} + + +void Http::add_bearer_token() +{ + if( bearer_token && bearer_token[0] != 0 ) + { + pt::WTextStream header; + header << L"Authorization: Bearer " << bearer_token; + add_header(header); + } +} + + +void Http::add_header(const pt::WTextStream & header) +{ + header.to_str(temp_header); + add_header(temp_header); + temp_header.clear(); +} + + +void Http::add_header(const std::wstring & header) +{ + pt::wide_to_utf8(header, temp_header_ascii); + http_headers = curl_slist_append(http_headers, temp_header_ascii.c_str()); +} + + +void Http::initialize_curl_if_needed() +{ + if( !curl ) + { + /* + * curl_easy_init() is not thread safe before curl 7.84.0 version + * + * from https://curl.se/libcurl/c/curl_easy_init.html + * If you did not already call curl_global_init, curl_easy_init does it automatically. + * This may be lethal in multi-threaded cases, since curl_global_init is not thread-safe, + * and it may result in resource problems because there is no corresponding cleanup. + * + * but we have called curl_global_init() in main.cpp (InitCurlLibrary() method) + * + */ + curl = curl_easy_init(); + } +} + + +void Http::uninitialize_curl() +{ + reset_headers(); + + if( curl ) + { + curl_easy_cleanup(curl); + curl = nullptr; + } +} + + +// in can be pointer to const char * +bool Http::fetch_internal(const char * url, const std::string * in, pt::TextStream & out) +{ + initialize_curl_if_needed(); + + if( output_headers_space ) + output_headers_space->clear(); + + if( output_content_type ) + output_content_type->clear(); + + if( !curl ) + { + log << log1 << "Http: I can't initialize curl easy session" << logend; + return false; + } + + error_buf[0] = 0; + + read_function_input = in; // can be null + read_function_index = 0; + + if( read_function_input ) + { + curl_easy_setopt(curl, CURLOPT_READFUNCTION, fetch_read_function); + curl_easy_setopt(curl, CURLOPT_READDATA, this); + curl_easy_setopt(curl, CURLOPT_POST, 1); + + /* + * do not set content-leght header here + * curl uses "Expect: 100-continue" and it collides if content-length is set + * https://daniel.haxx.se/blog/2020/02/27/expect-tweaks-in-curl/ + * + */ + } + + curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fetch_write_function); + curl_easy_setopt(curl, CURLOPT_WRITEDATA, &out); + curl_easy_setopt(curl, CURLOPT_URL, url); + curl_easy_setopt(curl, CURLOPT_USERAGENT, browser_name.c_str()); + curl_easy_setopt(curl, CURLOPT_TIMEOUT, conn_timeout); + curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, conn_timeout); + curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, error_buf); + curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1); + curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 20); + curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1); + + if( output_headers_space || output_content_type ) + { + out_headers_stream.clear(); + curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, fetch_header_function); + curl_easy_setopt(curl, CURLOPT_HEADERDATA, &out_headers_stream); + } + + add_additional_headers(); + add_bearer_token(); + + if( http_headers ) + { + curl_easy_setopt(curl, CURLOPT_HTTPHEADER, http_headers); + } + + CURLcode res = curl_easy_perform(curl); + + reset_headers(); + + if( res == CURLE_OK ) + { + parse_headers(); + out_headers_stream.clear(); + } + else + { + log << log1 << "Http: fetching failed: " << error_buf << ", code: " + << static_cast(res) << logend; + + return false; + } + + return true; +} + + +size_t Http::fetch_read_function(char * ptr, size_t size, size_t nmemb, void * userdata) +{ + size_t len = 0; + + if( userdata ) + { + Http * http = reinterpret_cast(userdata); + + if( http->read_function_index < http->read_function_input->size() ) + { + len = size * nmemb; + + if( http->read_function_index + len > http->read_function_input->size() ) + { + len = http->read_function_input->size() - http->read_function_index; + } + + for(size_t i=0 ; i < len ; ++i) + { + ptr[i] = (*http->read_function_input)[http->read_function_index + i]; + } + + http->read_function_index += len; + } + } + + return len; +} + + +size_t Http::fetch_write_function(char * ptr, size_t size, size_t nmemb, void * userdata) +{ + size_t len = size * nmemb; + + if( userdata ) + { + pt::TextStream * out = reinterpret_cast(userdata); + + if( len > 0 ) + out->write(ptr, len); + } + + return len; +} + + +size_t Http::fetch_header_function(char * ptr, size_t size, size_t nmemb, void * userdata) +{ + size_t len = size * nmemb; + + if( userdata ) + { + pt::TextStream * out = reinterpret_cast(userdata); + + if( len > 0 ) + out->write(ptr, len); + } + + return len; +} + + + +void Http::skip_white(pt::TextStream::iterator & i) +{ + for( ; i != out_headers_stream.end() ; ++i ) + { + if( !pt::is_white(*i, false, false) ) + { + break; + } + } +} + + +void Http::parse_header_name(pt::TextStream::iterator & i, std::string & name) +{ + name.clear(); + + for( ; i != out_headers_stream.end() ; ++i ) + { + char c = *i; + + if( c == '\r' ) + { + // just skip + } + else + if( c == '\n' ) + { + break; + } + else + if( c == ':' ) + { + ++i; + break; + } + else + { + if( change_header_names_to_lower ) + { + c = pt::to_lower(c); + } + + name += c; + } + } +} + + +void Http::parse_header_value(pt::TextStream::iterator & i, std::string & value) +{ + value.clear(); + + for( ; i != out_headers_stream.end() ; ++i ) + { + char c = *i; + + if( c == '\r' ) + { + // just skip + } + else + if( c == '\n' ) + { + ++i; + break; + } + else + { + value += c; + } + } +} + + +void Http::parse_headers() +{ + if( output_headers_space || output_content_type ) + { + pt::TextStream::iterator i = out_headers_stream.begin(); + + while( i != out_headers_stream.end() ) + { + parse_header_name(i, temp_header_ascii); + skip_white(i); + parse_header_value(i, temp_header_value_ascii); + + pt::utf8_to_wide(temp_header_ascii, temp_header); + pt::utf8_to_wide(temp_header_value_ascii, temp_header_value); + + // both temp_header and temp_header_value will be empty + // after the first header 'HTTP/1.1 100 Continue' (if exists) + // (there is an empty line in such a case) + if( !temp_header.empty() || !temp_header_value.empty() ) + { + if( output_headers_space ) + output_headers_space->add(temp_header, temp_header_value); + + if( output_content_type && pt::is_equal_nc(temp_header, Header::content_type) ) + *output_content_type = temp_header_value; + } + } + + temp_header.clear(); + temp_header_ascii.clear(); + temp_header_value.clear(); + temp_header_value_ascii.clear(); + } +} + + +} + + diff --git a/winixd/utils/http.h b/winixd/utils/http.h new file mode 100644 index 0000000..ecd57e5 --- /dev/null +++ b/winixd/utils/http.h @@ -0,0 +1,160 @@ +/* + * This file is a part of Winix + * and is distributed under the 2-Clause BSD licence. + * Author: Tomasz Sowa + */ + +/* + * Copyright (c) 2010-2022, Tomasz Sowa + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + */ + +#ifndef headerfile_winix_utils_http +#define headerfile_winix_utils_http + +#include +#include +#include "core/synchro.h" +#include "textstream/textstream.h" +#include "core/winixbase.h" + + +namespace Winix +{ + + +class Http : public WinixBase +{ +public: + + static const long HTTP_STATUS_200_OK = 200; + + + Http(); + ~Http(); + + Http(const Http &) = delete; + Http(Http &&) = delete; + + + /* + * we do not copy the space structure but only get a pointer to it + * so you have to preserve the structure until get()/put() is called + */ + Http & add_input_headers(pt::Space * headers); + + /* + * output headers will be provided in a Space structure as key/value pairs (object) + * + * the first line (http status) will be inserted too (the value part will be empty), e.g. + * key="http/1.1 200 ok" + * value="" + * + */ + Http & get_output_headers_to(pt::Space * out_headers, bool change_names_to_lower = true); + + + /* + * if we don't need all headers but just content-type + */ + Http & get_output_content_type_to(std::wstring * out_content_type); + + + /* + * you don't have to call these methods + * if the curl is not initialized it will be initialized automatically from get/put methods + */ + void initialize_curl_if_needed(); + void uninitialize_curl(); + + /* + * we do not copy the string but only get a pointer to its c_str() + * so you have to preserve the string until get()/put() is called + */ + Http & add_bearer_token(const wchar_t * token); + Http & add_bearer_token(const std::wstring & token); + + bool get(const wchar_t * url, std::wstring & out, bool clear_str = true); + bool get(const std::wstring & url, std::wstring & out, bool clear_str = true); + bool get(const pt::WTextStream & url, std::wstring & out, bool clear_str = true); + + bool get(const wchar_t * url, pt::WTextStream & out, bool clear_stream = true); + bool get(const std::wstring & url, pt::WTextStream & out, bool clear_stream = true); + bool get(const pt::WTextStream & url, pt::WTextStream & out, bool clear_stream = true); + + bool put(const wchar_t * url, const std::string & in, pt::WTextStream & out, bool clear_stream = true); + bool put(const std::wstring & url, const std::string & in, pt::WTextStream & out, bool clear_stream = true); + bool put(const wchar_t * url, pt::WTextStream & in, pt::WTextStream & out, bool clear_stream = true); + + /* + * return the last http status + */ + long get_status(); + + +private: + + CURL * curl; + char error_buf[CURL_ERROR_SIZE]; + std::string browser_name; + int conn_timeout; // timeout in seconds + size_t read_function_index; + const std::string * read_function_input; + curl_slist * http_headers; + pt::Space * additional_headers_to_send; + pt::Space * output_headers_space; + const wchar_t * bearer_token = nullptr; + pt::TextStream out_headers_stream; + bool change_header_names_to_lower; + std::wstring * output_content_type; + + std::wstring temp_header; + std::string temp_header_ascii; + + std::wstring temp_header_value; + std::string temp_header_value_ascii; + + bool fetch_internal(const char * url, const std::string * in, pt::TextStream & out); + static size_t fetch_read_function(char * ptr, size_t size, size_t nmemb, void * userdata); + static size_t fetch_write_function(char * ptr, size_t size, size_t nmemb, void * userdata); + static size_t fetch_header_function(char * ptr, size_t size, size_t nmemb, void * userdata); + void reset_headers(); + void add_additional_headers(); + void add_bearer_token(); + void add_header(const pt::WTextStream & header); + void add_header(const std::wstring & header); + void skip_white(pt::TextStream::iterator & i); + void parse_header_name(pt::TextStream::iterator & i, std::string & name); + void parse_header_value(pt::TextStream::iterator & i, std::string & value); + void parse_headers(); + +}; + + +} + + +#endif