diff --git a/winixd/Makefile.dep b/winixd/Makefile.dep index 76951c6..dfae946 100644 --- a/winixd/Makefile.dep +++ b/winixd/Makefile.dep @@ -1 +1 @@ -winix.src.files = ./core/app.h ./core/basethread.cpp ./core/acceptbaseparser.cpp ./core/acceptbaseparser.h ./core/acceptencodingparser.h ./core/basethread.h ./core/config.cpp ./core/config.h ./core/compress.cpp ./core/compress.h ./core/crypt.cpp ./core/dircontainer.cpp ./core/cookieparser.h ./core/request.cpp ./core/crypt.h ./core/cur.h ./core/winixmodeldeprecated.cpp ./core/app.cpp ./core/dircontainer.h ./core/dirs.cpp ./core/dirs.h ./core/error.h ./core/filelog.cpp ./core/filelog.h ./core/groups.cpp ./core/groups.h ./core/httpsimpleparser.cpp ./core/httpsimpleparser.h ./core/image.cpp ./core/image.h ./core/ipban.h ./core/ipbancontainer.cpp ./core/ipbancontainer.h ./core/job.cpp ./core/job.h ./core/lastcontainer.cpp ./core/lastcontainer.h ./core/loadavg.cpp ./core/loadavg.h ./core/lock.h ./core/lock.cpp ./core/log.cpp ./core/log.h ./core/logmanipulators.h ./core/misc.cpp ./core/misc.h ./core/mount.cpp ./core/mount.h ./core/mountparser.cpp ./core/mountparser.h ./core/mounts.cpp ./core/mounts.h ./core/plugin.cpp ./core/plugin.h ./core/plugindata.cpp ./core/plugindata.h ./core/pluginmsg.h ./core/postmultiparser.cpp ./core/postmultiparser.h ./core/postparser.h ./core/rebus.cpp ./core/rebus.h ./core/request.h ./core/requesttypes.h ./core/run.cpp ./core/run.h ./core/session.cpp ./core/session.h ./core/sessioncontainer.cpp ./core/sessioncontainer.h ./core/sessionidmanager.cpp ./core/sessionidmanager.h ./core/sessionmanager.cpp ./core/sessionmanager.h ./core/sessionparser.cpp ./core/sessionparser.h ./core/slog.cpp ./core/slog.h ./core/synchro.cpp ./core/synchro.h ./core/system.cpp ./core/system.h ./core/textstream.h ./core/threadmanager.cpp ./core/timezone.h ./core/threadmanager.h ./core/timezone.cpp ./core/timezones.cpp ./core/timezones.h ./core/ugcontainer.h ./core/users.cpp ./core/users.h ./core/version.h ./core/winix_const.h ./core/winixbase.cpp ./core/winixbase.h ./core/winixrequest.cpp ./core/winixrequest.h ./core/winixsystem.cpp ./core/winixsystem.h ./core/winixmodeldeprecated.h ./db/db.cpp ./db/db.h ./db/dbbase.cpp ./db/dbbase.h ./db/dbconn.cpp ./db/dbconn.h ./db/dbtextstream.cpp ./db/dbtextstream.h ./functions/account.cpp ./functions/account.h ./functions/adduser.cpp ./functions/adduser.h ./functions/cat.cpp ./functions/cat.h ./functions/chmod.cpp ./functions/chmod.h ./functions/chown.cpp ./functions/chown.h ./functions/ckeditor.cpp ./functions/ckeditor.h ./functions/cp.cpp ./functions/cp.h ./functions/default.cpp ./functions/default.h ./functions/download.cpp ./functions/download.h ./functions/emacs.cpp ./functions/emacs.h ./functions/env.cpp ./functions/env.h ./functions/functionbase.cpp ./functions/functionbase.h ./functions/functionparser.cpp ./functions/functionparser.h ./functions/functions.cpp ./functions/functions.h ./functions/imgcrop.cpp ./functions/imgcrop.h ./functions/ipban.cpp ./functions/ipban.h ./functions/last.cpp ./functions/last.h ./functions/ln.cpp ./functions/ln.h ./functions/locale.cpp ./functions/locale.h ./functions/login.cpp ./functions/login.h ./functions/logout.cpp ./functions/logout.h ./functions/ls.cpp ./functions/ls.h ./functions/man.cpp ./functions/man.h ./functions/meta.cpp ./functions/meta.h ./functions/mkdir.cpp ./functions/mkdir.h ./functions/mount.cpp ./functions/mount.h ./functions/mv.cpp ./functions/mv.h ./functions/nicedit.cpp ./functions/nicedit.h ./functions/node.cpp ./functions/node.h ./functions/passwd.cpp ./functions/passwd.h ./functions/priv.cpp ./functions/priv.h ./functions/privchanger.cpp ./functions/privchanger.h ./functions/pw.cpp ./functions/pw.h ./functions/reload.cpp ./functions/reload.h ./functions/rm.cpp ./functions/rm.h ./functions/rmuser.cpp ./functions/rmuser.h ./functions/run.cpp ./functions/run.h ./functions/sort.cpp ./functions/sort.h ./functions/specialdefault.cpp ./functions/specialdefault.h ./functions/stat.cpp ./functions/stat.h ./functions/subject.cpp ./functions/subject.h ./functions/template.cpp ./functions/template.h ./functions/timezone.cpp ./functions/timezone.h ./functions/tinymce.cpp ./functions/tinymce.h ./functions/uname.cpp ./functions/uname.h ./functions/upload.cpp ./functions/upload.h ./functions/uptime.cpp ./functions/uptime.h ./functions/vim.cpp ./functions/vim.h ./functions/who.cpp ./functions/who.h ./main/main.cpp ./models/group.cpp ./models/group.h ./models/item.cpp ./models/item.h ./models/itemcontent.cpp ./models/itemcontent.h ./models/migration.cpp ./models/migration.h ./models/user.cpp ./models/user.h ./models/userwrapper.h ./models/winixmodel.cpp ./models/winixmodel.h ./models/winixmodelconnector.cpp ./models/winixmodelconnector.h ./notify/notify.cpp ./notify/notify.h ./notify/notifypool.cpp ./notify/notifypool.h ./notify/notifythread.cpp ./notify/notifythread.h ./notify/templatesnotify.cpp ./notify/templatesnotify.h ./plugins/export/edb.cpp ./plugins/export/edb.h ./plugins/export/export.h ./plugins/export/exportinfo.cpp ./plugins/export/exportinfo.h ./plugins/export/exportthread.cpp ./plugins/export/exportthread.h ./plugins/export/funexport.cpp ./plugins/export/funexport.h ./plugins/export/init.cpp ./plugins/export/message.h ./plugins/gallery/gallery.cpp ./plugins/gallery/gallery.h ./plugins/gallery/galleryinfo.cpp ./plugins/gallery/galleryinfo.h ./plugins/gallery/init.cpp ./plugins/gallery/templates.cpp ./plugins/group/groupinfo.cpp ./plugins/group/groupinfo.h ./plugins/group/groups.cpp ./plugins/group/groups.h ./plugins/group/init.cpp ./plugins/group/templates.cpp ./plugins/mailregister/funregistermail.cpp ./plugins/mailregister/funregistermail.h ./plugins/mailregister/funregistermail_showusers.cpp ./plugins/mailregister/funregistermail_showusers.h ./plugins/mailregister/init.cpp ./plugins/mailregister/mdb.cpp ./plugins/mailregister/mdb.h ./plugins/mailregister/registermail_info.cpp ./plugins/mailregister/registermail_info.h ./plugins/mailregister/templates.cpp ./plugins/menu/cache.cpp ./plugins/menu/cache.h ./plugins/menu/init.cpp ./plugins/menu/templates.cpp ./plugins/seo/init.cpp ./plugins/seo/seo.cpp ./plugins/seo/seo.h ./plugins/stats/bot.cpp ./plugins/stats/bot.h ./plugins/stats/init.cpp ./plugins/stats/stats.cpp ./plugins/stats/stats.h ./plugins/stats/statssession.h ./plugins/stats/templates.cpp ./plugins/stats/templates.h ./plugins/thread/createthread.cpp ./plugins/thread/createthread.h ./plugins/thread/funthread.cpp ./plugins/thread/funthread.h ./plugins/thread/init.cpp ./plugins/thread/pluginmsg.h ./plugins/thread/reply.cpp ./plugins/thread/reply.h ./plugins/thread/showthreads.cpp ./plugins/thread/showthreads.h ./plugins/thread/tdb.cpp ./plugins/thread/tdb.h ./plugins/thread/templates.cpp ./plugins/thread/templates.h ./plugins/thread/thread.cpp ./plugins/thread/thread.h ./plugins/thread/threadfiles.cpp ./plugins/thread/threadfiles.h ./plugins/thread/threadinfo.cpp ./plugins/thread/threadinfo.h ./plugins/ticket/createticket.cpp ./plugins/ticket/createticket.h ./plugins/ticket/editticket.cpp ./plugins/ticket/editticket.h ./plugins/ticket/funticket.cpp ./plugins/ticket/funticket.h ./plugins/ticket/init.cpp ./plugins/ticket/pluginmsg.h ./plugins/ticket/sessiondata.cpp ./plugins/ticket/sessiondata.h ./plugins/ticket/showtickets.cpp ./plugins/ticket/showtickets.h ./plugins/ticket/tdb.cpp ./plugins/ticket/tdb.h ./plugins/ticket/templates.cpp ./plugins/ticket/ticket.h ./plugins/ticket/ticketinfo.cpp ./plugins/ticket/ticketinfo.h ./templates/adduser.cpp ./templates/antispam.cpp ./templates/changepatterns.cpp ./templates/changepatterns.h ./templates/config.cpp ./templates/currentdate.cpp ./templates/dir.cpp ./templates/doc.cpp ./templates/filters.cpp ./templates/generic.cpp ./templates/htmltextstream.cpp ./templates/htmltextstream.h ./templates/indexpatterns.cpp ./templates/indexpatterns.h ./templates/insert.cpp ./templates/ipban.cpp ./templates/locale.cpp ./templates/last.cpp ./templates/misc.cpp ./templates/locale.h ./templates/localefilter.cpp ./templates/localefilter.h ./templates/login.cpp ./templates/ls.cpp ./templates/man.cpp ./templates/misc.h ./templates/patterns.h ./templates/mount.cpp ./templates/passwd.cpp ./templates/patterncacher.cpp ./templates/patterncacher.h ./templates/patterns.cpp ./templates/priv.cpp ./templates/templates.h ./templates/rebus.cpp ./templates/server.cpp ./templates/slog.cpp ./templates/stat.cpp ./templates/sys.cpp ./templates/template.cpp ./templates/templates.cpp ./templates/user.cpp ./templates/textextstream.cpp ./templates/textextstream.h ./templates/upload.cpp ./templates/uptime.cpp ./templates/who.cpp ./templates/winix.cpp ../../ezc/src/blocks.cpp ../../ezc/src/blocks.h ../../ezc/src/cache.cpp ../../ezc/src/cache.h ../../ezc/src/expressionparser.h ../../ezc/src/ezc.h ../../ezc/src/functions.h ../../ezc/src/funinfo.h ../../ezc/src/generator.h ../../ezc/src/item.cpp ../../ezc/src/item.h ../../ezc/src/objects.h ../../ezc/src/outstreams.h ../../ezc/src/pattern.cpp ../../ezc/src/pattern.h ../../ezc/src/patternparser.cpp ../../ezc/src/patternparser.h ../../ezc/src/models.cpp ../../ezc/src/models.h ../../tito/src/aes.cpp ../../tito/src/aes.h ../../tito/src/base32.cpp ../../tito/src/base32.h ../../tito/src/base64.cpp ../../tito/src/base64.h ../../tito/src/crypto.cpp ../../tito/src/crypto.h ../../tito/src/misc.cpp ../../tito/src/misc.h ../../pikotools/src/convert/convert.h ../../pikotools/src/convert/inttostr.cpp ../../pikotools/src/convert/inttostr.h ../../pikotools/src/convert/misc.cpp ../../pikotools/src/convert/misc.h ../../pikotools/src/convert/patternreplacer.h ../../pikotools/src/convert/strtoint.h ../../pikotools/src/convert/text.cpp ../../pikotools/src/convert/text.h ../../pikotools/src/convert/text_private.h ../../pikotools/src/convert/double.cpp ../../pikotools/src/convert/double.h ../../pikotools/src/date/date.cpp ../../pikotools/src/date/date.h ../../pikotools/src/log/filelog.cpp ../../pikotools/src/log/filelog.h ../../pikotools/src/log/log.cpp ../../pikotools/src/log/log.h ../../pikotools/src/membuffer/membuffer.h ../../pikotools/src/space/space.cpp ../../pikotools/src/space/space.h ../../pikotools/src/space/spaceparser.cpp ../../pikotools/src/space/spaceparser.h ../../pikotools/src/textstream/textstream.h ../../pikotools/src/textstream/types.h ../../pikotools/src/textstream/stream.h ../../pikotools/src/utf8/utf8.cpp ../../pikotools/src/utf8/utf8.h ../../pikotools/src/utf8/utf8_private.cpp ../../pikotools/src/utf8/utf8_private.h ../../pikotools/src/utf8/utf8_templates.h ../../pikotools/src/csv/csvparser.cpp ../../pikotools/src/csv/csvparser.h ../../pikotools/src/mainoptions/mainoptionsparser.cpp ../../pikotools/src/mainoptions/mainoptionsparser.h ../../pikotools/src/html/htmlfilter.h ../../pikotools/src/html/htmlfilter.cpp ../../pikotools/src/html/bbcodeparser.h ../../pikotools/src/html/bbcodeparser.cpp ../../morm/src/baseexpression.cpp ../../morm/src/baseexpression.h ../../morm/src/clearer.cpp ../../morm/src/clearer.h ../../morm/src/cursor.h ../../morm/src/cursorhelper.h ../../morm/src/dbconnector.cpp ../../morm/src/dbconnector.h ../../morm/src/dbexpression.cpp ../../morm/src/dbexpression.h ../../morm/src/fieldvaluehelper.h ../../morm/src/finder.h ../../morm/src/finderhelper.h ../../morm/src/flatconnector.cpp ../../morm/src/flatconnector.h ../../morm/src/flatexpression.cpp ../../morm/src/flatexpression.h ../../morm/src/jsonconnector.cpp ../../morm/src/jsonconnector.h ../../morm/src/jsonexpression.cpp ../../morm/src/jsonexpression.h ../../morm/src/model.cpp ../../morm/src/model.h ../../morm/src/modelconnector.cpp ../../morm/src/modelconnector.h ../../morm/src/modeldata.h ../../morm/src/modelenv.h ../../morm/src/morm.h ../../morm/src/morm_types.h ../../morm/src/outstream.h ../../morm/src/postgresqlconnector.cpp ../../morm/src/postgresqlconnector.h ../../morm/src/postgresqlexpression.cpp ../../morm/src/postgresqlexpression.h ../../morm/src/postgresqlqueryresult.cpp ../../morm/src/postgresqlqueryresult.h ../../morm/src/queryresult.cpp ../../morm/src/queryresult.h ../../morm/src/ft.h ../../morm/src/baseobjectwrapper.h ../../morm/src/modelcontainerwrapper.h ../../morm/src/spacewrapper.h ../../morm/src/wrapper.h \ No newline at end of file +winix.src.files = ./core/app.h ./core/basethread.cpp ./core/acceptbaseparser.cpp ./core/acceptbaseparser.h ./core/acceptencodingparser.h ./core/basethread.h ./core/config.cpp ./core/config.h ./core/compress.cpp ./core/compress.h ./core/crypt.cpp ./core/dircontainer.cpp ./core/cookieparser.h ./core/request.cpp ./core/crypt.h ./core/cur.h ./core/winixmodeldeprecated.cpp ./core/app.cpp ./core/dircontainer.h ./core/dirs.cpp ./core/dirs.h ./core/error.h ./core/filelog.cpp ./core/filelog.h ./core/groups.cpp ./core/groups.h ./core/httpsimpleparser.cpp ./core/httpsimpleparser.h ./core/image.cpp ./core/image.h ./core/ipban.h ./core/ipbancontainer.cpp ./core/ipbancontainer.h ./core/job.cpp ./core/job.h ./core/lastcontainer.cpp ./core/lastcontainer.h ./core/loadavg.cpp ./core/loadavg.h ./core/lock.h ./core/lock.cpp ./core/log.cpp ./core/log.h ./core/logmanipulators.h ./core/misc.cpp ./core/misc.h ./core/mount.cpp ./core/mount.h ./core/mountparser.cpp ./core/mountparser.h ./core/mounts.cpp ./core/mounts.h ./core/plugin.cpp ./core/plugin.h ./core/plugindata.cpp ./core/plugindata.h ./core/pluginmsg.h ./core/postmultiparser.cpp ./core/postmultiparser.h ./core/postparser.h ./core/rebus.cpp ./core/rebus.h ./core/request.h ./core/requesttypes.h ./core/run.cpp ./core/run.h ./core/session.cpp ./core/session.h ./core/sessioncontainer.cpp ./core/sessioncontainer.h ./core/sessionidmanager.cpp ./core/sessionidmanager.h ./core/sessionmanager.cpp ./core/sessionmanager.h ./core/sessionparser.cpp ./core/sessionparser.h ./core/slog.cpp ./core/slog.h ./core/synchro.cpp ./core/synchro.h ./core/system.cpp ./core/system.h ./core/textstream.h ./core/threadmanager.cpp ./core/timezone.h ./core/threadmanager.h ./core/timezone.cpp ./core/timezones.cpp ./core/timezones.h ./core/ugcontainer.h ./core/users.cpp ./core/users.h ./core/version.h ./core/winix_const.h ./core/winixbase.cpp ./core/winixbase.h ./core/winixrequest.cpp ./core/winixrequest.h ./core/winixsystem.cpp ./core/winixsystem.h ./core/winixmodeldeprecated.h ./db/db.cpp ./db/db.h ./db/dbbase.cpp ./db/dbbase.h ./db/dbconn.cpp ./db/dbconn.h ./db/dbtextstream.cpp ./db/dbtextstream.h ./functions/account.cpp ./functions/account.h ./functions/adduser.cpp ./functions/adduser.h ./functions/cat.cpp ./functions/cat.h ./functions/chmod.cpp ./functions/chmod.h ./functions/chown.cpp ./functions/chown.h ./functions/ckeditor.cpp ./functions/ckeditor.h ./functions/cp.cpp ./functions/cp.h ./functions/default.cpp ./functions/default.h ./functions/download.cpp ./functions/download.h ./functions/emacs.cpp ./functions/emacs.h ./functions/env.cpp ./functions/env.h ./functions/functionbase.cpp ./functions/functionbase.h ./functions/functionparser.cpp ./functions/functionparser.h ./functions/functions.cpp ./functions/functions.h ./functions/imgcrop.cpp ./functions/imgcrop.h ./functions/ipban.cpp ./functions/ipban.h ./functions/last.cpp ./functions/last.h ./functions/ln.cpp ./functions/ln.h ./functions/locale.cpp ./functions/locale.h ./functions/login.cpp ./functions/login.h ./functions/logout.cpp ./functions/logout.h ./functions/ls.cpp ./functions/ls.h ./functions/man.cpp ./functions/man.h ./functions/meta.cpp ./functions/meta.h ./functions/mkdir.cpp ./functions/mkdir.h ./functions/mount.cpp ./functions/mount.h ./functions/mv.cpp ./functions/mv.h ./functions/nicedit.cpp ./functions/nicedit.h ./functions/node.cpp ./functions/node.h ./functions/passwd.cpp ./functions/passwd.h ./functions/priv.cpp ./functions/priv.h ./functions/privchanger.cpp ./functions/privchanger.h ./functions/pw.cpp ./functions/pw.h ./functions/reload.cpp ./functions/reload.h ./functions/rm.cpp ./functions/rm.h ./functions/rmuser.cpp ./functions/rmuser.h ./functions/run.cpp ./functions/run.h ./functions/sort.cpp ./functions/sort.h ./functions/specialdefault.cpp ./functions/specialdefault.h ./functions/stat.cpp ./functions/stat.h ./functions/subject.cpp ./functions/subject.h ./functions/template.cpp ./functions/template.h ./functions/timezone.cpp ./functions/timezone.h ./functions/tinymce.cpp ./functions/tinymce.h ./functions/uname.cpp ./functions/uname.h ./functions/upload.cpp ./functions/upload.h ./functions/uptime.cpp ./functions/uptime.h ./functions/vim.cpp ./functions/vim.h ./functions/who.cpp ./functions/who.h ./main/main.cpp ./models/group.cpp ./models/group.h ./models/item.cpp ./models/item.h ./models/itemcontent.cpp ./models/itemcontent.h ./models/migration.cpp ./models/migration.h ./models/user.cpp ./models/user.h ./models/userwrapper.h ./models/winixmodel.cpp ./models/winixmodel.h ./models/winixmodelconnector.cpp ./models/winixmodelconnector.h ./notify/notify.cpp ./notify/notify.h ./notify/notifypool.cpp ./notify/notifypool.h ./notify/notifythread.cpp ./notify/notifythread.h ./notify/templatesnotify.cpp ./notify/templatesnotify.h ./plugins/export/edb.cpp ./plugins/export/edb.h ./plugins/export/export.h ./plugins/export/exportinfo.cpp ./plugins/export/exportinfo.h ./plugins/export/exportthread.cpp ./plugins/export/exportthread.h ./plugins/export/funexport.cpp ./plugins/export/funexport.h ./plugins/export/init.cpp ./plugins/export/message.h ./plugins/gallery/gallery.cpp ./plugins/gallery/gallery.h ./plugins/gallery/galleryinfo.cpp ./plugins/gallery/galleryinfo.h ./plugins/gallery/init.cpp ./plugins/gallery/templates.cpp ./plugins/group/groupinfo.cpp ./plugins/group/groupinfo.h ./plugins/group/groups.cpp ./plugins/group/groups.h ./plugins/group/init.cpp ./plugins/group/templates.cpp ./plugins/mailregister/funregistermail.cpp ./plugins/mailregister/funregistermail.h ./plugins/mailregister/funregistermail_showusers.cpp ./plugins/mailregister/funregistermail_showusers.h ./plugins/mailregister/init.cpp ./plugins/mailregister/mdb.cpp ./plugins/mailregister/mdb.h ./plugins/mailregister/registermail_info.cpp ./plugins/mailregister/registermail_info.h ./plugins/mailregister/templates.cpp ./plugins/menu/cache.cpp ./plugins/menu/cache.h ./plugins/menu/init.cpp ./plugins/menu/templates.cpp ./plugins/seo/init.cpp ./plugins/seo/seo.cpp ./plugins/seo/seo.h ./plugins/stats/bot.cpp ./plugins/stats/bot.h ./plugins/stats/init.cpp ./plugins/stats/stats.cpp ./plugins/stats/stats.h ./plugins/stats/statssession.h ./plugins/stats/templates.cpp ./plugins/stats/templates.h ./plugins/thread/createthread.cpp ./plugins/thread/createthread.h ./plugins/thread/funthread.cpp ./plugins/thread/funthread.h ./plugins/thread/init.cpp ./plugins/thread/pluginmsg.h ./plugins/thread/reply.cpp ./plugins/thread/reply.h ./plugins/thread/showthreads.cpp ./plugins/thread/showthreads.h ./plugins/thread/tdb.cpp ./plugins/thread/tdb.h ./plugins/thread/templates.cpp ./plugins/thread/templates.h ./plugins/thread/thread.cpp ./plugins/thread/thread.h ./plugins/thread/threadfiles.cpp ./plugins/thread/threadfiles.h ./plugins/thread/threadinfo.cpp ./plugins/thread/threadinfo.h ./plugins/ticket/createticket.cpp ./plugins/ticket/createticket.h ./plugins/ticket/editticket.cpp ./plugins/ticket/editticket.h ./plugins/ticket/funticket.cpp ./plugins/ticket/funticket.h ./plugins/ticket/init.cpp ./plugins/ticket/pluginmsg.h ./plugins/ticket/sessiondata.cpp ./plugins/ticket/sessiondata.h ./plugins/ticket/showtickets.cpp ./plugins/ticket/showtickets.h ./plugins/ticket/tdb.cpp ./plugins/ticket/tdb.h ./plugins/ticket/templates.cpp ./plugins/ticket/ticket.h ./plugins/ticket/ticketinfo.cpp ./plugins/ticket/ticketinfo.h ./templates/adduser.cpp ./templates/antispam.cpp ./templates/changepatterns.cpp ./templates/changepatterns.h ./templates/config.cpp ./templates/currentdate.cpp ./templates/dir.cpp ./templates/doc.cpp ./templates/filters.cpp ./templates/generic.cpp ./templates/htmltextstream.cpp ./templates/htmltextstream.h ./templates/indexpatterns.cpp ./templates/indexpatterns.h ./templates/insert.cpp ./templates/ipban.cpp ./templates/locale.cpp ./templates/last.cpp ./templates/misc.cpp ./templates/locale.h ./templates/localefilter.cpp ./templates/localefilter.h ./templates/login.cpp ./templates/ls.cpp ./templates/man.cpp ./templates/misc.h ./templates/patterns.h ./templates/mount.cpp ./templates/passwd.cpp ./templates/patterncacher.cpp ./templates/patterncacher.h ./templates/patterns.cpp ./templates/priv.cpp ./templates/templates.h ./templates/rebus.cpp ./templates/server.cpp ./templates/slog.cpp ./templates/stat.cpp ./templates/sys.cpp ./templates/template.cpp ./templates/templates.cpp ./templates/user.cpp ./templates/textextstream.cpp ./templates/textextstream.h ./templates/upload.cpp ./templates/uptime.cpp ./templates/who.cpp ./templates/winix.cpp ../../ezc/src/blocks.cpp ../../ezc/src/blocks.h ../../ezc/src/cache.cpp ../../ezc/src/cache.h ../../ezc/src/expressionparser.h ../../ezc/src/ezc.h ../../ezc/src/functions.h ../../ezc/src/funinfo.h ../../ezc/src/generator.h ../../ezc/src/item.cpp ../../ezc/src/item.h ../../ezc/src/objects.h ../../ezc/src/outstreams.h ../../ezc/src/pattern.cpp ../../ezc/src/pattern.h ../../ezc/src/patternparser.cpp ../../ezc/src/patternparser.h ../../ezc/src/models.cpp ../../ezc/src/models.h ../../tito/src/aes.cpp ../../tito/src/aes.h ../../tito/src/base32.cpp ../../tito/src/base32.h ../../tito/src/base64.cpp ../../tito/src/base64.h ../../tito/src/crypto.cpp ../../tito/src/crypto.h ../../tito/src/misc.cpp ../../tito/src/misc.h ../../pikotools/src/convert/convert.h ../../pikotools/src/convert/inttostr.cpp ../../pikotools/src/convert/inttostr.h ../../pikotools/src/convert/misc.cpp ../../pikotools/src/convert/misc.h ../../pikotools/src/convert/patternreplacer.h ../../pikotools/src/convert/strtoint.h ../../pikotools/src/convert/text.cpp ../../pikotools/src/convert/text.h ../../pikotools/src/convert/text_private.h ../../pikotools/src/convert/double.cpp ../../pikotools/src/convert/double.h ../../pikotools/src/convert/baseparser.h ../../pikotools/src/convert/baseparser.cpp ../../pikotools/src/date/date.cpp ../../pikotools/src/date/date.h ../../pikotools/src/log/filelog.cpp ../../pikotools/src/log/filelog.h ../../pikotools/src/log/log.cpp ../../pikotools/src/log/log.h ../../pikotools/src/membuffer/membuffer.h ../../pikotools/src/space/space.cpp ../../pikotools/src/space/space.h ../../pikotools/src/space/spaceparser.cpp ../../pikotools/src/space/spaceparser.h ../../pikotools/src/textstream/textstream.h ../../pikotools/src/textstream/types.h ../../pikotools/src/textstream/stream.h ../../pikotools/src/utf8/utf8.cpp ../../pikotools/src/utf8/utf8.h ../../pikotools/src/utf8/utf8_private.cpp ../../pikotools/src/utf8/utf8_private.h ../../pikotools/src/utf8/utf8_templates.h ../../pikotools/src/csv/csvparser.cpp ../../pikotools/src/csv/csvparser.h ../../pikotools/src/mainoptions/mainoptionsparser.cpp ../../pikotools/src/mainoptions/mainoptionsparser.h ../../pikotools/src/html/htmlparser.cpp ../../pikotools/src/html/htmlparser.h ../../pikotools/src/html/bbcodeparser.h ../../pikotools/src/html/bbcodeparser.cpp ../../morm/src/baseexpression.cpp ../../morm/src/baseexpression.h ../../morm/src/clearer.cpp ../../morm/src/clearer.h ../../morm/src/cursor.h ../../morm/src/cursorhelper.h ../../morm/src/dbconnector.cpp ../../morm/src/dbconnector.h ../../morm/src/dbexpression.cpp ../../morm/src/dbexpression.h ../../morm/src/fieldvaluehelper.h ../../morm/src/finder.h ../../morm/src/finderhelper.h ../../morm/src/flatconnector.cpp ../../morm/src/flatconnector.h ../../morm/src/flatexpression.cpp ../../morm/src/flatexpression.h ../../morm/src/jsonconnector.cpp ../../morm/src/jsonconnector.h ../../morm/src/jsonexpression.cpp ../../morm/src/jsonexpression.h ../../morm/src/model.cpp ../../morm/src/model.h ../../morm/src/modelconnector.cpp ../../morm/src/modelconnector.h ../../morm/src/modeldata.h ../../morm/src/modelenv.h ../../morm/src/morm.h ../../morm/src/morm_types.h ../../morm/src/outstream.h ../../morm/src/postgresqlconnector.cpp ../../morm/src/postgresqlconnector.h ../../morm/src/postgresqlexpression.cpp ../../morm/src/postgresqlexpression.h ../../morm/src/postgresqlqueryresult.cpp ../../morm/src/postgresqlqueryresult.h ../../morm/src/queryresult.cpp ../../morm/src/queryresult.h ../../morm/src/ft.h ../../morm/src/baseobjectwrapper.h ../../morm/src/modelcontainerwrapper.h ../../morm/src/spacewrapper.h ../../morm/src/wrapper.h \ No newline at end of file diff --git a/winixd/core/Makefile.dep b/winixd/core/Makefile.dep index df5660f..d827b2d 100644 --- a/winixd/core/Makefile.dep +++ b/winixd/core/Makefile.dep @@ -9,7 +9,8 @@ acceptbaseparser.o: ../../../pikotools/src/convert/inttostr.h acceptbaseparser.o: ../../../pikotools/src/utf8/utf8.h acceptbaseparser.o: ../../../pikotools/src/textstream/stream.h acceptbaseparser.o: ../../../pikotools/src/utf8/utf8_templates.h -acceptbaseparser.o: ../../../pikotools/src/utf8/utf8_private.h log.h +acceptbaseparser.o: ../../../pikotools/src/utf8/utf8_private.h +acceptbaseparser.o: ../../../pikotools/src/convert/baseparser.h log.h acceptbaseparser.o: logmanipulators.h ../../../pikotools/src/log/log.h acceptbaseparser.o: ../../../pikotools/src/textstream/textstream.h acceptbaseparser.o: ../../../pikotools/src/textstream/stream.h @@ -85,6 +86,7 @@ app.o: ../../../winix/winixd/templates/locale.h app.o: ../../../pikotools/src/space/spaceparser.h app.o: ../../../pikotools/src/space/space.h app.o: ../../../pikotools/src/textstream/types.h +app.o: ../../../pikotools/src/convert/baseparser.h app.o: ../../../winix/winixd/core/winixbase.h app.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h app.o: ../../../morm/src/morm.h ../../../morm/src/finder.h @@ -190,7 +192,7 @@ app.o: ../../../winix/winixd/functions/upload.h app.o: ../../../winix/winixd/functions/uptime.h app.o: ../../../winix/winixd/functions/who.h app.o: ../../../winix/winixd/functions/vim.h -app.o: ../../../pikotools/src/html/htmlfilter.h +app.o: ../../../pikotools/src/html/htmlparser.h app.o: ../../../winix/winixd/templates/templates.h app.o: ../../../winix/winixd/templates/patterncacher.h app.o: ../../../winix/winixd/templates/indexpatterns.h @@ -209,7 +211,8 @@ basethread.o: ../../../pikotools/src/convert/inttostr.h basethread.o: ../../../pikotools/src/utf8/utf8.h basethread.o: ../../../pikotools/src/textstream/stream.h basethread.o: ../../../pikotools/src/utf8/utf8_templates.h -basethread.o: ../../../pikotools/src/utf8/utf8_private.h log.h +basethread.o: ../../../pikotools/src/utf8/utf8_private.h +basethread.o: ../../../pikotools/src/convert/baseparser.h log.h basethread.o: logmanipulators.h ../../../pikotools/src/log/log.h basethread.o: ../../../pikotools/src/textstream/textstream.h basethread.o: ../../../pikotools/src/textstream/stream.h @@ -255,8 +258,9 @@ compress.o: ../../../pikotools/src/utf8/utf8_private.h winixbase.h compress.o: ../../../winix/winixd/core/config.h compress.o: ../../../pikotools/src/space/spaceparser.h compress.o: ../../../pikotools/src/space/space.h -compress.o: ../../../pikotools/src/textstream/types.h log.h logmanipulators.h -compress.o: ../../../pikotools/src/log/log.h filelog.h +compress.o: ../../../pikotools/src/textstream/types.h +compress.o: ../../../pikotools/src/convert/baseparser.h log.h +compress.o: logmanipulators.h ../../../pikotools/src/log/log.h filelog.h compress.o: ../../../winix/winixd/core/synchro.h ../../../morm/src/morm.h compress.o: ../../../morm/src/morm_types.h ../../../morm/src/model.h compress.o: ../../../morm/src/modelconnector.h ../../../morm/src/clearer.h @@ -320,6 +324,7 @@ config.o: ../../../winix/winixd/core/config.h config.o: ../../../pikotools/src/space/spaceparser.h config.o: ../../../pikotools/src/space/space.h config.o: ../../../pikotools/src/textstream/types.h +config.o: ../../../pikotools/src/convert/baseparser.h config.o: ../../../winix/winixd/core/log.h config.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h config.o: ../../../winix/winixd/models/user.h @@ -346,7 +351,8 @@ crypt.o: ../../../pikotools/src/convert/inttostr.h crypt.o: ../../../pikotools/src/utf8/utf8.h crypt.o: ../../../pikotools/src/textstream/stream.h crypt.o: ../../../pikotools/src/utf8/utf8_templates.h -crypt.o: ../../../pikotools/src/utf8/utf8_private.h log.h logmanipulators.h +crypt.o: ../../../pikotools/src/utf8/utf8_private.h +crypt.o: ../../../pikotools/src/convert/baseparser.h log.h logmanipulators.h crypt.o: ../../../pikotools/src/log/log.h crypt.o: ../../../pikotools/src/textstream/textstream.h crypt.o: ../../../pikotools/src/textstream/stream.h @@ -405,7 +411,8 @@ dircontainer.o: ../../../pikotools/src/convert/inttostr.h dircontainer.o: ../../../pikotools/src/utf8/utf8.h dircontainer.o: ../../../pikotools/src/textstream/stream.h dircontainer.o: ../../../pikotools/src/utf8/utf8_templates.h -dircontainer.o: ../../../pikotools/src/utf8/utf8_private.h log.h +dircontainer.o: ../../../pikotools/src/utf8/utf8_private.h +dircontainer.o: ../../../pikotools/src/convert/baseparser.h log.h dircontainer.o: logmanipulators.h ../../../pikotools/src/log/log.h dircontainer.o: ../../../pikotools/src/textstream/textstream.h dircontainer.o: ../../../pikotools/src/textstream/stream.h @@ -469,7 +476,8 @@ dirs.o: ../../../pikotools/src/convert/inttostr.h dirs.o: ../../../pikotools/src/utf8/utf8.h dirs.o: ../../../pikotools/src/textstream/stream.h dirs.o: ../../../pikotools/src/utf8/utf8_templates.h -dirs.o: ../../../pikotools/src/utf8/utf8_private.h log.h logmanipulators.h +dirs.o: ../../../pikotools/src/utf8/utf8_private.h +dirs.o: ../../../pikotools/src/convert/baseparser.h log.h logmanipulators.h dirs.o: ../../../pikotools/src/log/log.h dirs.o: ../../../pikotools/src/textstream/textstream.h dirs.o: ../../../pikotools/src/textstream/stream.h @@ -555,7 +563,8 @@ filelog.o: ../../../pikotools/src/utf8/utf8_templates.h filelog.o: ../../../pikotools/src/utf8/utf8_private.h timezones.h timezone.h filelog.o: ../../../pikotools/src/space/spaceparser.h filelog.o: ../../../pikotools/src/space/space.h -filelog.o: ../../../pikotools/src/textstream/types.h winixbase.h +filelog.o: ../../../pikotools/src/textstream/types.h +filelog.o: ../../../pikotools/src/convert/baseparser.h winixbase.h filelog.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h filelog.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h filelog.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h @@ -613,7 +622,8 @@ groups.o: ../../../winix/winixd/core/winixbase.h groups.o: ../../../winix/winixd/core/config.h groups.o: ../../../pikotools/src/space/spaceparser.h groups.o: ../../../pikotools/src/space/space.h -groups.o: ../../../pikotools/src/textstream/types.h log.h logmanipulators.h +groups.o: ../../../pikotools/src/textstream/types.h +groups.o: ../../../pikotools/src/convert/baseparser.h log.h logmanipulators.h groups.o: ../../../morm/src/morm.h ../../../morm/src/finder.h groups.o: ../../../morm/src/cursor.h ../../../morm/src/jsonexpression.h groups.o: ../../../morm/src/postgresqlexpression.h @@ -656,7 +666,8 @@ httpsimpleparser.o: ../../../pikotools/src/convert/inttostr.h httpsimpleparser.o: ../../../pikotools/src/utf8/utf8.h httpsimpleparser.o: ../../../pikotools/src/textstream/stream.h httpsimpleparser.o: ../../../pikotools/src/utf8/utf8_templates.h -httpsimpleparser.o: ../../../pikotools/src/utf8/utf8_private.h log.h +httpsimpleparser.o: ../../../pikotools/src/utf8/utf8_private.h +httpsimpleparser.o: ../../../pikotools/src/convert/baseparser.h log.h httpsimpleparser.o: logmanipulators.h ../../../pikotools/src/log/log.h httpsimpleparser.o: ../../../pikotools/src/textstream/textstream.h httpsimpleparser.o: ../../../pikotools/src/textstream/stream.h @@ -711,7 +722,8 @@ image.o: ../../../pikotools/src/convert/inttostr.h image.o: ../../../pikotools/src/utf8/utf8.h image.o: ../../../pikotools/src/textstream/stream.h image.o: ../../../pikotools/src/utf8/utf8_templates.h -image.o: ../../../pikotools/src/utf8/utf8_private.h log.h logmanipulators.h +image.o: ../../../pikotools/src/utf8/utf8_private.h +image.o: ../../../pikotools/src/convert/baseparser.h log.h logmanipulators.h image.o: ../../../pikotools/src/log/log.h image.o: ../../../pikotools/src/textstream/textstream.h image.o: ../../../pikotools/src/textstream/stream.h @@ -797,7 +809,8 @@ ipbancontainer.o: ../../../pikotools/src/convert/inttostr.h ipbancontainer.o: ../../../pikotools/src/utf8/utf8.h ipbancontainer.o: ../../../pikotools/src/textstream/stream.h ipbancontainer.o: ../../../pikotools/src/utf8/utf8_templates.h -ipbancontainer.o: ../../../pikotools/src/utf8/utf8_private.h log.h +ipbancontainer.o: ../../../pikotools/src/utf8/utf8_private.h +ipbancontainer.o: ../../../pikotools/src/convert/baseparser.h log.h ipbancontainer.o: logmanipulators.h ../../../pikotools/src/log/log.h ipbancontainer.o: ../../../pikotools/src/textstream/textstream.h ipbancontainer.o: ../../../pikotools/src/textstream/stream.h @@ -843,7 +856,8 @@ job.o: ../../../pikotools/src/convert/inttostr.h job.o: ../../../pikotools/src/utf8/utf8.h job.o: ../../../pikotools/src/textstream/stream.h job.o: ../../../pikotools/src/utf8/utf8_templates.h -job.o: ../../../pikotools/src/utf8/utf8_private.h log.h logmanipulators.h +job.o: ../../../pikotools/src/utf8/utf8_private.h +job.o: ../../../pikotools/src/convert/baseparser.h log.h logmanipulators.h job.o: ../../../pikotools/src/log/log.h job.o: ../../../pikotools/src/textstream/textstream.h job.o: ../../../pikotools/src/textstream/stream.h @@ -880,7 +894,8 @@ lastcontainer.o: ../../../pikotools/src/textstream/types.h lastcontainer.o: ../../../pikotools/src/utf8/utf8.h lastcontainer.o: ../../../pikotools/src/textstream/stream.h lastcontainer.o: ../../../pikotools/src/utf8/utf8_templates.h -lastcontainer.o: ../../../pikotools/src/utf8/utf8_private.h log.h +lastcontainer.o: ../../../pikotools/src/utf8/utf8_private.h +lastcontainer.o: ../../../pikotools/src/convert/baseparser.h log.h lastcontainer.o: logmanipulators.h ../../../pikotools/src/log/log.h lastcontainer.o: ../../../pikotools/src/textstream/textstream.h lastcontainer.o: ../../../pikotools/src/textstream/stream.h @@ -927,8 +942,9 @@ loadavg.o: ../../../pikotools/src/convert/inttostr.h loadavg.o: ../../../pikotools/src/utf8/utf8.h loadavg.o: ../../../pikotools/src/textstream/stream.h loadavg.o: ../../../pikotools/src/utf8/utf8_templates.h -loadavg.o: ../../../pikotools/src/utf8/utf8_private.h log.h logmanipulators.h -loadavg.o: ../../../pikotools/src/log/log.h +loadavg.o: ../../../pikotools/src/utf8/utf8_private.h +loadavg.o: ../../../pikotools/src/convert/baseparser.h log.h +loadavg.o: logmanipulators.h ../../../pikotools/src/log/log.h loadavg.o: ../../../pikotools/src/textstream/textstream.h loadavg.o: ../../../pikotools/src/textstream/stream.h loadavg.o: ../../../pikotools/src/space/space.h @@ -1042,7 +1058,8 @@ misc.o: ../../../winix/winixd/core/winixbase.h misc.o: ../../../winix/winixd/core/config.h misc.o: ../../../pikotools/src/space/spaceparser.h misc.o: ../../../pikotools/src/space/space.h -misc.o: ../../../pikotools/src/textstream/types.h log.h logmanipulators.h +misc.o: ../../../pikotools/src/textstream/types.h +misc.o: ../../../pikotools/src/convert/baseparser.h log.h logmanipulators.h misc.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h misc.o: ../../../morm/src/model.h ../../../morm/src/modelconnector.h misc.o: ../../../morm/src/clearer.h ../../../morm/src/dbconnector.h @@ -1077,7 +1094,7 @@ misc.o: ../../../winix/winixd/templates/patterns.h misc.o: ../../../winix/winixd/templates/changepatterns.h misc.o: ../../../winix/winixd/core/cur.h ../../../winix/winixd/core/system.h misc.o: ../../../winix/winixd/core/sessionmanager.h -misc.o: ../../../pikotools/src/html/htmlfilter.h +misc.o: ../../../pikotools/src/html/htmlparser.h misc.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h misc.o: ../../../winix/winixd/db/dbconn.h misc.o: ../../../winix/winixd/db/dbtextstream.h @@ -1120,7 +1137,8 @@ mountparser.o: ../../../pikotools/src/convert/inttostr.h mountparser.o: ../../../pikotools/src/utf8/utf8.h mountparser.o: ../../../pikotools/src/textstream/stream.h mountparser.o: ../../../pikotools/src/utf8/utf8_templates.h -mountparser.o: ../../../pikotools/src/utf8/utf8_private.h log.h +mountparser.o: ../../../pikotools/src/utf8/utf8_private.h +mountparser.o: ../../../pikotools/src/convert/baseparser.h log.h mountparser.o: logmanipulators.h ../../../pikotools/src/log/log.h mountparser.o: ../../../pikotools/src/textstream/textstream.h mountparser.o: ../../../pikotools/src/textstream/stream.h @@ -1198,7 +1216,8 @@ mounts.o: ../../../pikotools/src/convert/inttostr.h mounts.o: ../../../pikotools/src/utf8/utf8.h mounts.o: ../../../pikotools/src/textstream/stream.h mounts.o: ../../../pikotools/src/utf8/utf8_templates.h -mounts.o: ../../../pikotools/src/utf8/utf8_private.h log.h logmanipulators.h +mounts.o: ../../../pikotools/src/utf8/utf8_private.h +mounts.o: ../../../pikotools/src/convert/baseparser.h log.h logmanipulators.h mounts.o: ../../../pikotools/src/log/log.h mounts.o: ../../../pikotools/src/textstream/textstream.h mounts.o: ../../../pikotools/src/textstream/stream.h @@ -1271,7 +1290,8 @@ plugin.o: ../../../pikotools/src/convert/inttostr.h plugin.o: ../../../pikotools/src/utf8/utf8.h plugin.o: ../../../pikotools/src/textstream/stream.h plugin.o: ../../../pikotools/src/utf8/utf8_templates.h -plugin.o: ../../../pikotools/src/utf8/utf8_private.h log.h logmanipulators.h +plugin.o: ../../../pikotools/src/utf8/utf8_private.h +plugin.o: ../../../pikotools/src/convert/baseparser.h log.h logmanipulators.h plugin.o: ../../../pikotools/src/log/log.h plugin.o: ../../../pikotools/src/textstream/textstream.h plugin.o: ../../../pikotools/src/textstream/stream.h @@ -1403,7 +1423,7 @@ plugin.o: ../../../winix/winixd/functions/upload.h plugin.o: ../../../winix/winixd/functions/uptime.h plugin.o: ../../../winix/winixd/functions/who.h plugin.o: ../../../winix/winixd/functions/vim.h -plugin.o: ../../../pikotools/src/html/htmlfilter.h +plugin.o: ../../../pikotools/src/html/htmlparser.h plugin.o: ../../../winix/winixd/templates/templates.h plugin.o: ../../../winix/winixd/templates/patterncacher.h plugin.o: ../../../winix/winixd/templates/indexpatterns.h @@ -1418,7 +1438,8 @@ plugindata.o: ../../../pikotools/src/convert/inttostr.h plugindata.o: ../../../pikotools/src/utf8/utf8.h plugindata.o: ../../../pikotools/src/textstream/stream.h plugindata.o: ../../../pikotools/src/utf8/utf8_templates.h -plugindata.o: ../../../pikotools/src/utf8/utf8_private.h log.h +plugindata.o: ../../../pikotools/src/utf8/utf8_private.h +plugindata.o: ../../../pikotools/src/convert/baseparser.h log.h plugindata.o: logmanipulators.h ../../../pikotools/src/log/log.h plugindata.o: ../../../pikotools/src/textstream/textstream.h plugindata.o: ../../../pikotools/src/textstream/stream.h @@ -1469,7 +1490,8 @@ postmultiparser.o: ../../../pikotools/src/convert/double.h winixbase.h postmultiparser.o: ../../../winix/winixd/core/config.h postmultiparser.o: ../../../pikotools/src/space/spaceparser.h postmultiparser.o: ../../../pikotools/src/space/space.h -postmultiparser.o: ../../../pikotools/src/textstream/types.h log.h +postmultiparser.o: ../../../pikotools/src/textstream/types.h +postmultiparser.o: ../../../pikotools/src/convert/baseparser.h log.h postmultiparser.o: logmanipulators.h ../../../pikotools/src/log/log.h postmultiparser.o: filelog.h ../../../winix/winixd/core/synchro.h postmultiparser.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -1534,6 +1556,7 @@ rebus.o: ../../../winix/winixd/core/config.h rebus.o: ../../../pikotools/src/space/spaceparser.h rebus.o: ../../../pikotools/src/space/space.h rebus.o: ../../../pikotools/src/textstream/types.h +rebus.o: ../../../pikotools/src/convert/baseparser.h rebus.o: ../../../winix/winixd/core/log.h rebus.o: ../../../winix/winixd/core/filelog.h lock.h synchro.h misc.h rebus.o: requesttypes.h winix_const.h @@ -1602,6 +1625,7 @@ request.o: ../../../winix/winixd/templates/locale.h request.o: ../../../pikotools/src/space/spaceparser.h request.o: ../../../pikotools/src/space/space.h request.o: ../../../pikotools/src/textstream/types.h +request.o: ../../../pikotools/src/convert/baseparser.h request.o: ../../../winix/winixd/core/winixbase.h request.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h request.o: ../../../morm/src/morm.h ../../../morm/src/finder.h @@ -1662,7 +1686,8 @@ run.o: ../../../pikotools/src/convert/inttostr.h run.o: ../../../pikotools/src/utf8/utf8.h run.o: ../../../pikotools/src/textstream/stream.h run.o: ../../../pikotools/src/utf8/utf8_templates.h -run.o: ../../../pikotools/src/utf8/utf8_private.h log.h logmanipulators.h +run.o: ../../../pikotools/src/utf8/utf8_private.h +run.o: ../../../pikotools/src/convert/baseparser.h log.h logmanipulators.h run.o: ../../../pikotools/src/log/log.h run.o: ../../../pikotools/src/textstream/textstream.h run.o: ../../../pikotools/src/textstream/stream.h @@ -1723,6 +1748,7 @@ session.o: ../../../winix/winixd/templates/locale.h session.o: ../../../pikotools/src/space/spaceparser.h session.o: ../../../pikotools/src/space/space.h session.o: ../../../pikotools/src/textstream/types.h +session.o: ../../../pikotools/src/convert/baseparser.h session.o: ../../../winix/winixd/core/winixbase.h session.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h session.o: ../../../morm/src/morm.h ../../../morm/src/finder.h @@ -1791,6 +1817,7 @@ sessioncontainer.o: ../../../winix/winixd/templates/locale.h sessioncontainer.o: ../../../pikotools/src/space/spaceparser.h sessioncontainer.o: ../../../pikotools/src/space/space.h sessioncontainer.o: ../../../pikotools/src/textstream/types.h +sessioncontainer.o: ../../../pikotools/src/convert/baseparser.h sessioncontainer.o: ../../../winix/winixd/core/winixbase.h sessioncontainer.o: ../../../winix/winixd/core/config.h log.h sessioncontainer.o: logmanipulators.h ../../../morm/src/morm.h @@ -1838,7 +1865,8 @@ sessionidmanager.o: ../../../pikotools/src/convert/inttostr.h sessionidmanager.o: ../../../pikotools/src/utf8/utf8.h sessionidmanager.o: ../../../pikotools/src/textstream/stream.h sessionidmanager.o: ../../../pikotools/src/utf8/utf8_templates.h -sessionidmanager.o: ../../../pikotools/src/utf8/utf8_private.h log.h +sessionidmanager.o: ../../../pikotools/src/utf8/utf8_private.h +sessionidmanager.o: ../../../pikotools/src/convert/baseparser.h log.h sessionidmanager.o: logmanipulators.h ../../../pikotools/src/log/log.h sessionidmanager.o: ../../../pikotools/src/textstream/textstream.h sessionidmanager.o: ../../../pikotools/src/textstream/stream.h @@ -1920,6 +1948,7 @@ sessionmanager.o: ../../../winix/winixd/templates/locale.h sessionmanager.o: ../../../pikotools/src/space/spaceparser.h sessionmanager.o: ../../../pikotools/src/space/space.h sessionmanager.o: ../../../pikotools/src/textstream/types.h +sessionmanager.o: ../../../pikotools/src/convert/baseparser.h sessionmanager.o: ../../../winix/winixd/core/winixbase.h sessionmanager.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h sessionmanager.o: ../../../morm/src/morm.h ../../../morm/src/finder.h @@ -2025,6 +2054,7 @@ sessionparser.o: ../../../winix/winixd/templates/locale.h sessionparser.o: ../../../pikotools/src/space/spaceparser.h sessionparser.o: ../../../pikotools/src/space/space.h sessionparser.o: ../../../pikotools/src/textstream/types.h +sessionparser.o: ../../../pikotools/src/convert/baseparser.h sessionparser.o: ../../../winix/winixd/core/winixbase.h sessionparser.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h sessionparser.o: ../../../morm/src/morm.h ../../../morm/src/finder.h @@ -2106,6 +2136,7 @@ slog.o: ../../../winix/winixd/templates/locale.h slog.o: ../../../pikotools/src/space/spaceparser.h slog.o: ../../../pikotools/src/space/space.h slog.o: ../../../pikotools/src/textstream/types.h +slog.o: ../../../pikotools/src/convert/baseparser.h slog.o: ../../../winix/winixd/core/winixbase.h slog.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h slog.o: ../../../morm/src/morm.h ../../../morm/src/finder.h @@ -2143,7 +2174,8 @@ system.o: ../../../pikotools/src/convert/inttostr.h system.o: ../../../pikotools/src/utf8/utf8.h system.o: ../../../pikotools/src/textstream/stream.h system.o: ../../../pikotools/src/utf8/utf8_templates.h -system.o: ../../../pikotools/src/utf8/utf8_private.h log.h logmanipulators.h +system.o: ../../../pikotools/src/utf8/utf8_private.h +system.o: ../../../pikotools/src/convert/baseparser.h log.h logmanipulators.h system.o: ../../../pikotools/src/log/log.h system.o: ../../../pikotools/src/textstream/textstream.h system.o: ../../../pikotools/src/textstream/stream.h @@ -2226,7 +2258,7 @@ system.o: ../../../winix/winixd/templates/changepatterns.h system.o: ../../../winix/winixd/core/cur.h system.o: ../../../winix/winixd/core/system.h system.o: ../../../winix/winixd/core/sessionmanager.h -system.o: ../../../pikotools/src/html/htmlfilter.h +system.o: ../../../pikotools/src/html/htmlparser.h system.o: ../../../winix/winixd/core/winixrequest.h system.o: ../../../winix/winixd/core/winixsystem.h system.o: ../../../winix/winixd/core/slog.h @@ -2288,7 +2320,8 @@ threadmanager.o: ../../../pikotools/src/convert/inttostr.h threadmanager.o: ../../../pikotools/src/utf8/utf8.h threadmanager.o: ../../../pikotools/src/textstream/stream.h threadmanager.o: ../../../pikotools/src/utf8/utf8_templates.h -threadmanager.o: ../../../pikotools/src/utf8/utf8_private.h log.h +threadmanager.o: ../../../pikotools/src/utf8/utf8_private.h +threadmanager.o: ../../../pikotools/src/convert/baseparser.h log.h threadmanager.o: logmanipulators.h ../../../pikotools/src/log/log.h threadmanager.o: ../../../pikotools/src/textstream/textstream.h threadmanager.o: ../../../pikotools/src/textstream/stream.h @@ -2349,7 +2382,8 @@ timezones.o: ../../../pikotools/src/textstream/types.h timezones.o: ../../../pikotools/src/utf8/utf8.h timezones.o: ../../../pikotools/src/textstream/stream.h timezones.o: ../../../pikotools/src/utf8/utf8_templates.h -timezones.o: ../../../pikotools/src/utf8/utf8_private.h winixbase.h +timezones.o: ../../../pikotools/src/utf8/utf8_private.h +timezones.o: ../../../pikotools/src/convert/baseparser.h winixbase.h timezones.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h timezones.o: ../../../pikotools/src/log/log.h timezones.o: ../../../pikotools/src/textstream/textstream.h @@ -2418,6 +2452,7 @@ users.o: ../../../winix/winixd/templates/locale.h users.o: ../../../pikotools/src/space/spaceparser.h users.o: ../../../pikotools/src/space/space.h users.o: ../../../pikotools/src/textstream/types.h +users.o: ../../../pikotools/src/convert/baseparser.h users.o: ../../../winix/winixd/core/winixbase.h users.o: ../../../winix/winixd/core/config.h log.h logmanipulators.h users.o: ../../../morm/src/morm.h ../../../morm/src/finder.h @@ -2480,7 +2515,8 @@ winixbase.o: ../../../pikotools/src/convert/inttostr.h winixbase.o: ../../../pikotools/src/utf8/utf8.h winixbase.o: ../../../pikotools/src/textstream/stream.h winixbase.o: ../../../pikotools/src/utf8/utf8_templates.h -winixbase.o: ../../../pikotools/src/utf8/utf8_private.h log.h +winixbase.o: ../../../pikotools/src/utf8/utf8_private.h +winixbase.o: ../../../pikotools/src/convert/baseparser.h log.h winixbase.o: logmanipulators.h ../../../pikotools/src/log/log.h winixbase.o: ../../../pikotools/src/textstream/textstream.h winixbase.o: ../../../pikotools/src/textstream/stream.h @@ -2520,7 +2556,8 @@ winixmodeldeprecated.o: ../../../pikotools/src/convert/inttostr.h winixmodeldeprecated.o: ../../../pikotools/src/utf8/utf8.h winixmodeldeprecated.o: ../../../pikotools/src/textstream/stream.h winixmodeldeprecated.o: ../../../pikotools/src/utf8/utf8_templates.h -winixmodeldeprecated.o: ../../../pikotools/src/utf8/utf8_private.h log.h +winixmodeldeprecated.o: ../../../pikotools/src/utf8/utf8_private.h +winixmodeldeprecated.o: ../../../pikotools/src/convert/baseparser.h log.h winixmodeldeprecated.o: logmanipulators.h ../../../pikotools/src/log/log.h winixmodeldeprecated.o: ../../../pikotools/src/textstream/textstream.h winixmodeldeprecated.o: ../../../pikotools/src/textstream/stream.h @@ -2571,7 +2608,8 @@ winixsystem.o: ../../../pikotools/src/convert/inttostr.h winixsystem.o: ../../../pikotools/src/utf8/utf8.h winixsystem.o: ../../../pikotools/src/textstream/stream.h winixsystem.o: ../../../pikotools/src/utf8/utf8_templates.h -winixsystem.o: ../../../pikotools/src/utf8/utf8_private.h log.h +winixsystem.o: ../../../pikotools/src/utf8/utf8_private.h +winixsystem.o: ../../../pikotools/src/convert/baseparser.h log.h winixsystem.o: logmanipulators.h ../../../pikotools/src/log/log.h winixsystem.o: ../../../pikotools/src/textstream/textstream.h winixsystem.o: ../../../pikotools/src/textstream/stream.h diff --git a/winixd/core/config.cpp b/winixd/core/config.cpp index fccc492..8a98b40 100644 --- a/winixd/core/config.cpp +++ b/winixd/core/config.cpp @@ -235,9 +235,8 @@ void Config::AssignValues(bool stdout_is_closed) compression_page_min_size = Size(L"compression_page_min_size", 512); compression_encoding = Int(L"compression_encoding", 20); - html_filter = Bool(L"html_filter", true); - html_filter_trim_white = Bool(L"html_filter_trim_white", true); - html_filter_break_word = Int(L"html_filter_break_word", 60); + html_filter = Bool(L"html_filter", false); + html_filter_white_char_mode = Int(L"html_filter_white_char_mode", 2); html_filter_wrap_line = Int(L"html_filter_wrap_line", 110); html_filter_tabs = Size(L"html_filter_tabs", 2); html_filter_orphans = Bool(L"html_filter_orphans", true); diff --git a/winixd/core/config.h b/winixd/core/config.h index 7e7f09e..c2913dd 100644 --- a/winixd/core/config.h +++ b/winixd/core/config.h @@ -308,15 +308,15 @@ public: std::vector plugin_file; // should the html code be cleaned by the html filter + // default: false bool html_filter; - // should white characters be trimmed - bool html_filter_trim_white; - - // when long words should be broken (a space will be inserted) - // default: after 60 non white characters there will be put a space - // set zero to turn off - size_t html_filter_break_word; + // how white characters between html tags are treated + // 0 - WHITE_MODE_ORIGIN - they are copied from input to output + // 1 - WHITE_MODE_SINGLE_LINE - new line characters are removed + // 2 - WHITE_MODE_TREE - try to create a tree (some kind of pretty printing) + // default: 2 + int html_filter_white_char_mode; // when long lines should be broken (a new line character will be inserted) // default: 110 diff --git a/winixd/db/Makefile.dep b/winixd/db/Makefile.dep index 406c197..531a2a4 100644 --- a/winixd/db/Makefile.dep +++ b/winixd/db/Makefile.dep @@ -26,7 +26,9 @@ db.o: ../../../pikotools/src/convert/double.h db.o: ../../../winix/winixd/core/winixbase.h db.o: ../../../winix/winixd/core/config.h db.o: ../../../pikotools/src/space/spaceparser.h -db.o: ../../../pikotools/src/space/space.h ../../../winix/winixd/core/log.h +db.o: ../../../pikotools/src/space/space.h +db.o: ../../../pikotools/src/convert/baseparser.h +db.o: ../../../winix/winixd/core/log.h db.o: ../../../winix/winixd/core/logmanipulators.h db.o: ../../../pikotools/src/log/log.h ../../../pikotools/src/log/filelog.h db.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -99,6 +101,7 @@ dbbase.o: ../../../winix/winixd/core/winixbase.h dbbase.o: ../../../winix/winixd/core/config.h dbbase.o: ../../../pikotools/src/space/spaceparser.h dbbase.o: ../../../pikotools/src/space/space.h +dbbase.o: ../../../pikotools/src/convert/baseparser.h dbbase.o: ../../../winix/winixd/core/log.h dbbase.o: ../../../winix/winixd/core/logmanipulators.h dbbase.o: ../../../pikotools/src/log/log.h @@ -154,6 +157,7 @@ dbconn.o: ../../../winix/winixd/core/winixbase.h dbconn.o: ../../../winix/winixd/core/config.h dbconn.o: ../../../pikotools/src/space/spaceparser.h dbconn.o: ../../../pikotools/src/space/space.h +dbconn.o: ../../../pikotools/src/convert/baseparser.h dbconn.o: ../../../winix/winixd/core/log.h dbconn.o: ../../../winix/winixd/core/logmanipulators.h dbconn.o: ../../../pikotools/src/log/log.h diff --git a/winixd/functions/Makefile.dep b/winixd/functions/Makefile.dep index 5f282ab..10b4743 100644 --- a/winixd/functions/Makefile.dep +++ b/winixd/functions/Makefile.dep @@ -30,6 +30,7 @@ account.o: ../../../winix/winixd/core/winixbase.h account.o: ../../../winix/winixd/core/config.h account.o: ../../../pikotools/src/space/spaceparser.h account.o: ../../../pikotools/src/space/space.h +account.o: ../../../pikotools/src/convert/baseparser.h account.o: ../../../winix/winixd/core/log.h account.o: ../../../winix/winixd/core/logmanipulators.h account.o: ../../../pikotools/src/log/log.h @@ -121,7 +122,7 @@ account.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h account.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h account.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h account.o: upload.h uptime.h who.h vim.h -account.o: ../../../pikotools/src/html/htmlfilter.h +account.o: ../../../pikotools/src/html/htmlparser.h account.o: ../../../winix/winixd/core/winixrequest.h account.o: ../../../winix/winixd/core/winixsystem.h account.o: ../../../winix/winixd/core/sessionmanager.h @@ -168,6 +169,7 @@ adduser.o: ../../../winix/winixd/core/winixbase.h adduser.o: ../../../winix/winixd/core/config.h adduser.o: ../../../pikotools/src/space/spaceparser.h adduser.o: ../../../pikotools/src/space/space.h +adduser.o: ../../../pikotools/src/convert/baseparser.h adduser.o: ../../../winix/winixd/core/log.h adduser.o: ../../../winix/winixd/core/logmanipulators.h adduser.o: ../../../pikotools/src/log/log.h @@ -259,7 +261,7 @@ adduser.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h adduser.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h adduser.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h adduser.o: upload.h uptime.h who.h vim.h -adduser.o: ../../../pikotools/src/html/htmlfilter.h +adduser.o: ../../../pikotools/src/html/htmlparser.h adduser.o: ../../../winix/winixd/core/winixrequest.h adduser.o: ../../../winix/winixd/core/winixsystem.h adduser.o: ../../../winix/winixd/core/sessionmanager.h @@ -304,7 +306,9 @@ cat.o: ../../../pikotools/src/convert/double.h cat.o: ../../../winix/winixd/core/winixbase.h cat.o: ../../../winix/winixd/core/config.h cat.o: ../../../pikotools/src/space/spaceparser.h -cat.o: ../../../pikotools/src/space/space.h ../../../winix/winixd/core/log.h +cat.o: ../../../pikotools/src/space/space.h +cat.o: ../../../pikotools/src/convert/baseparser.h +cat.o: ../../../winix/winixd/core/log.h cat.o: ../../../winix/winixd/core/logmanipulators.h cat.o: ../../../pikotools/src/log/log.h ../../../pikotools/src/log/filelog.h cat.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -385,7 +389,7 @@ cat.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h logout.h cat.o: ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h cat.o: pw.h reload.h rm.h rmuser.h sort.h specialdefault.h stat.h subject.h cat.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -cat.o: ../../../pikotools/src/html/htmlfilter.h +cat.o: ../../../pikotools/src/html/htmlparser.h cat.o: ../../../winix/winixd/core/winixrequest.h cat.o: ../../../winix/winixd/core/winixsystem.h cat.o: ../../../winix/winixd/core/sessionmanager.h @@ -429,6 +433,7 @@ chmod.o: ../../../winix/winixd/core/winixbase.h chmod.o: ../../../winix/winixd/core/config.h chmod.o: ../../../pikotools/src/space/spaceparser.h chmod.o: ../../../pikotools/src/space/space.h +chmod.o: ../../../pikotools/src/convert/baseparser.h chmod.o: ../../../winix/winixd/core/log.h chmod.o: ../../../winix/winixd/core/logmanipulators.h chmod.o: ../../../pikotools/src/log/log.h @@ -516,7 +521,7 @@ chmod.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h chmod.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h chmod.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h specialdefault.h chmod.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h -chmod.o: who.h vim.h ../../../pikotools/src/html/htmlfilter.h +chmod.o: who.h vim.h ../../../pikotools/src/html/htmlparser.h chmod.o: ../../../winix/winixd/core/winixrequest.h chmod.o: ../../../winix/winixd/core/winixsystem.h chmod.o: ../../../winix/winixd/core/sessionmanager.h @@ -560,6 +565,7 @@ chown.o: ../../../winix/winixd/core/winixbase.h chown.o: ../../../winix/winixd/core/config.h chown.o: ../../../pikotools/src/space/spaceparser.h chown.o: ../../../pikotools/src/space/space.h +chown.o: ../../../pikotools/src/convert/baseparser.h chown.o: ../../../winix/winixd/core/log.h chown.o: ../../../winix/winixd/core/logmanipulators.h chown.o: ../../../pikotools/src/log/log.h @@ -647,7 +653,7 @@ chown.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h chown.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h chown.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h specialdefault.h chown.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h -chown.o: who.h vim.h ../../../pikotools/src/html/htmlfilter.h +chown.o: who.h vim.h ../../../pikotools/src/html/htmlparser.h chown.o: ../../../winix/winixd/core/winixrequest.h chown.o: ../../../winix/winixd/core/winixsystem.h chown.o: ../../../winix/winixd/core/sessionmanager.h @@ -692,6 +698,7 @@ ckeditor.o: ../../../winix/winixd/core/winixbase.h ckeditor.o: ../../../winix/winixd/core/config.h ckeditor.o: ../../../pikotools/src/space/spaceparser.h ckeditor.o: ../../../pikotools/src/space/space.h +ckeditor.o: ../../../pikotools/src/convert/baseparser.h ckeditor.o: ../../../winix/winixd/core/log.h ckeditor.o: ../../../winix/winixd/core/logmanipulators.h ckeditor.o: ../../../pikotools/src/log/log.h @@ -784,7 +791,7 @@ ckeditor.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h ckeditor.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h ckeditor.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h ckeditor.o: upload.h uptime.h who.h vim.h -ckeditor.o: ../../../pikotools/src/html/htmlfilter.h +ckeditor.o: ../../../pikotools/src/html/htmlparser.h ckeditor.o: ../../../winix/winixd/core/winixrequest.h ckeditor.o: ../../../winix/winixd/core/winixsystem.h ckeditor.o: ../../../winix/winixd/core/sessionmanager.h @@ -827,7 +834,9 @@ cp.o: ../../../pikotools/src/convert/double.h cp.o: ../../../winix/winixd/core/winixbase.h cp.o: ../../../winix/winixd/core/config.h cp.o: ../../../pikotools/src/space/spaceparser.h -cp.o: ../../../pikotools/src/space/space.h ../../../winix/winixd/core/log.h +cp.o: ../../../pikotools/src/space/space.h +cp.o: ../../../pikotools/src/convert/baseparser.h +cp.o: ../../../winix/winixd/core/log.h cp.o: ../../../winix/winixd/core/logmanipulators.h cp.o: ../../../pikotools/src/log/log.h ../../../pikotools/src/log/filelog.h cp.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -907,7 +916,7 @@ cp.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h logout.h cp.o: ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h cp.o: pw.h reload.h rm.h rmuser.h sort.h specialdefault.h stat.h subject.h cp.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -cp.o: ../../../pikotools/src/html/htmlfilter.h +cp.o: ../../../pikotools/src/html/htmlparser.h cp.o: ../../../winix/winixd/core/winixrequest.h cp.o: ../../../winix/winixd/core/winixsystem.h cp.o: ../../../winix/winixd/core/sessionmanager.h @@ -953,6 +962,7 @@ default.o: ../../../winix/winixd/core/winixbase.h default.o: ../../../winix/winixd/core/config.h default.o: ../../../pikotools/src/space/spaceparser.h default.o: ../../../pikotools/src/space/space.h +default.o: ../../../pikotools/src/convert/baseparser.h default.o: ../../../winix/winixd/core/log.h default.o: ../../../winix/winixd/core/logmanipulators.h default.o: ../../../pikotools/src/log/log.h @@ -1045,7 +1055,7 @@ default.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h default.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h default.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h default.o: upload.h uptime.h who.h vim.h -default.o: ../../../pikotools/src/html/htmlfilter.h +default.o: ../../../pikotools/src/html/htmlparser.h default.o: ../../../winix/winixd/core/winixrequest.h default.o: ../../../winix/winixd/core/winixsystem.h default.o: ../../../winix/winixd/core/sessionmanager.h @@ -1090,6 +1100,7 @@ download.o: ../../../winix/winixd/core/winixbase.h download.o: ../../../winix/winixd/core/config.h download.o: ../../../pikotools/src/space/spaceparser.h download.o: ../../../pikotools/src/space/space.h +download.o: ../../../pikotools/src/convert/baseparser.h download.o: ../../../winix/winixd/core/log.h download.o: ../../../winix/winixd/core/logmanipulators.h download.o: ../../../pikotools/src/log/log.h @@ -1182,7 +1193,7 @@ download.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h download.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h download.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h download.o: upload.h uptime.h who.h vim.h -download.o: ../../../pikotools/src/html/htmlfilter.h +download.o: ../../../pikotools/src/html/htmlparser.h download.o: ../../../winix/winixd/core/winixrequest.h download.o: ../../../winix/winixd/core/winixsystem.h download.o: ../../../winix/winixd/core/sessionmanager.h @@ -1226,6 +1237,7 @@ emacs.o: ../../../winix/winixd/core/winixbase.h emacs.o: ../../../winix/winixd/core/config.h emacs.o: ../../../pikotools/src/space/spaceparser.h emacs.o: ../../../pikotools/src/space/space.h +emacs.o: ../../../pikotools/src/convert/baseparser.h emacs.o: ../../../winix/winixd/core/log.h emacs.o: ../../../winix/winixd/core/logmanipulators.h emacs.o: ../../../pikotools/src/log/log.h @@ -1314,7 +1326,7 @@ emacs.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h emacs.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h emacs.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h specialdefault.h emacs.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h -emacs.o: who.h vim.h ../../../pikotools/src/html/htmlfilter.h +emacs.o: who.h vim.h ../../../pikotools/src/html/htmlparser.h emacs.o: ../../../winix/winixd/core/winixrequest.h emacs.o: ../../../winix/winixd/core/winixsystem.h emacs.o: ../../../winix/winixd/core/sessionmanager.h @@ -1364,7 +1376,9 @@ env.o: ../../../pikotools/src/convert/double.h env.o: ../../../winix/winixd/core/winixbase.h env.o: ../../../winix/winixd/core/config.h env.o: ../../../pikotools/src/space/spaceparser.h -env.o: ../../../pikotools/src/space/space.h ../../../winix/winixd/core/log.h +env.o: ../../../pikotools/src/space/space.h +env.o: ../../../pikotools/src/convert/baseparser.h +env.o: ../../../winix/winixd/core/log.h env.o: ../../../winix/winixd/core/logmanipulators.h env.o: ../../../pikotools/src/log/log.h ../../../pikotools/src/log/filelog.h env.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -1443,7 +1457,7 @@ env.o: chown.h ckeditor.h cp.h default.h download.h emacs.h imgcrop.h last.h env.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h env.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h specialdefault.h env.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h who.h -env.o: vim.h ../../../pikotools/src/html/htmlfilter.h +env.o: vim.h ../../../pikotools/src/html/htmlparser.h env.o: ../../../winix/winixd/core/winixrequest.h env.o: ../../../winix/winixd/core/winixsystem.h env.o: ../../../winix/winixd/core/sessionmanager.h @@ -1488,6 +1502,7 @@ functionbase.o: ../../../winix/winixd/core/winixbase.h functionbase.o: ../../../winix/winixd/core/config.h functionbase.o: ../../../pikotools/src/space/spaceparser.h functionbase.o: ../../../pikotools/src/space/space.h +functionbase.o: ../../../pikotools/src/convert/baseparser.h functionbase.o: ../../../winix/winixd/core/log.h functionbase.o: ../../../winix/winixd/core/logmanipulators.h functionbase.o: ../../../pikotools/src/log/log.h @@ -1582,7 +1597,7 @@ functionbase.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h functionbase.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h functionbase.o: specialdefault.h stat.h subject.h template.h tinymce.h functionbase.o: uname.h upload.h uptime.h who.h vim.h -functionbase.o: ../../../pikotools/src/html/htmlfilter.h +functionbase.o: ../../../pikotools/src/html/htmlparser.h functionbase.o: ../../../winix/winixd/core/winixrequest.h functionbase.o: ../../../winix/winixd/core/winixsystem.h functionbase.o: ../../../winix/winixd/core/sessionmanager.h @@ -1609,6 +1624,7 @@ functionparser.o: ../../../winix/winixd/core/winixbase.h functionparser.o: ../../../winix/winixd/core/config.h functionparser.o: ../../../pikotools/src/space/spaceparser.h functionparser.o: ../../../pikotools/src/space/space.h +functionparser.o: ../../../pikotools/src/convert/baseparser.h functionparser.o: ../../../winix/winixd/core/log.h functionparser.o: ../../../winix/winixd/core/logmanipulators.h functionparser.o: ../../../pikotools/src/log/log.h @@ -1727,7 +1743,7 @@ functionparser.o: login.h logout.h ln.h ls.h ipban.h man.h meta.h mkdir.h functionparser.o: mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h functionparser.o: rmuser.h sort.h specialdefault.h stat.h subject.h functionparser.o: template.h timezone.h tinymce.h uname.h upload.h uptime.h -functionparser.o: who.h vim.h ../../../pikotools/src/html/htmlfilter.h +functionparser.o: who.h vim.h ../../../pikotools/src/html/htmlparser.h functionparser.o: ../../../winix/winixd/core/winixrequest.h functionparser.o: ../../../winix/winixd/core/winixsystem.h functionparser.o: ../../../winix/winixd/core/cur.h @@ -1777,6 +1793,7 @@ functions.o: ../../../winix/winixd/core/winixbase.h functions.o: ../../../winix/winixd/core/config.h functions.o: ../../../pikotools/src/space/spaceparser.h functions.o: ../../../pikotools/src/space/space.h +functions.o: ../../../pikotools/src/convert/baseparser.h functions.o: ../../../winix/winixd/core/log.h functions.o: ../../../winix/winixd/core/logmanipulators.h functions.o: ../../../pikotools/src/log/log.h @@ -1883,7 +1900,7 @@ functions.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h functions.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h functions.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h functions.o: upload.h uptime.h who.h vim.h -functions.o: ../../../pikotools/src/html/htmlfilter.h +functions.o: ../../../pikotools/src/html/htmlparser.h functions.o: ../../../winix/winixd/core/misc.h functions.o: ../../../winix/winixd/templates/templates.h functions.o: ../../../winix/winixd/templates/patterncacher.h @@ -1920,6 +1937,7 @@ imgcrop.o: ../../../winix/winixd/core/winixbase.h imgcrop.o: ../../../winix/winixd/core/config.h imgcrop.o: ../../../pikotools/src/space/spaceparser.h imgcrop.o: ../../../pikotools/src/space/space.h +imgcrop.o: ../../../pikotools/src/convert/baseparser.h imgcrop.o: ../../../winix/winixd/core/log.h imgcrop.o: ../../../winix/winixd/core/logmanipulators.h imgcrop.o: ../../../pikotools/src/log/log.h @@ -2011,7 +2029,7 @@ imgcrop.o: ../../../winix/winixd/models/user.h last.h login.h logout.h ln.h imgcrop.o: ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h imgcrop.o: pw.h reload.h rm.h rmuser.h sort.h specialdefault.h stat.h imgcrop.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h -imgcrop.o: vim.h ../../../pikotools/src/html/htmlfilter.h +imgcrop.o: vim.h ../../../pikotools/src/html/htmlparser.h imgcrop.o: ../../../winix/winixd/core/winixrequest.h imgcrop.o: ../../../winix/winixd/core/winixsystem.h imgcrop.o: ../../../winix/winixd/core/sessionmanager.h @@ -2055,6 +2073,7 @@ ipban.o: ../../../winix/winixd/core/winixbase.h ipban.o: ../../../winix/winixd/core/config.h ipban.o: ../../../pikotools/src/space/spaceparser.h ipban.o: ../../../pikotools/src/space/space.h +ipban.o: ../../../pikotools/src/convert/baseparser.h ipban.o: ../../../winix/winixd/core/log.h ipban.o: ../../../winix/winixd/core/logmanipulators.h ipban.o: ../../../pikotools/src/log/log.h @@ -2143,7 +2162,7 @@ ipban.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h ipban.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h ipban.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h specialdefault.h ipban.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h -ipban.o: who.h vim.h ../../../pikotools/src/html/htmlfilter.h +ipban.o: who.h vim.h ../../../pikotools/src/html/htmlparser.h ipban.o: ../../../winix/winixd/core/winixrequest.h ipban.o: ../../../winix/winixd/core/winixsystem.h ipban.o: ../../../winix/winixd/core/sessionmanager.h @@ -2186,7 +2205,9 @@ last.o: ../../../pikotools/src/convert/double.h last.o: ../../../winix/winixd/core/winixbase.h last.o: ../../../winix/winixd/core/config.h last.o: ../../../pikotools/src/space/spaceparser.h -last.o: ../../../pikotools/src/space/space.h ../../../winix/winixd/core/log.h +last.o: ../../../pikotools/src/space/space.h +last.o: ../../../pikotools/src/convert/baseparser.h +last.o: ../../../winix/winixd/core/log.h last.o: ../../../winix/winixd/core/logmanipulators.h last.o: ../../../pikotools/src/log/log.h ../../../pikotools/src/log/filelog.h last.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -2269,7 +2290,7 @@ last.o: ../../../winix/winixd/models/user.h imgcrop.h login.h logout.h ln.h last.o: ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h last.o: reload.h rm.h rmuser.h sort.h specialdefault.h stat.h subject.h last.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -last.o: ../../../pikotools/src/html/htmlfilter.h +last.o: ../../../pikotools/src/html/htmlparser.h last.o: ../../../winix/winixd/core/winixrequest.h last.o: ../../../winix/winixd/core/winixsystem.h last.o: ../../../winix/winixd/core/sessionmanager.h @@ -2312,7 +2333,9 @@ ln.o: ../../../pikotools/src/convert/double.h ln.o: ../../../winix/winixd/core/winixbase.h ln.o: ../../../winix/winixd/core/config.h ln.o: ../../../pikotools/src/space/spaceparser.h -ln.o: ../../../pikotools/src/space/space.h ../../../winix/winixd/core/log.h +ln.o: ../../../pikotools/src/space/space.h +ln.o: ../../../pikotools/src/convert/baseparser.h +ln.o: ../../../winix/winixd/core/log.h ln.o: ../../../winix/winixd/core/logmanipulators.h ln.o: ../../../pikotools/src/log/log.h ../../../pikotools/src/log/filelog.h ln.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -2392,7 +2415,7 @@ ln.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h logout.h ln.o: ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h ln.o: reload.h rm.h rmuser.h sort.h specialdefault.h stat.h subject.h ln.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -ln.o: ../../../pikotools/src/html/htmlfilter.h +ln.o: ../../../pikotools/src/html/htmlparser.h ln.o: ../../../winix/winixd/core/winixrequest.h ln.o: ../../../winix/winixd/core/winixsystem.h ln.o: ../../../winix/winixd/core/sessionmanager.h @@ -2438,6 +2461,7 @@ locale.o: ../../../winix/winixd/core/winixbase.h locale.o: ../../../winix/winixd/core/config.h locale.o: ../../../pikotools/src/space/spaceparser.h locale.o: ../../../pikotools/src/space/space.h +locale.o: ../../../pikotools/src/convert/baseparser.h locale.o: ../../../winix/winixd/core/log.h locale.o: ../../../winix/winixd/core/logmanipulators.h locale.o: ../../../pikotools/src/log/log.h @@ -2528,7 +2552,7 @@ locale.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h locale.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h locale.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h specialdefault.h locale.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h -locale.o: who.h vim.h ../../../pikotools/src/html/htmlfilter.h +locale.o: who.h vim.h ../../../pikotools/src/html/htmlparser.h locale.o: ../../../winix/winixd/core/winixrequest.h locale.o: ../../../winix/winixd/core/winixsystem.h locale.o: ../../../winix/winixd/core/sessionmanager.h @@ -2598,6 +2622,7 @@ login.o: ../../../winix/winixd/core/winixbase.h login.o: ../../../winix/winixd/core/config.h login.o: ../../../pikotools/src/space/spaceparser.h login.o: ../../../pikotools/src/space/space.h +login.o: ../../../pikotools/src/convert/baseparser.h login.o: ../../../winix/winixd/core/log.h login.o: ../../../winix/winixd/core/logmanipulators.h login.o: ../../../morm/src/morm.h ../../../morm/src/finder.h @@ -2668,7 +2693,7 @@ login.o: logout.h ln.h ls.h ipban.h man.h meta.h mkdir.h mv.h nicedit.h login.o: node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h login.o: specialdefault.h stat.h subject.h template.h timezone.h tinymce.h login.o: uname.h upload.h uptime.h who.h vim.h -login.o: ../../../pikotools/src/html/htmlfilter.h +login.o: ../../../pikotools/src/html/htmlparser.h login.o: ../../../winix/winixd/core/winixrequest.h login.o: ../../../winix/winixd/core/winixsystem.h login.o: ../../../winix/winixd/core/slog.h ../../../ezc/src/objects.h @@ -2709,6 +2734,7 @@ logout.o: ../../../winix/winixd/core/winixbase.h logout.o: ../../../winix/winixd/core/config.h logout.o: ../../../pikotools/src/space/spaceparser.h logout.o: ../../../pikotools/src/space/space.h +logout.o: ../../../pikotools/src/convert/baseparser.h logout.o: ../../../winix/winixd/core/log.h logout.o: ../../../winix/winixd/core/logmanipulators.h logout.o: ../../../pikotools/src/log/log.h @@ -2799,7 +2825,7 @@ logout.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h ln.h logout.o: ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h logout.o: pw.h reload.h rm.h rmuser.h sort.h specialdefault.h stat.h logout.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h -logout.o: vim.h ../../../pikotools/src/html/htmlfilter.h +logout.o: vim.h ../../../pikotools/src/html/htmlparser.h logout.o: ../../../winix/winixd/core/winixrequest.h logout.o: ../../../winix/winixd/core/winixsystem.h logout.o: ../../../winix/winixd/core/sessionmanager.h @@ -2842,7 +2868,9 @@ ls.o: ../../../pikotools/src/convert/double.h ls.o: ../../../winix/winixd/core/winixbase.h ls.o: ../../../winix/winixd/core/config.h ls.o: ../../../pikotools/src/space/spaceparser.h -ls.o: ../../../pikotools/src/space/space.h ../../../winix/winixd/core/log.h +ls.o: ../../../pikotools/src/space/space.h +ls.o: ../../../pikotools/src/convert/baseparser.h +ls.o: ../../../winix/winixd/core/log.h ls.o: ../../../winix/winixd/core/logmanipulators.h ls.o: ../../../pikotools/src/log/log.h ../../../pikotools/src/log/filelog.h ls.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -2922,7 +2950,7 @@ ls.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h logout.h ls.o: ln.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h ls.o: reload.h rm.h rmuser.h sort.h specialdefault.h stat.h subject.h ls.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -ls.o: ../../../pikotools/src/html/htmlfilter.h +ls.o: ../../../pikotools/src/html/htmlparser.h ls.o: ../../../winix/winixd/core/winixrequest.h ls.o: ../../../winix/winixd/core/winixsystem.h ls.o: ../../../winix/winixd/core/sessionmanager.h @@ -2965,7 +2993,9 @@ man.o: ../../../pikotools/src/convert/double.h man.o: ../../../winix/winixd/core/winixbase.h man.o: ../../../winix/winixd/core/config.h man.o: ../../../pikotools/src/space/spaceparser.h -man.o: ../../../pikotools/src/space/space.h ../../../winix/winixd/core/log.h +man.o: ../../../pikotools/src/space/space.h +man.o: ../../../pikotools/src/convert/baseparser.h +man.o: ../../../winix/winixd/core/log.h man.o: ../../../winix/winixd/core/logmanipulators.h man.o: ../../../pikotools/src/log/log.h ../../../pikotools/src/log/filelog.h man.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -3046,7 +3076,7 @@ man.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h logout.h man.o: ln.h ls.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h man.o: reload.h rm.h rmuser.h sort.h specialdefault.h stat.h subject.h man.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -man.o: ../../../pikotools/src/html/htmlfilter.h +man.o: ../../../pikotools/src/html/htmlparser.h man.o: ../../../winix/winixd/core/winixrequest.h man.o: ../../../winix/winixd/core/winixsystem.h man.o: ../../../winix/winixd/core/sessionmanager.h @@ -3089,7 +3119,9 @@ meta.o: ../../../pikotools/src/convert/double.h meta.o: ../../../winix/winixd/core/winixbase.h meta.o: ../../../winix/winixd/core/config.h meta.o: ../../../pikotools/src/space/spaceparser.h -meta.o: ../../../pikotools/src/space/space.h ../../../winix/winixd/core/log.h +meta.o: ../../../pikotools/src/space/space.h +meta.o: ../../../pikotools/src/convert/baseparser.h +meta.o: ../../../winix/winixd/core/log.h meta.o: ../../../winix/winixd/core/logmanipulators.h meta.o: ../../../pikotools/src/log/log.h ../../../pikotools/src/log/filelog.h meta.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -3172,7 +3204,7 @@ meta.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h logout.h meta.o: ln.h ls.h man.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h meta.o: reload.h rm.h rmuser.h sort.h specialdefault.h stat.h subject.h meta.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -meta.o: ../../../pikotools/src/html/htmlfilter.h +meta.o: ../../../pikotools/src/html/htmlparser.h meta.o: ../../../winix/winixd/core/winixrequest.h meta.o: ../../../winix/winixd/core/winixsystem.h meta.o: ../../../winix/winixd/core/sessionmanager.h @@ -3216,6 +3248,7 @@ mkdir.o: ../../../winix/winixd/core/winixbase.h mkdir.o: ../../../winix/winixd/core/config.h mkdir.o: ../../../pikotools/src/space/spaceparser.h mkdir.o: ../../../pikotools/src/space/space.h +mkdir.o: ../../../pikotools/src/convert/baseparser.h mkdir.o: ../../../winix/winixd/core/log.h mkdir.o: ../../../winix/winixd/core/logmanipulators.h mkdir.o: ../../../pikotools/src/log/log.h @@ -3304,7 +3337,7 @@ mkdir.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h mkdir.o: logout.h ln.h ls.h man.h meta.h mv.h nicedit.h node.h passwd.h mkdir.o: priv.h pw.h reload.h rm.h rmuser.h sort.h specialdefault.h stat.h mkdir.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -mkdir.o: ../../../pikotools/src/html/htmlfilter.h +mkdir.o: ../../../pikotools/src/html/htmlparser.h mkdir.o: ../../../winix/winixd/core/winixrequest.h mkdir.o: ../../../winix/winixd/core/winixsystem.h mkdir.o: ../../../winix/winixd/core/sessionmanager.h @@ -3348,6 +3381,7 @@ mount.o: ../../../winix/winixd/core/winixbase.h mount.o: ../../../winix/winixd/core/config.h mount.o: ../../../pikotools/src/space/spaceparser.h mount.o: ../../../pikotools/src/space/space.h +mount.o: ../../../pikotools/src/convert/baseparser.h mount.o: ../../../winix/winixd/core/log.h mount.o: ../../../winix/winixd/core/logmanipulators.h mount.o: ../../../pikotools/src/log/log.h @@ -3436,7 +3470,7 @@ mount.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h mount.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h mount.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h specialdefault.h mount.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h -mount.o: who.h vim.h ../../../pikotools/src/html/htmlfilter.h +mount.o: who.h vim.h ../../../pikotools/src/html/htmlparser.h mount.o: ../../../winix/winixd/core/winixrequest.h mount.o: ../../../winix/winixd/core/winixsystem.h mount.o: ../../../winix/winixd/core/sessionmanager.h @@ -3479,7 +3513,9 @@ mv.o: ../../../pikotools/src/convert/double.h mv.o: ../../../winix/winixd/core/winixbase.h mv.o: ../../../winix/winixd/core/config.h mv.o: ../../../pikotools/src/space/spaceparser.h -mv.o: ../../../pikotools/src/space/space.h ../../../winix/winixd/core/log.h +mv.o: ../../../pikotools/src/space/space.h +mv.o: ../../../pikotools/src/convert/baseparser.h +mv.o: ../../../winix/winixd/core/log.h mv.o: ../../../winix/winixd/core/logmanipulators.h mv.o: ../../../pikotools/src/log/log.h ../../../pikotools/src/log/filelog.h mv.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -3559,7 +3595,7 @@ mv.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h logout.h mv.o: ln.h ls.h man.h meta.h mkdir.h nicedit.h node.h passwd.h priv.h pw.h mv.o: reload.h rm.h rmuser.h sort.h specialdefault.h stat.h subject.h mv.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -mv.o: ../../../pikotools/src/html/htmlfilter.h +mv.o: ../../../pikotools/src/html/htmlparser.h mv.o: ../../../winix/winixd/core/winixrequest.h mv.o: ../../../winix/winixd/core/winixsystem.h mv.o: ../../../winix/winixd/core/sessionmanager.h @@ -3604,6 +3640,7 @@ nicedit.o: ../../../winix/winixd/core/winixbase.h nicedit.o: ../../../winix/winixd/core/config.h nicedit.o: ../../../pikotools/src/space/spaceparser.h nicedit.o: ../../../pikotools/src/space/space.h +nicedit.o: ../../../pikotools/src/convert/baseparser.h nicedit.o: ../../../winix/winixd/core/log.h nicedit.o: ../../../winix/winixd/core/logmanipulators.h nicedit.o: ../../../pikotools/src/log/log.h @@ -3695,7 +3732,7 @@ nicedit.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h nicedit.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h node.h passwd.h nicedit.o: priv.h pw.h reload.h rm.h rmuser.h sort.h specialdefault.h stat.h nicedit.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h -nicedit.o: vim.h ../../../pikotools/src/html/htmlfilter.h +nicedit.o: vim.h ../../../pikotools/src/html/htmlparser.h nicedit.o: ../../../winix/winixd/core/winixrequest.h nicedit.o: ../../../winix/winixd/core/winixsystem.h nicedit.o: ../../../winix/winixd/core/sessionmanager.h @@ -3738,7 +3775,9 @@ node.o: ../../../pikotools/src/convert/double.h node.o: ../../../winix/winixd/core/winixbase.h node.o: ../../../winix/winixd/core/config.h node.o: ../../../pikotools/src/space/spaceparser.h -node.o: ../../../pikotools/src/space/space.h ../../../winix/winixd/core/log.h +node.o: ../../../pikotools/src/space/space.h +node.o: ../../../pikotools/src/convert/baseparser.h +node.o: ../../../winix/winixd/core/log.h node.o: ../../../winix/winixd/core/logmanipulators.h node.o: ../../../pikotools/src/log/log.h ../../../pikotools/src/log/filelog.h node.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -3821,7 +3860,7 @@ node.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h logout.h node.o: ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h passwd.h priv.h pw.h node.o: reload.h rm.h rmuser.h sort.h specialdefault.h stat.h subject.h node.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -node.o: ../../../pikotools/src/html/htmlfilter.h +node.o: ../../../pikotools/src/html/htmlparser.h node.o: ../../../winix/winixd/core/winixrequest.h node.o: ../../../winix/winixd/core/winixsystem.h node.o: ../../../winix/winixd/core/sessionmanager.h @@ -3865,6 +3904,7 @@ passwd.o: ../../../winix/winixd/core/winixbase.h passwd.o: ../../../winix/winixd/core/config.h passwd.o: ../../../pikotools/src/space/spaceparser.h passwd.o: ../../../pikotools/src/space/space.h +passwd.o: ../../../pikotools/src/convert/baseparser.h passwd.o: ../../../winix/winixd/core/log.h passwd.o: ../../../winix/winixd/core/logmanipulators.h passwd.o: ../../../pikotools/src/log/log.h @@ -3955,7 +3995,7 @@ passwd.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h passwd.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.o: priv.h pw.h reload.h rm.h rmuser.h sort.h specialdefault.h stat.h passwd.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h -passwd.o: vim.h ../../../pikotools/src/html/htmlfilter.h +passwd.o: vim.h ../../../pikotools/src/html/htmlparser.h passwd.o: ../../../winix/winixd/core/winixrequest.h passwd.o: ../../../winix/winixd/core/winixsystem.h passwd.o: ../../../winix/winixd/core/sessionmanager.h @@ -3999,7 +4039,9 @@ priv.o: ../../../pikotools/src/convert/double.h priv.o: ../../../winix/winixd/core/winixbase.h priv.o: ../../../winix/winixd/core/config.h priv.o: ../../../pikotools/src/space/spaceparser.h -priv.o: ../../../pikotools/src/space/space.h ../../../winix/winixd/core/log.h +priv.o: ../../../pikotools/src/space/space.h +priv.o: ../../../pikotools/src/convert/baseparser.h +priv.o: ../../../winix/winixd/core/log.h priv.o: ../../../winix/winixd/core/logmanipulators.h priv.o: ../../../pikotools/src/log/log.h ../../../pikotools/src/log/filelog.h priv.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -4082,7 +4124,7 @@ priv.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h logout.h priv.o: ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h pw.h priv.o: reload.h rm.h rmuser.h sort.h specialdefault.h stat.h subject.h priv.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -priv.o: ../../../pikotools/src/html/htmlfilter.h +priv.o: ../../../pikotools/src/html/htmlparser.h priv.o: ../../../winix/winixd/core/winixrequest.h priv.o: ../../../winix/winixd/core/winixsystem.h priv.o: ../../../winix/winixd/core/sessionmanager.h @@ -4103,6 +4145,7 @@ privchanger.o: ../../../winix/winixd/core/winixbase.h privchanger.o: ../../../winix/winixd/core/config.h privchanger.o: ../../../pikotools/src/space/spaceparser.h privchanger.o: ../../../pikotools/src/space/space.h +privchanger.o: ../../../pikotools/src/convert/baseparser.h privchanger.o: ../../../winix/winixd/core/log.h privchanger.o: ../../../winix/winixd/core/logmanipulators.h privchanger.o: ../../../pikotools/src/log/log.h @@ -4210,7 +4253,7 @@ privchanger.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h privchanger.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h sort.h privchanger.o: specialdefault.h stat.h subject.h template.h timezone.h privchanger.o: tinymce.h uname.h upload.h uptime.h who.h vim.h -privchanger.o: ../../../pikotools/src/html/htmlfilter.h +privchanger.o: ../../../pikotools/src/html/htmlparser.h privchanger.o: ../../../winix/winixd/core/winixrequest.h privchanger.o: ../../../winix/winixd/core/winixsystem.h privchanger.o: ../../../winix/winixd/core/sessionmanager.h @@ -4265,7 +4308,9 @@ pw.o: ../../../pikotools/src/convert/double.h pw.o: ../../../winix/winixd/core/winixbase.h pw.o: ../../../winix/winixd/core/config.h pw.o: ../../../pikotools/src/space/spaceparser.h -pw.o: ../../../pikotools/src/space/space.h ../../../winix/winixd/core/log.h +pw.o: ../../../pikotools/src/space/space.h +pw.o: ../../../pikotools/src/convert/baseparser.h +pw.o: ../../../winix/winixd/core/log.h pw.o: ../../../winix/winixd/core/logmanipulators.h pw.o: ../../../pikotools/src/log/log.h ../../../pikotools/src/log/filelog.h pw.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -4345,7 +4390,7 @@ pw.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h logout.h pw.o: ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.o: reload.h rm.h rmuser.h sort.h specialdefault.h stat.h subject.h pw.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -pw.o: ../../../pikotools/src/html/htmlfilter.h +pw.o: ../../../pikotools/src/html/htmlparser.h pw.o: ../../../winix/winixd/core/winixrequest.h pw.o: ../../../winix/winixd/core/winixsystem.h pw.o: ../../../winix/winixd/core/sessionmanager.h @@ -4390,6 +4435,7 @@ reload.o: ../../../winix/winixd/core/winixbase.h reload.o: ../../../winix/winixd/core/config.h reload.o: ../../../pikotools/src/space/spaceparser.h reload.o: ../../../pikotools/src/space/space.h +reload.o: ../../../pikotools/src/convert/baseparser.h reload.o: ../../../winix/winixd/core/log.h reload.o: ../../../winix/winixd/core/logmanipulators.h reload.o: ../../../pikotools/src/log/log.h @@ -4480,7 +4526,7 @@ reload.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h reload.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h reload.o: passwd.h priv.h pw.h rm.h rmuser.h sort.h specialdefault.h stat.h reload.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h -reload.o: vim.h ../../../pikotools/src/html/htmlfilter.h +reload.o: vim.h ../../../pikotools/src/html/htmlparser.h reload.o: ../../../winix/winixd/core/winixrequest.h reload.o: ../../../winix/winixd/core/winixsystem.h reload.o: ../../../winix/winixd/core/sessionmanager.h @@ -4528,7 +4574,9 @@ rm.o: ../../../pikotools/src/convert/double.h rm.o: ../../../winix/winixd/core/winixbase.h rm.o: ../../../winix/winixd/core/config.h rm.o: ../../../pikotools/src/space/spaceparser.h -rm.o: ../../../pikotools/src/space/space.h ../../../winix/winixd/core/log.h +rm.o: ../../../pikotools/src/space/space.h +rm.o: ../../../pikotools/src/convert/baseparser.h +rm.o: ../../../winix/winixd/core/log.h rm.o: ../../../winix/winixd/core/logmanipulators.h rm.o: ../../../pikotools/src/log/log.h ../../../pikotools/src/log/filelog.h rm.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -4608,7 +4656,7 @@ rm.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h logout.h rm.o: ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h rm.o: pw.h reload.h rmuser.h sort.h specialdefault.h stat.h subject.h rm.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -rm.o: ../../../pikotools/src/html/htmlfilter.h +rm.o: ../../../pikotools/src/html/htmlparser.h rm.o: ../../../winix/winixd/core/winixrequest.h rm.o: ../../../winix/winixd/core/winixsystem.h rm.o: ../../../winix/winixd/core/sessionmanager.h @@ -4658,6 +4706,7 @@ rmuser.o: ../../../winix/winixd/core/winixbase.h rmuser.o: ../../../winix/winixd/core/config.h rmuser.o: ../../../pikotools/src/space/spaceparser.h rmuser.o: ../../../pikotools/src/space/space.h +rmuser.o: ../../../pikotools/src/convert/baseparser.h rmuser.o: ../../../winix/winixd/core/log.h rmuser.o: ../../../winix/winixd/core/logmanipulators.h rmuser.o: ../../../pikotools/src/log/log.h @@ -4748,7 +4797,7 @@ rmuser.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h rmuser.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h rmuser.o: passwd.h priv.h pw.h reload.h rm.h sort.h specialdefault.h stat.h rmuser.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h -rmuser.o: vim.h ../../../pikotools/src/html/htmlfilter.h +rmuser.o: vim.h ../../../pikotools/src/html/htmlparser.h rmuser.o: ../../../winix/winixd/core/winixrequest.h rmuser.o: ../../../winix/winixd/core/winixsystem.h rmuser.o: ../../../winix/winixd/core/sessionmanager.h @@ -4794,7 +4843,9 @@ run.o: ../../../pikotools/src/convert/double.h run.o: ../../../winix/winixd/core/winixbase.h run.o: ../../../winix/winixd/core/config.h run.o: ../../../pikotools/src/space/spaceparser.h -run.o: ../../../pikotools/src/space/space.h ../../../winix/winixd/core/log.h +run.o: ../../../pikotools/src/space/space.h +run.o: ../../../pikotools/src/convert/baseparser.h +run.o: ../../../winix/winixd/core/log.h run.o: ../../../winix/winixd/core/logmanipulators.h run.o: ../../../pikotools/src/log/log.h ../../../pikotools/src/log/filelog.h run.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -4874,7 +4925,7 @@ run.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h logout.h run.o: ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h run.o: pw.h reload.h rm.h rmuser.h sort.h specialdefault.h stat.h subject.h run.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -run.o: ../../../pikotools/src/html/htmlfilter.h +run.o: ../../../pikotools/src/html/htmlparser.h run.o: ../../../winix/winixd/core/winixrequest.h run.o: ../../../winix/winixd/core/winixsystem.h run.o: ../../../winix/winixd/core/sessionmanager.h @@ -4917,7 +4968,9 @@ sort.o: ../../../pikotools/src/convert/double.h sort.o: ../../../winix/winixd/core/winixbase.h sort.o: ../../../winix/winixd/core/config.h sort.o: ../../../pikotools/src/space/spaceparser.h -sort.o: ../../../pikotools/src/space/space.h ../../../winix/winixd/core/log.h +sort.o: ../../../pikotools/src/space/space.h +sort.o: ../../../pikotools/src/convert/baseparser.h +sort.o: ../../../winix/winixd/core/log.h sort.o: ../../../winix/winixd/core/logmanipulators.h sort.o: ../../../pikotools/src/log/log.h ../../../pikotools/src/log/filelog.h sort.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -5000,7 +5053,7 @@ sort.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h logout.h sort.o: ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h sort.o: pw.h reload.h rm.h rmuser.h specialdefault.h stat.h subject.h sort.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -sort.o: ../../../pikotools/src/html/htmlfilter.h +sort.o: ../../../pikotools/src/html/htmlparser.h sort.o: ../../../winix/winixd/core/winixrequest.h sort.o: ../../../winix/winixd/core/winixsystem.h sort.o: ../../../winix/winixd/core/sessionmanager.h @@ -5047,6 +5100,7 @@ specialdefault.o: ../../../winix/winixd/core/winixbase.h specialdefault.o: ../../../winix/winixd/core/config.h specialdefault.o: ../../../pikotools/src/space/spaceparser.h specialdefault.o: ../../../pikotools/src/space/space.h +specialdefault.o: ../../../pikotools/src/convert/baseparser.h specialdefault.o: ../../../winix/winixd/core/log.h specialdefault.o: ../../../winix/winixd/core/logmanipulators.h specialdefault.o: ../../../pikotools/src/log/log.h @@ -5145,7 +5199,7 @@ specialdefault.o: login.h logout.h ln.h ls.h man.h meta.h mkdir.h mv.h specialdefault.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h specialdefault.o: rmuser.h sort.h stat.h subject.h template.h tinymce.h specialdefault.o: uname.h upload.h uptime.h who.h vim.h -specialdefault.o: ../../../pikotools/src/html/htmlfilter.h +specialdefault.o: ../../../pikotools/src/html/htmlparser.h specialdefault.o: ../../../winix/winixd/core/winixrequest.h specialdefault.o: ../../../winix/winixd/core/winixsystem.h specialdefault.o: ../../../winix/winixd/core/sessionmanager.h @@ -5189,7 +5243,9 @@ stat.o: ../../../pikotools/src/convert/double.h stat.o: ../../../winix/winixd/core/winixbase.h stat.o: ../../../winix/winixd/core/config.h stat.o: ../../../pikotools/src/space/spaceparser.h -stat.o: ../../../pikotools/src/space/space.h ../../../winix/winixd/core/log.h +stat.o: ../../../pikotools/src/space/space.h +stat.o: ../../../pikotools/src/convert/baseparser.h +stat.o: ../../../winix/winixd/core/log.h stat.o: ../../../winix/winixd/core/logmanipulators.h stat.o: ../../../pikotools/src/log/log.h ../../../pikotools/src/log/filelog.h stat.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -5272,7 +5328,7 @@ stat.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h logout.h stat.o: ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h stat.o: pw.h reload.h rm.h rmuser.h sort.h specialdefault.h subject.h stat.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -stat.o: ../../../pikotools/src/html/htmlfilter.h +stat.o: ../../../pikotools/src/html/htmlparser.h stat.o: ../../../winix/winixd/core/winixrequest.h stat.o: ../../../winix/winixd/core/winixsystem.h stat.o: ../../../winix/winixd/core/sessionmanager.h @@ -5317,6 +5373,7 @@ subject.o: ../../../winix/winixd/core/winixbase.h subject.o: ../../../winix/winixd/core/config.h subject.o: ../../../pikotools/src/space/spaceparser.h subject.o: ../../../pikotools/src/space/space.h +subject.o: ../../../pikotools/src/convert/baseparser.h subject.o: ../../../winix/winixd/core/log.h subject.o: ../../../winix/winixd/core/logmanipulators.h subject.o: ../../../pikotools/src/log/log.h @@ -5408,7 +5465,7 @@ subject.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h subject.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h subject.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h subject.o: specialdefault.h stat.h template.h tinymce.h uname.h upload.h -subject.o: uptime.h who.h vim.h ../../../pikotools/src/html/htmlfilter.h +subject.o: uptime.h who.h vim.h ../../../pikotools/src/html/htmlparser.h subject.o: ../../../winix/winixd/core/winixrequest.h subject.o: ../../../winix/winixd/core/winixsystem.h subject.o: ../../../winix/winixd/core/sessionmanager.h @@ -5453,6 +5510,7 @@ template.o: ../../../winix/winixd/core/winixbase.h template.o: ../../../winix/winixd/core/config.h template.o: ../../../pikotools/src/space/spaceparser.h template.o: ../../../pikotools/src/space/space.h +template.o: ../../../pikotools/src/convert/baseparser.h template.o: ../../../winix/winixd/core/log.h template.o: ../../../winix/winixd/core/logmanipulators.h template.o: ../../../pikotools/src/log/log.h @@ -5544,7 +5602,7 @@ template.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h template.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h template.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h template.o: specialdefault.h stat.h subject.h tinymce.h uname.h upload.h -template.o: uptime.h who.h vim.h ../../../pikotools/src/html/htmlfilter.h +template.o: uptime.h who.h vim.h ../../../pikotools/src/html/htmlparser.h template.o: ../../../winix/winixd/core/winixrequest.h template.o: ../../../winix/winixd/core/winixsystem.h template.o: ../../../winix/winixd/core/sessionmanager.h @@ -5590,6 +5648,7 @@ timezone.o: ../../../winix/winixd/core/winixbase.h timezone.o: ../../../winix/winixd/core/config.h timezone.o: ../../../pikotools/src/space/spaceparser.h timezone.o: ../../../pikotools/src/space/space.h +timezone.o: ../../../pikotools/src/convert/baseparser.h timezone.o: ../../../winix/winixd/core/log.h timezone.o: ../../../winix/winixd/core/logmanipulators.h timezone.o: ../../../pikotools/src/log/log.h @@ -5681,7 +5740,7 @@ timezone.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h timezone.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h timezone.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h timezone.o: upload.h uptime.h who.h vim.h -timezone.o: ../../../pikotools/src/html/htmlfilter.h +timezone.o: ../../../pikotools/src/html/htmlparser.h timezone.o: ../../../winix/winixd/core/winixrequest.h timezone.o: ../../../winix/winixd/core/winixsystem.h timezone.o: ../../../winix/winixd/core/sessionmanager.h @@ -5726,6 +5785,7 @@ tinymce.o: ../../../winix/winixd/core/winixbase.h tinymce.o: ../../../winix/winixd/core/config.h tinymce.o: ../../../pikotools/src/space/spaceparser.h tinymce.o: ../../../pikotools/src/space/space.h +tinymce.o: ../../../pikotools/src/convert/baseparser.h tinymce.o: ../../../winix/winixd/core/log.h tinymce.o: ../../../winix/winixd/core/logmanipulators.h tinymce.o: ../../../pikotools/src/log/log.h @@ -5817,7 +5877,7 @@ tinymce.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h tinymce.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h tinymce.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h tinymce.o: specialdefault.h stat.h subject.h template.h uname.h upload.h -tinymce.o: uptime.h who.h vim.h ../../../pikotools/src/html/htmlfilter.h +tinymce.o: uptime.h who.h vim.h ../../../pikotools/src/html/htmlparser.h tinymce.o: ../../../winix/winixd/core/winixrequest.h tinymce.o: ../../../winix/winixd/core/winixsystem.h tinymce.o: ../../../winix/winixd/core/sessionmanager.h @@ -5861,6 +5921,7 @@ uname.o: ../../../winix/winixd/core/winixbase.h uname.o: ../../../winix/winixd/core/config.h uname.o: ../../../pikotools/src/space/spaceparser.h uname.o: ../../../pikotools/src/space/space.h +uname.o: ../../../pikotools/src/convert/baseparser.h uname.o: ../../../winix/winixd/core/log.h uname.o: ../../../winix/winixd/core/logmanipulators.h uname.o: ../../../pikotools/src/log/log.h @@ -5949,7 +6010,7 @@ uname.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h uname.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h uname.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h specialdefault.h uname.o: stat.h subject.h template.h tinymce.h upload.h uptime.h who.h vim.h -uname.o: ../../../pikotools/src/html/htmlfilter.h +uname.o: ../../../pikotools/src/html/htmlparser.h uname.o: ../../../winix/winixd/core/winixrequest.h uname.o: ../../../winix/winixd/core/winixsystem.h uname.o: ../../../winix/winixd/core/sessionmanager.h @@ -5993,6 +6054,7 @@ upload.o: ../../../winix/winixd/core/winixbase.h upload.o: ../../../winix/winixd/core/config.h upload.o: ../../../pikotools/src/space/spaceparser.h upload.o: ../../../pikotools/src/space/space.h +upload.o: ../../../pikotools/src/convert/baseparser.h upload.o: ../../../winix/winixd/core/log.h upload.o: ../../../winix/winixd/core/logmanipulators.h upload.o: ../../../pikotools/src/log/log.h @@ -6083,7 +6145,7 @@ upload.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h upload.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h upload.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h specialdefault.h upload.o: stat.h subject.h template.h tinymce.h uname.h uptime.h who.h vim.h -upload.o: ../../../pikotools/src/html/htmlfilter.h +upload.o: ../../../pikotools/src/html/htmlparser.h upload.o: ../../../winix/winixd/core/winixrequest.h upload.o: ../../../winix/winixd/core/winixsystem.h upload.o: ../../../winix/winixd/core/sessionmanager.h @@ -6134,6 +6196,7 @@ uptime.o: ../../../winix/winixd/core/winixbase.h uptime.o: ../../../winix/winixd/core/config.h uptime.o: ../../../pikotools/src/space/spaceparser.h uptime.o: ../../../pikotools/src/space/space.h +uptime.o: ../../../pikotools/src/convert/baseparser.h uptime.o: ../../../winix/winixd/core/log.h uptime.o: ../../../winix/winixd/core/logmanipulators.h uptime.o: ../../../pikotools/src/log/log.h @@ -6224,7 +6287,7 @@ uptime.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h uptime.o: logout.h ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h uptime.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h sort.h specialdefault.h uptime.o: stat.h subject.h template.h tinymce.h uname.h upload.h who.h vim.h -uptime.o: ../../../pikotools/src/html/htmlfilter.h +uptime.o: ../../../pikotools/src/html/htmlparser.h uptime.o: ../../../winix/winixd/core/winixrequest.h uptime.o: ../../../winix/winixd/core/winixsystem.h uptime.o: ../../../winix/winixd/core/sessionmanager.h @@ -6267,7 +6330,9 @@ vim.o: ../../../pikotools/src/convert/double.h vim.o: ../../../winix/winixd/core/winixbase.h vim.o: ../../../winix/winixd/core/config.h vim.o: ../../../pikotools/src/space/spaceparser.h -vim.o: ../../../pikotools/src/space/space.h ../../../winix/winixd/core/log.h +vim.o: ../../../pikotools/src/space/space.h +vim.o: ../../../pikotools/src/convert/baseparser.h +vim.o: ../../../winix/winixd/core/log.h vim.o: ../../../winix/winixd/core/logmanipulators.h vim.o: ../../../pikotools/src/log/log.h ../../../pikotools/src/log/filelog.h vim.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -6348,7 +6413,7 @@ vim.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h logout.h vim.o: ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h vim.o: pw.h reload.h rm.h rmuser.h sort.h specialdefault.h stat.h subject.h vim.o: template.h tinymce.h uname.h upload.h uptime.h who.h -vim.o: ../../../pikotools/src/html/htmlfilter.h +vim.o: ../../../pikotools/src/html/htmlparser.h vim.o: ../../../winix/winixd/core/winixrequest.h vim.o: ../../../winix/winixd/core/winixsystem.h vim.o: ../../../winix/winixd/core/sessionmanager.h @@ -6391,7 +6456,9 @@ who.o: ../../../pikotools/src/convert/double.h who.o: ../../../winix/winixd/core/winixbase.h who.o: ../../../winix/winixd/core/config.h who.o: ../../../pikotools/src/space/spaceparser.h -who.o: ../../../pikotools/src/space/space.h ../../../winix/winixd/core/log.h +who.o: ../../../pikotools/src/space/space.h +who.o: ../../../pikotools/src/convert/baseparser.h +who.o: ../../../winix/winixd/core/log.h who.o: ../../../winix/winixd/core/logmanipulators.h who.o: ../../../pikotools/src/log/log.h ../../../pikotools/src/log/filelog.h who.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -6472,7 +6539,7 @@ who.o: ../../../winix/winixd/models/user.h imgcrop.h last.h login.h logout.h who.o: ln.h ls.h man.h meta.h mkdir.h mv.h nicedit.h node.h passwd.h priv.h who.o: pw.h reload.h rm.h rmuser.h sort.h specialdefault.h stat.h subject.h who.o: template.h tinymce.h uname.h upload.h uptime.h vim.h -who.o: ../../../pikotools/src/html/htmlfilter.h +who.o: ../../../pikotools/src/html/htmlparser.h who.o: ../../../winix/winixd/core/winixrequest.h who.o: ../../../winix/winixd/core/winixsystem.h who.o: ../../../winix/winixd/core/sessionmanager.h diff --git a/winixd/functions/functions.h b/winixd/functions/functions.h index 099a68f..1067361 100644 --- a/winixd/functions/functions.h +++ b/winixd/functions/functions.h @@ -83,7 +83,7 @@ #include "uptime.h" #include "who.h" #include "vim.h" -#include "html/htmlfilter.h" +#include "html/htmlparser.h" #include "core/winixrequest.h" @@ -205,7 +205,7 @@ private: SessionManager * session_manager; std::wstring temp; - pt::HTMLFilter html_filter; + pt::HTMLParser html_filter; std::wstring link_to_temp; void CreateFunctions(); diff --git a/winixd/main/Makefile.dep b/winixd/main/Makefile.dep index e6e1594..19c3252 100644 --- a/winixd/main/Makefile.dep +++ b/winixd/main/Makefile.dep @@ -36,6 +36,7 @@ main.o: ../../../winix/winixd/templates/localefilter.h main.o: ../../../winix/winixd/templates/locale.h main.o: ../../../pikotools/src/space/spaceparser.h main.o: ../../../pikotools/src/space/space.h +main.o: ../../../pikotools/src/convert/baseparser.h main.o: ../../../winix/winixd/core/winixbase.h main.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h main.o: ../../../winix/winixd/core/logmanipulators.h ../../../morm/src/morm.h @@ -168,7 +169,7 @@ main.o: ../../../winix/winixd/functions/upload.h main.o: ../../../winix/winixd/functions/uptime.h main.o: ../../../winix/winixd/functions/who.h main.o: ../../../winix/winixd/functions/vim.h -main.o: ../../../pikotools/src/html/htmlfilter.h +main.o: ../../../pikotools/src/html/htmlparser.h main.o: ../../../winix/winixd/templates/templates.h main.o: ../../../winix/winixd/templates/patterncacher.h main.o: ../../../winix/winixd/templates/indexpatterns.h diff --git a/winixd/models/Makefile.dep b/winixd/models/Makefile.dep index d736dc6..e757a4f 100644 --- a/winixd/models/Makefile.dep +++ b/winixd/models/Makefile.dep @@ -67,6 +67,7 @@ item.o: ../../../winix/winixd/templates/localefilter.h item.o: ../../../winix/winixd/templates/locale.h item.o: ../../../pikotools/src/space/spaceparser.h item.o: ../../../pikotools/src/space/space.h +item.o: ../../../pikotools/src/convert/baseparser.h item.o: ../../../winix/winixd/core/winixbase.h item.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h item.o: ../../../winix/winixd/core/synchro.h @@ -151,7 +152,7 @@ item.o: ../../../winix/winixd/core/ipbancontainer.h item.o: ../../../winix/winixd/core/system.h item.o: ../../../winix/winixd/core/sessionidmanager.h item.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -item.o: ../../../pikotools/src/html/htmlfilter.h +item.o: ../../../pikotools/src/html/htmlparser.h item.o: ../../../winix/winixd/core/winixrequest.h item.o: ../../../winix/winixd/core/winixsystem.h item.o: ../../../winix/winixd/core/slog.h @@ -202,6 +203,7 @@ itemcontent.o: ../../../winix/winixd/templates/localefilter.h itemcontent.o: ../../../winix/winixd/templates/locale.h itemcontent.o: ../../../pikotools/src/space/spaceparser.h itemcontent.o: ../../../pikotools/src/space/space.h +itemcontent.o: ../../../pikotools/src/convert/baseparser.h itemcontent.o: ../../../winix/winixd/core/winixbase.h itemcontent.o: ../../../winix/winixd/core/config.h itemcontent.o: ../../../winix/winixd/core/log.h @@ -233,7 +235,7 @@ itemcontent.o: ../../../pikotools/src/convert/inttostr.h itemcontent.o: ../../../pikotools/src/convert/patternreplacer.h itemcontent.o: ../../../pikotools/src/convert/double.h itemcontent.o: ../../../pikotools/src/html/bbcodeparser.h -itemcontent.o: ../../../pikotools/src/html/htmlfilter.h +itemcontent.o: ../../../pikotools/src/html/htmlparser.h itemcontent.o: ../../../winix/winixd/core/request.h itemcontent.o: ../../../winix/winixd/models/item.h itemcontent.h itemcontent.o: ../../../winix/winixd/core/error.h @@ -323,6 +325,7 @@ user.o: ../../../winix/winixd/templates/localefilter.h user.o: ../../../winix/winixd/templates/locale.h user.o: ../../../pikotools/src/space/spaceparser.h user.o: ../../../pikotools/src/space/space.h +user.o: ../../../pikotools/src/convert/baseparser.h user.o: ../../../winix/winixd/core/winixbase.h user.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h user.o: ../../../winix/winixd/core/log.h @@ -417,7 +420,7 @@ user.o: ../../../winix/winixd/core/ipbancontainer.h user.o: ../../../winix/winixd/core/system.h user.o: ../../../winix/winixd/core/sessionidmanager.h user.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -user.o: ../../../pikotools/src/html/htmlfilter.h +user.o: ../../../pikotools/src/html/htmlparser.h user.o: ../../../winix/winixd/core/winixrequest.h user.o: ../../../winix/winixd/core/winixsystem.h user.o: ../../../winix/winixd/core/slog.h diff --git a/winixd/notify/Makefile.dep b/winixd/notify/Makefile.dep index 09fb360..0787b7d 100644 --- a/winixd/notify/Makefile.dep +++ b/winixd/notify/Makefile.dep @@ -11,6 +11,7 @@ notify.o: ../../../pikotools/src/utf8/utf8.h notify.o: ../../../pikotools/src/textstream/stream.h notify.o: ../../../pikotools/src/utf8/utf8_templates.h notify.o: ../../../pikotools/src/utf8/utf8_private.h +notify.o: ../../../pikotools/src/convert/baseparser.h notify.o: ../../../winix/winixd/core/log.h notify.o: ../../../winix/winixd/core/logmanipulators.h notify.o: ../../../pikotools/src/log/log.h @@ -123,7 +124,7 @@ notify.o: ../../../winix/winixd/core/ipbancontainer.h notify.o: ../../../winix/winixd/core/system.h notify.o: ../../../winix/winixd/core/sessionidmanager.h notify.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -notify.o: ../../../pikotools/src/html/htmlfilter.h +notify.o: ../../../pikotools/src/html/htmlparser.h notify.o: ../../../winix/winixd/core/winixrequest.h notify.o: ../../../winix/winixd/core/winixsystem.h notify.o: ../../../winix/winixd/core/slog.h @@ -139,6 +140,7 @@ notifypool.o: ../../../pikotools/src/utf8/utf8.h notifypool.o: ../../../pikotools/src/textstream/stream.h notifypool.o: ../../../pikotools/src/utf8/utf8_templates.h notifypool.o: ../../../pikotools/src/utf8/utf8_private.h +notifypool.o: ../../../pikotools/src/convert/baseparser.h notifypool.o: ../../../pikotools/src/textstream/textstream.h notifypool.o: ../../../pikotools/src/textstream/stream.h notifypool.o: ../../../pikotools/src/space/space.h @@ -210,6 +212,7 @@ notifythread.o: ../../../winix/winixd/templates/locale.h notifythread.o: ../../../pikotools/src/space/spaceparser.h notifythread.o: ../../../pikotools/src/space/space.h notifythread.o: ../../../pikotools/src/textstream/types.h +notifythread.o: ../../../pikotools/src/convert/baseparser.h notifythread.o: ../../../winix/winixd/core/winixbase.h notifythread.o: ../../../winix/winixd/core/config.h notifythread.o: ../../../winix/winixd/core/log.h @@ -304,6 +307,7 @@ templatesnotify.o: ../../../winix/winixd/templates/locale.h templatesnotify.o: ../../../pikotools/src/space/spaceparser.h templatesnotify.o: ../../../pikotools/src/space/space.h templatesnotify.o: ../../../pikotools/src/textstream/types.h +templatesnotify.o: ../../../pikotools/src/convert/baseparser.h templatesnotify.o: ../../../winix/winixd/core/winixbase.h templatesnotify.o: ../../../winix/winixd/core/config.h templatesnotify.o: ../../../winix/winixd/core/log.h diff --git a/winixd/plugins/export/Makefile.dep b/winixd/plugins/export/Makefile.dep index b7b79c7..28197c2 100644 --- a/winixd/plugins/export/Makefile.dep +++ b/winixd/plugins/export/Makefile.dep @@ -29,6 +29,7 @@ edb.o: ../../../../winix/winixd/core/winixbase.h edb.o: ../../../../winix/winixd/core/config.h edb.o: ../../../../pikotools/src/space/spaceparser.h edb.o: ../../../../pikotools/src/space/space.h +edb.o: ../../../../pikotools/src/convert/baseparser.h edb.o: ../../../../winix/winixd/core/log.h edb.o: ../../../../winix/winixd/core/logmanipulators.h edb.o: ../../../../pikotools/src/log/log.h @@ -102,6 +103,7 @@ exportinfo.o: ../../../../winix/winixd/core/winixbase.h exportinfo.o: ../../../../winix/winixd/core/config.h exportinfo.o: ../../../../pikotools/src/space/spaceparser.h exportinfo.o: ../../../../pikotools/src/space/space.h +exportinfo.o: ../../../../pikotools/src/convert/baseparser.h exportinfo.o: ../../../../winix/winixd/core/log.h exportinfo.o: ../../../../winix/winixd/core/logmanipulators.h exportinfo.o: ../../../../pikotools/src/log/log.h @@ -292,6 +294,7 @@ funexport.o: ../../../../winix/winixd/templates/localefilter.h funexport.o: ../../../../winix/winixd/templates/locale.h funexport.o: ../../../../pikotools/src/space/spaceparser.h funexport.o: ../../../../pikotools/src/space/space.h +funexport.o: ../../../../pikotools/src/convert/baseparser.h funexport.o: ../../../../winix/winixd/core/winixbase.h funexport.o: ../../../../winix/winixd/core/config.h funexport.o: ../../../../winix/winixd/core/log.h @@ -427,6 +430,7 @@ 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: ../../../../winix/winixd/core/log.h init.o: ../../../../winix/winixd/core/logmanipulators.h init.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h @@ -578,4 +582,4 @@ init.o: ../../../../winix/winixd/functions/upload.h init.o: ../../../../winix/winixd/functions/uptime.h init.o: ../../../../winix/winixd/functions/who.h init.o: ../../../../winix/winixd/functions/vim.h -init.o: ../../../../pikotools/src/html/htmlfilter.h +init.o: ../../../../pikotools/src/html/htmlparser.h diff --git a/winixd/plugins/gallery/Makefile.dep b/winixd/plugins/gallery/Makefile.dep index 073de9d..4f69cd3 100644 --- a/winixd/plugins/gallery/Makefile.dep +++ b/winixd/plugins/gallery/Makefile.dep @@ -31,6 +31,7 @@ gallery.o: ../../../../winix/winixd/core/winixbase.h gallery.o: ../../../../winix/winixd/core/config.h gallery.o: ../../../../pikotools/src/space/spaceparser.h gallery.o: ../../../../pikotools/src/space/space.h +gallery.o: ../../../../pikotools/src/convert/baseparser.h gallery.o: ../../../../winix/winixd/core/log.h gallery.o: ../../../../winix/winixd/core/logmanipulators.h gallery.o: ../../../../pikotools/src/log/log.h @@ -183,6 +184,7 @@ galleryinfo.o: ../../../../winix/winixd/templates/localefilter.h galleryinfo.o: ../../../../winix/winixd/templates/locale.h galleryinfo.o: ../../../../pikotools/src/space/spaceparser.h galleryinfo.o: ../../../../pikotools/src/space/space.h +galleryinfo.o: ../../../../pikotools/src/convert/baseparser.h galleryinfo.o: ../../../../winix/winixd/core/winixbase.h galleryinfo.o: ../../../../winix/winixd/core/config.h galleryinfo.o: ../../../../winix/winixd/core/log.h @@ -238,6 +240,7 @@ 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: ../../../../winix/winixd/core/log.h init.o: ../../../../winix/winixd/core/logmanipulators.h init.o: ../../../../pikotools/src/log/log.h @@ -389,7 +392,7 @@ init.o: ../../../../winix/winixd/functions/upload.h init.o: ../../../../winix/winixd/functions/uptime.h init.o: ../../../../winix/winixd/functions/who.h init.o: ../../../../winix/winixd/functions/vim.h -init.o: ../../../../pikotools/src/html/htmlfilter.h +init.o: ../../../../pikotools/src/html/htmlparser.h templates.o: gallery.h ../../../../winix/winixd/functions/functionbase.h templates.o: ../../../../winix/winixd/db/db.h templates.o: ../../../../winix/winixd/db/dbbase.h @@ -421,6 +424,7 @@ 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: ../../../../winix/winixd/core/log.h templates.o: ../../../../winix/winixd/core/logmanipulators.h templates.o: ../../../../pikotools/src/log/log.h @@ -538,7 +542,7 @@ templates.o: ../../../../winix/winixd/templates/patterncacher.h templates.o: ../../../../winix/winixd/templates/indexpatterns.h templates.o: ../../../../winix/winixd/templates/patterns.h templates.o: ../../../../winix/winixd/templates/changepatterns.h -templates.o: ../../../../pikotools/src/html/htmlfilter.h +templates.o: ../../../../pikotools/src/html/htmlparser.h templates.o: ../../../../winix/winixd/functions/functions.h templates.o: ../../../../winix/winixd/functions/functionbase.h templates.o: ../../../../winix/winixd/functions/functionparser.h diff --git a/winixd/plugins/group/Makefile.dep b/winixd/plugins/group/Makefile.dep index 012700f..fd3dca7 100644 --- a/winixd/plugins/group/Makefile.dep +++ b/winixd/plugins/group/Makefile.dep @@ -9,6 +9,7 @@ groupinfo.o: ../../../../pikotools/src/utf8/utf8.h groupinfo.o: ../../../../pikotools/src/textstream/stream.h groupinfo.o: ../../../../pikotools/src/utf8/utf8_templates.h groupinfo.o: ../../../../pikotools/src/utf8/utf8_private.h +groupinfo.o: ../../../../pikotools/src/convert/baseparser.h groupinfo.o: ../../../../winix/winixd/core/winixrequest.h groupinfo.o: ../../../../winix/winixd/core/winixsystem.h groupinfo.o: ../../../../winix/winixd/core/system.h @@ -142,6 +143,7 @@ groups.o: ../../../../pikotools/src/utf8/utf8.h groups.o: ../../../../pikotools/src/textstream/stream.h groups.o: ../../../../pikotools/src/utf8/utf8_templates.h groups.o: ../../../../pikotools/src/utf8/utf8_private.h +groups.o: ../../../../pikotools/src/convert/baseparser.h groups.o: ../../../../winix/winixd/core/winixrequest.h groups.o: ../../../../winix/winixd/core/winixsystem.h groups.o: ../../../../winix/winixd/core/system.h @@ -288,6 +290,7 @@ 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 @@ -438,7 +441,7 @@ init.o: ../../../../winix/winixd/functions/upload.h init.o: ../../../../winix/winixd/functions/uptime.h init.o: ../../../../winix/winixd/functions/who.h init.o: ../../../../winix/winixd/functions/vim.h -init.o: ../../../../pikotools/src/html/htmlfilter.h +init.o: ../../../../pikotools/src/html/htmlparser.h templates.o: ../../../../winix/winixd/templates/templates.h templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h templates.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h @@ -468,6 +471,7 @@ 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/textstream/types.h +templates.o: ../../../../pikotools/src/convert/baseparser.h templates.o: ../../../../winix/winixd/core/log.h templates.o: ../../../../winix/winixd/core/logmanipulators.h templates.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h @@ -577,7 +581,7 @@ 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: ../../../../pikotools/src/html/htmlfilter.h +templates.o: ../../../../pikotools/src/html/htmlparser.h templates.o: ../../../../winix/winixd/core/plugin.h groupinfo.h templates.o: ../../../../winix/winixd/core/misc.h templates.o: ../../../../winix/winixd/core/winix_const.h diff --git a/winixd/plugins/mailregister/Makefile.dep b/winixd/plugins/mailregister/Makefile.dep index 32045bd..041f14c 100644 --- a/winixd/plugins/mailregister/Makefile.dep +++ b/winixd/plugins/mailregister/Makefile.dep @@ -32,6 +32,7 @@ funregistermail_showusers.o: ../../../../winix/winixd/core/winixbase.h funregistermail_showusers.o: ../../../../winix/winixd/core/config.h funregistermail_showusers.o: ../../../../pikotools/src/space/spaceparser.h funregistermail_showusers.o: ../../../../pikotools/src/space/space.h +funregistermail_showusers.o: ../../../../pikotools/src/convert/baseparser.h funregistermail_showusers.o: ../../../../winix/winixd/core/log.h funregistermail_showusers.o: ../../../../winix/winixd/core/logmanipulators.h funregistermail_showusers.o: ../../../../pikotools/src/log/log.h @@ -188,6 +189,7 @@ funregistermail.o: ../../../../winix/winixd/core/winixbase.h funregistermail.o: ../../../../winix/winixd/core/config.h funregistermail.o: ../../../../pikotools/src/space/spaceparser.h funregistermail.o: ../../../../pikotools/src/space/space.h +funregistermail.o: ../../../../pikotools/src/convert/baseparser.h funregistermail.o: ../../../../winix/winixd/core/log.h funregistermail.o: ../../../../winix/winixd/core/logmanipulators.h funregistermail.o: ../../../../pikotools/src/log/log.h @@ -351,6 +353,7 @@ 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: ../../../../winix/winixd/core/log.h init.o: ../../../../winix/winixd/core/logmanipulators.h init.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h @@ -493,7 +496,7 @@ init.o: ../../../../winix/winixd/functions/upload.h init.o: ../../../../winix/winixd/functions/uptime.h init.o: ../../../../winix/winixd/functions/who.h init.o: ../../../../winix/winixd/functions/vim.h -init.o: ../../../../pikotools/src/html/htmlfilter.h +init.o: ../../../../pikotools/src/html/htmlparser.h mdb.o: mdb.h ../../../../winix/winixd/db/dbbase.h mdb.o: ../../../../winix/winixd/core/dirs.h mdb.o: ../../../../winix/winixd/core/log.h @@ -534,6 +537,7 @@ 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: ../../../../winix/winixd/core/log.h templates.o: ../../../../winix/winixd/core/logmanipulators.h templates.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h @@ -639,7 +643,7 @@ 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/htmlfilter.h +templates.o: ../../../../pikotools/src/html/htmlparser.h templates.o: ../../../../winix/winixd/core/winixrequest.h templates.o: ../../../../winix/winixd/core/winixsystem.h templates.o: ../../../../winix/winixd/core/slog.h diff --git a/winixd/plugins/menu/Makefile.dep b/winixd/plugins/menu/Makefile.dep index f4d27c3..21c2ea8 100644 --- a/winixd/plugins/menu/Makefile.dep +++ b/winixd/plugins/menu/Makefile.dep @@ -12,6 +12,7 @@ cache.o: ../../../../pikotools/src/utf8/utf8.h cache.o: ../../../../pikotools/src/textstream/stream.h cache.o: ../../../../pikotools/src/utf8/utf8_templates.h cache.o: ../../../../pikotools/src/utf8/utf8_private.h +cache.o: ../../../../pikotools/src/convert/baseparser.h cache.o: ../../../../winix/winixd/core/log.h cache.o: ../../../../winix/winixd/core/logmanipulators.h cache.o: ../../../../pikotools/src/log/log.h @@ -108,6 +109,7 @@ 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: ../../../../winix/winixd/core/log.h init.o: ../../../../winix/winixd/core/logmanipulators.h init.o: ../../../../pikotools/src/log/log.h @@ -224,7 +226,7 @@ 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/htmlfilter.h +init.o: ../../../../pikotools/src/html/htmlparser.h init.o: ../../../../winix/winixd/core/winixrequest.h init.o: ../../../../winix/winixd/core/winixsystem.h init.o: ../../../../winix/winixd/core/slog.h @@ -290,6 +292,7 @@ templates.o: ../../../../pikotools/src/utf8/utf8.h 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: ../../../../pikotools/src/convert/baseparser.h templates.o: ../../../../winix/winixd/core/log.h templates.o: ../../../../winix/winixd/core/logmanipulators.h templates.o: ../../../../pikotools/src/log/log.h @@ -412,7 +415,7 @@ 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/htmlfilter.h +templates.o: ../../../../pikotools/src/html/htmlparser.h templates.o: ../../../../winix/winixd/core/winixrequest.h templates.o: ../../../../winix/winixd/core/winixsystem.h templates.o: ../../../../winix/winixd/core/slog.h diff --git a/winixd/plugins/seo/Makefile.dep b/winixd/plugins/seo/Makefile.dep index bbf66f1..b871cd1 100644 --- a/winixd/plugins/seo/Makefile.dep +++ b/winixd/plugins/seo/Makefile.dep @@ -30,6 +30,7 @@ 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: ../../../../winix/winixd/core/log.h init.o: ../../../../winix/winixd/core/logmanipulators.h init.o: ../../../../pikotools/src/log/log.h @@ -180,7 +181,7 @@ init.o: ../../../../winix/winixd/functions/upload.h init.o: ../../../../winix/winixd/functions/uptime.h init.o: ../../../../winix/winixd/functions/who.h init.o: ../../../../winix/winixd/functions/vim.h -init.o: ../../../../pikotools/src/html/htmlfilter.h +init.o: ../../../../pikotools/src/html/htmlparser.h seo.o: seo.h ../../../../winix/winixd/functions/functionbase.h seo.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h seo.o: ../../../../winix/winixd/db/dbconn.h @@ -211,6 +212,7 @@ seo.o: ../../../../winix/winixd/core/winixbase.h seo.o: ../../../../winix/winixd/core/config.h seo.o: ../../../../pikotools/src/space/spaceparser.h seo.o: ../../../../pikotools/src/space/space.h +seo.o: ../../../../pikotools/src/convert/baseparser.h seo.o: ../../../../winix/winixd/core/log.h seo.o: ../../../../winix/winixd/core/logmanipulators.h seo.o: ../../../../pikotools/src/log/log.h @@ -361,4 +363,4 @@ seo.o: ../../../../winix/winixd/functions/upload.h seo.o: ../../../../winix/winixd/functions/uptime.h seo.o: ../../../../winix/winixd/functions/who.h seo.o: ../../../../winix/winixd/functions/vim.h -seo.o: ../../../../pikotools/src/html/htmlfilter.h +seo.o: ../../../../pikotools/src/html/htmlparser.h diff --git a/winixd/plugins/stats/Makefile.dep b/winixd/plugins/stats/Makefile.dep index 363d7e4..6a45c1e 100644 --- a/winixd/plugins/stats/Makefile.dep +++ b/winixd/plugins/stats/Makefile.dep @@ -48,6 +48,7 @@ init.o: ../../../../winix/winixd/templates/localefilter.h init.o: ../../../../winix/winixd/templates/locale.h init.o: ../../../../pikotools/src/space/spaceparser.h init.o: ../../../../pikotools/src/space/space.h +init.o: ../../../../pikotools/src/convert/baseparser.h init.o: ../../../../winix/winixd/core/winixbase.h init.o: ../../../../winix/winixd/core/config.h init.o: ../../../../winix/winixd/core/log.h @@ -96,6 +97,7 @@ init.o: ../../../../winix/winixd/core/plugindata.h stats.o: stats.h ../../../../winix/winixd/core/config.h stats.o: ../../../../pikotools/src/space/spaceparser.h stats.o: ../../../../pikotools/src/space/space.h +stats.o: ../../../../pikotools/src/convert/baseparser.h stats.o: ../../../../winix/winixd/core/log.h stats.o: ../../../../pikotools/src/log/filelog.h stats.o: ../../../../pikotools/src/textstream/textstream.h @@ -179,6 +181,7 @@ templates.o: ../../../../pikotools/src/convert/double.h stats.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: ../../../../winix/winixd/core/log.h templates.o: ../../../../winix/winixd/core/winixmodeldeprecated.h templates.o: ../../../../winix/winixd/core/winixbase.h diff --git a/winixd/plugins/thread/Makefile.dep b/winixd/plugins/thread/Makefile.dep index d6bc203..ddd45f3 100644 --- a/winixd/plugins/thread/Makefile.dep +++ b/winixd/plugins/thread/Makefile.dep @@ -32,6 +32,7 @@ createthread.o: ../../../../winix/winixd/core/winixbase.h createthread.o: ../../../../winix/winixd/core/config.h createthread.o: ../../../../pikotools/src/space/spaceparser.h createthread.o: ../../../../pikotools/src/space/space.h +createthread.o: ../../../../pikotools/src/convert/baseparser.h createthread.o: ../../../../winix/winixd/core/log.h createthread.o: ../../../../winix/winixd/core/logmanipulators.h createthread.o: ../../../../pikotools/src/log/log.h @@ -191,7 +192,7 @@ createthread.o: ../../../../winix/winixd/functions/upload.h createthread.o: ../../../../winix/winixd/functions/uptime.h createthread.o: ../../../../winix/winixd/functions/who.h createthread.o: ../../../../winix/winixd/functions/vim.h -createthread.o: ../../../../pikotools/src/html/htmlfilter.h +createthread.o: ../../../../pikotools/src/html/htmlparser.h funthread.o: ../../../../winix/winixd/core/misc.h funthread.o: ../../../../winix/winixd/core/requesttypes.h funthread.o: ../../../../pikotools/src/textstream/textstream.h @@ -224,6 +225,7 @@ funthread.o: ../../../../winix/winixd/core/winixbase.h funthread.o: ../../../../winix/winixd/core/config.h funthread.o: ../../../../pikotools/src/space/spaceparser.h funthread.o: ../../../../pikotools/src/space/space.h +funthread.o: ../../../../pikotools/src/convert/baseparser.h funthread.o: ../../../../winix/winixd/core/log.h funthread.o: ../../../../winix/winixd/core/logmanipulators.h funthread.o: ../../../../pikotools/src/log/log.h @@ -375,6 +377,7 @@ init.o: ../../../../winix/winixd/templates/localefilter.h init.o: ../../../../winix/winixd/templates/locale.h init.o: ../../../../pikotools/src/space/spaceparser.h init.o: ../../../../pikotools/src/space/space.h +init.o: ../../../../pikotools/src/convert/baseparser.h init.o: ../../../../winix/winixd/core/winixbase.h init.o: ../../../../winix/winixd/core/config.h init.o: ../../../../winix/winixd/core/log.h @@ -519,7 +522,7 @@ init.o: ../../../../winix/winixd/functions/upload.h init.o: ../../../../winix/winixd/functions/uptime.h init.o: ../../../../winix/winixd/functions/who.h init.o: ../../../../winix/winixd/functions/vim.h -init.o: ../../../../pikotools/src/html/htmlfilter.h +init.o: ../../../../pikotools/src/html/htmlparser.h reply.o: reply.h ../../../../winix/winixd/functions/functionbase.h reply.o: ../../../../winix/winixd/db/db.h reply.o: ../../../../winix/winixd/db/dbbase.h @@ -551,6 +554,7 @@ reply.o: ../../../../winix/winixd/core/winixbase.h reply.o: ../../../../winix/winixd/core/config.h reply.o: ../../../../pikotools/src/space/spaceparser.h reply.o: ../../../../pikotools/src/space/space.h +reply.o: ../../../../pikotools/src/convert/baseparser.h reply.o: ../../../../winix/winixd/core/log.h reply.o: ../../../../winix/winixd/core/logmanipulators.h reply.o: ../../../../pikotools/src/log/log.h @@ -703,7 +707,7 @@ reply.o: ../../../../winix/winixd/functions/upload.h reply.o: ../../../../winix/winixd/functions/uptime.h reply.o: ../../../../winix/winixd/functions/who.h reply.o: ../../../../winix/winixd/functions/vim.h -reply.o: ../../../../pikotools/src/html/htmlfilter.h +reply.o: ../../../../pikotools/src/html/htmlparser.h reply.o: ../../../../winix/winixd/core/misc.h showthreads.o: showthreads.h showthreads.o: ../../../../winix/winixd/functions/functionbase.h @@ -737,6 +741,7 @@ showthreads.o: ../../../../winix/winixd/core/winixbase.h showthreads.o: ../../../../winix/winixd/core/config.h showthreads.o: ../../../../pikotools/src/space/spaceparser.h showthreads.o: ../../../../pikotools/src/space/space.h +showthreads.o: ../../../../pikotools/src/convert/baseparser.h showthreads.o: ../../../../winix/winixd/core/log.h showthreads.o: ../../../../winix/winixd/core/logmanipulators.h showthreads.o: ../../../../pikotools/src/log/log.h @@ -889,6 +894,7 @@ tdb.o: ../../../../winix/winixd/templates/localefilter.h tdb.o: ../../../../winix/winixd/templates/locale.h tdb.o: ../../../../pikotools/src/space/spaceparser.h tdb.o: ../../../../pikotools/src/space/space.h +tdb.o: ../../../../pikotools/src/convert/baseparser.h tdb.o: ../../../../winix/winixd/core/winixbase.h tdb.o: ../../../../winix/winixd/core/config.h tdb.o: ../../../../winix/winixd/core/log.h @@ -923,6 +929,7 @@ 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: ../../../../winix/winixd/core/log.h templates.o: ../../../../winix/winixd/core/logmanipulators.h templates.o: ../../../../pikotools/src/log/log.h @@ -1063,7 +1070,7 @@ templates.o: ../../../../winix/winixd/templates/patterncacher.h templates.o: ../../../../winix/winixd/templates/indexpatterns.h templates.o: ../../../../winix/winixd/templates/patterns.h templates.o: ../../../../winix/winixd/templates/changepatterns.h -templates.o: ../../../../pikotools/src/html/htmlfilter.h +templates.o: ../../../../pikotools/src/html/htmlparser.h templates.o: ../../../../winix/winixd/functions/functions.h templates.o: ../../../../winix/winixd/functions/functionbase.h templates.o: ../../../../winix/winixd/functions/functionparser.h @@ -1152,6 +1159,7 @@ thread.o: ../../../../winix/winixd/templates/localefilter.h thread.o: ../../../../winix/winixd/templates/locale.h thread.o: ../../../../pikotools/src/space/spaceparser.h thread.o: ../../../../pikotools/src/space/space.h +thread.o: ../../../../pikotools/src/convert/baseparser.h thread.o: ../../../../winix/winixd/core/winixbase.h thread.o: ../../../../winix/winixd/core/config.h thread.o: ../../../../winix/winixd/core/log.h @@ -1218,6 +1226,7 @@ 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: ../../../../winix/winixd/core/log.h threadinfo.o: ../../../../winix/winixd/core/logmanipulators.h threadinfo.o: ../../../../pikotools/src/log/log.h diff --git a/winixd/plugins/ticket/Makefile.dep b/winixd/plugins/ticket/Makefile.dep index da9d369..40a19ca 100644 --- a/winixd/plugins/ticket/Makefile.dep +++ b/winixd/plugins/ticket/Makefile.dep @@ -30,6 +30,7 @@ createticket.o: ../../../../winix/winixd/core/winixbase.h createticket.o: ../../../../winix/winixd/core/config.h createticket.o: ../../../../pikotools/src/space/spaceparser.h createticket.o: ../../../../pikotools/src/space/space.h +createticket.o: ../../../../pikotools/src/convert/baseparser.h createticket.o: ../../../../winix/winixd/core/log.h createticket.o: ../../../../winix/winixd/core/logmanipulators.h createticket.o: ../../../../pikotools/src/log/log.h @@ -191,7 +192,7 @@ createticket.o: ../../../../winix/winixd/functions/upload.h createticket.o: ../../../../winix/winixd/functions/uptime.h createticket.o: ../../../../winix/winixd/functions/who.h createticket.o: ../../../../winix/winixd/functions/vim.h -createticket.o: ../../../../pikotools/src/html/htmlfilter.h sessiondata.h +createticket.o: ../../../../pikotools/src/html/htmlparser.h sessiondata.h createticket.o: ../../../../winix/winixd/core/plugindata.h createticket.o: ../../../../winix/winixd/functions/rm.h editticket.o: editticket.h tdb.h ticket.h @@ -224,6 +225,7 @@ editticket.o: ../../../../winix/winixd/core/winixbase.h editticket.o: ../../../../winix/winixd/core/config.h editticket.o: ../../../../pikotools/src/space/spaceparser.h editticket.o: ../../../../pikotools/src/space/space.h +editticket.o: ../../../../pikotools/src/convert/baseparser.h editticket.o: ../../../../winix/winixd/core/log.h editticket.o: ../../../../winix/winixd/core/logmanipulators.h editticket.o: ../../../../pikotools/src/log/log.h @@ -374,7 +376,7 @@ editticket.o: ../../../../winix/winixd/functions/upload.h editticket.o: ../../../../winix/winixd/functions/uptime.h editticket.o: ../../../../winix/winixd/functions/who.h editticket.o: ../../../../winix/winixd/functions/vim.h -editticket.o: ../../../../pikotools/src/html/htmlfilter.h +editticket.o: ../../../../pikotools/src/html/htmlparser.h editticket.o: ../../../../winix/winixd/core/winixrequest.h editticket.o: ../../../../winix/winixd/core/winixsystem.h editticket.o: ../../../../winix/winixd/core/sessionmanager.h @@ -416,6 +418,7 @@ funticket.o: ../../../../winix/winixd/core/winixbase.h funticket.o: ../../../../winix/winixd/core/config.h funticket.o: ../../../../pikotools/src/space/spaceparser.h funticket.o: ../../../../pikotools/src/space/space.h +funticket.o: ../../../../pikotools/src/convert/baseparser.h funticket.o: ../../../../winix/winixd/core/log.h funticket.o: ../../../../winix/winixd/core/logmanipulators.h funticket.o: ../../../../pikotools/src/log/log.h @@ -564,7 +567,7 @@ funticket.o: ../../../../winix/winixd/functions/upload.h funticket.o: ../../../../winix/winixd/functions/uptime.h funticket.o: ../../../../winix/winixd/functions/who.h funticket.o: ../../../../winix/winixd/functions/vim.h -funticket.o: ../../../../pikotools/src/html/htmlfilter.h +funticket.o: ../../../../pikotools/src/html/htmlparser.h funticket.o: ../../../../winix/winixd/core/winixrequest.h funticket.o: ../../../../winix/winixd/core/winixsystem.h funticket.o: ../../../../winix/winixd/core/sessionmanager.h @@ -605,6 +608,7 @@ 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: ../../../../winix/winixd/core/log.h init.o: ../../../../winix/winixd/core/logmanipulators.h init.o: ../../../../pikotools/src/log/log.h @@ -746,7 +750,7 @@ init.o: ../../../../winix/winixd/functions/upload.h init.o: ../../../../winix/winixd/functions/uptime.h init.o: ../../../../winix/winixd/functions/who.h init.o: ../../../../winix/winixd/functions/vim.h -init.o: ../../../../pikotools/src/html/htmlfilter.h +init.o: ../../../../pikotools/src/html/htmlparser.h init.o: ../../../../winix/winixd/core/winixrequest.h init.o: ../../../../winix/winixd/core/winixsystem.h init.o: ../../../../winix/winixd/core/sessionmanager.h @@ -803,6 +807,7 @@ showtickets.o: ../../../../winix/winixd/core/winixbase.h showtickets.o: ../../../../winix/winixd/core/config.h showtickets.o: ../../../../pikotools/src/space/spaceparser.h showtickets.o: ../../../../pikotools/src/space/space.h +showtickets.o: ../../../../pikotools/src/convert/baseparser.h showtickets.o: ../../../../winix/winixd/core/log.h showtickets.o: ../../../../winix/winixd/core/logmanipulators.h showtickets.o: ../../../../pikotools/src/log/log.h @@ -953,7 +958,7 @@ showtickets.o: ../../../../winix/winixd/functions/upload.h showtickets.o: ../../../../winix/winixd/functions/uptime.h showtickets.o: ../../../../winix/winixd/functions/who.h showtickets.o: ../../../../winix/winixd/functions/vim.h -showtickets.o: ../../../../pikotools/src/html/htmlfilter.h +showtickets.o: ../../../../pikotools/src/html/htmlparser.h showtickets.o: ../../../../winix/winixd/core/winixrequest.h showtickets.o: ../../../../winix/winixd/core/winixsystem.h showtickets.o: ../../../../winix/winixd/core/sessionmanager.h @@ -994,6 +999,7 @@ tdb.o: ../../../../winix/winixd/core/winixbase.h tdb.o: ../../../../winix/winixd/core/config.h tdb.o: ../../../../pikotools/src/space/spaceparser.h tdb.o: ../../../../pikotools/src/space/space.h +tdb.o: ../../../../pikotools/src/convert/baseparser.h tdb.o: ../../../../winix/winixd/core/log.h tdb.o: ../../../../winix/winixd/core/logmanipulators.h tdb.o: ../../../../pikotools/src/log/log.h @@ -1053,6 +1059,7 @@ 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: ../../../../winix/winixd/core/log.h templates.o: ../../../../winix/winixd/core/logmanipulators.h templates.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h @@ -1196,7 +1203,7 @@ templates.o: ../../../../winix/winixd/functions/upload.h templates.o: ../../../../winix/winixd/functions/uptime.h templates.o: ../../../../winix/winixd/functions/who.h templates.o: ../../../../winix/winixd/functions/vim.h -templates.o: ../../../../pikotools/src/html/htmlfilter.h +templates.o: ../../../../pikotools/src/html/htmlparser.h templates.o: ../../../../winix/winixd/core/winixrequest.h templates.o: ../../../../winix/winixd/core/winixsystem.h templates.o: ../../../../winix/winixd/core/sessionmanager.h @@ -1230,6 +1237,7 @@ 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: ../../../../winix/winixd/core/log.h ticketinfo.o: ../../../../winix/winixd/core/logmanipulators.h ticketinfo.o: ../../../../pikotools/src/log/log.h @@ -1396,7 +1404,7 @@ ticketinfo.o: ../../../../winix/winixd/functions/upload.h ticketinfo.o: ../../../../winix/winixd/functions/uptime.h ticketinfo.o: ../../../../winix/winixd/functions/who.h ticketinfo.o: ../../../../winix/winixd/functions/vim.h -ticketinfo.o: ../../../../pikotools/src/html/htmlfilter.h +ticketinfo.o: ../../../../pikotools/src/html/htmlparser.h ticketinfo.o: ../../../../winix/winixd/core/winixrequest.h ticketinfo.o: ../../../../winix/winixd/core/winixsystem.h ticketinfo.o: ../../../../winix/winixd/core/sessionmanager.h diff --git a/winixd/templates/Makefile.dep b/winixd/templates/Makefile.dep index c74e04e..27de4bb 100644 --- a/winixd/templates/Makefile.dep +++ b/winixd/templates/Makefile.dep @@ -23,6 +23,7 @@ adduser.o: ../../../pikotools/src/log/filelog.h adduser.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h adduser.o: ../../../pikotools/src/space/spaceparser.h adduser.o: ../../../pikotools/src/space/space.h +adduser.o: ../../../pikotools/src/convert/baseparser.h adduser.o: ../../../winix/winixd/core/winixbase.h adduser.o: ../../../winix/winixd/core/config.h adduser.o: ../../../winix/winixd/core/log.h @@ -120,7 +121,7 @@ adduser.o: ../../../winix/winixd/core/ipbancontainer.h adduser.o: ../../../winix/winixd/core/system.h adduser.o: ../../../winix/winixd/core/sessionidmanager.h adduser.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -adduser.o: ../../../pikotools/src/html/htmlfilter.h +adduser.o: ../../../pikotools/src/html/htmlparser.h adduser.o: ../../../winix/winixd/core/winixrequest.h adduser.o: ../../../winix/winixd/core/winixsystem.h adduser.o: ../../../winix/winixd/core/slog.h @@ -148,6 +149,7 @@ antispam.o: ../../../pikotools/src/log/filelog.h antispam.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h antispam.o: ../../../pikotools/src/space/spaceparser.h antispam.o: ../../../pikotools/src/space/space.h +antispam.o: ../../../pikotools/src/convert/baseparser.h antispam.o: ../../../winix/winixd/core/winixbase.h antispam.o: ../../../winix/winixd/core/config.h antispam.o: ../../../winix/winixd/core/log.h @@ -246,7 +248,7 @@ antispam.o: ../../../winix/winixd/core/ipbancontainer.h antispam.o: ../../../winix/winixd/core/system.h antispam.o: ../../../winix/winixd/core/sessionidmanager.h antispam.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -antispam.o: ../../../pikotools/src/html/htmlfilter.h +antispam.o: ../../../pikotools/src/html/htmlparser.h antispam.o: ../../../winix/winixd/core/winixrequest.h antispam.o: ../../../winix/winixd/core/winixsystem.h antispam.o: ../../../winix/winixd/core/slog.h @@ -260,6 +262,7 @@ antispam.o: ../../../pikotools/src/convert/double.h changepatterns.o: changepatterns.h patterns.h locale.h changepatterns.o: ../../../pikotools/src/space/spaceparser.h changepatterns.o: ../../../pikotools/src/space/space.h +changepatterns.o: ../../../pikotools/src/convert/baseparser.h changepatterns.o: ../../../pikotools/src/textstream/textstream.h changepatterns.o: ../../../pikotools/src/textstream/stream.h changepatterns.o: ../../../pikotools/src/space/space.h @@ -341,6 +344,7 @@ config.o: ../../../pikotools/src/log/filelog.h config.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h config.o: ../../../pikotools/src/space/spaceparser.h config.o: ../../../pikotools/src/space/space.h +config.o: ../../../pikotools/src/convert/baseparser.h config.o: ../../../winix/winixd/core/winixbase.h config.o: ../../../winix/winixd/core/config.h config.o: ../../../winix/winixd/core/log.h @@ -437,7 +441,7 @@ config.o: ../../../winix/winixd/core/ipbancontainer.h config.o: ../../../winix/winixd/core/system.h config.o: ../../../winix/winixd/core/sessionidmanager.h config.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -config.o: ../../../pikotools/src/html/htmlfilter.h +config.o: ../../../pikotools/src/html/htmlparser.h config.o: ../../../winix/winixd/core/winixrequest.h config.o: ../../../winix/winixd/core/winixsystem.h config.o: ../../../winix/winixd/core/slog.h @@ -465,6 +469,7 @@ currentdate.o: ../../../pikotools/src/log/filelog.h currentdate.o: ../../../ezc/src/patternparser.h misc.h localefilter.h currentdate.o: locale.h ../../../pikotools/src/space/spaceparser.h currentdate.o: ../../../pikotools/src/space/space.h +currentdate.o: ../../../pikotools/src/convert/baseparser.h currentdate.o: ../../../winix/winixd/core/winixbase.h currentdate.o: ../../../winix/winixd/core/config.h currentdate.o: ../../../winix/winixd/core/log.h @@ -565,7 +570,7 @@ currentdate.o: ../../../winix/winixd/core/ipbancontainer.h currentdate.o: ../../../winix/winixd/core/system.h currentdate.o: ../../../winix/winixd/core/sessionidmanager.h currentdate.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -currentdate.o: ../../../pikotools/src/html/htmlfilter.h +currentdate.o: ../../../pikotools/src/html/htmlparser.h currentdate.o: ../../../winix/winixd/core/winixrequest.h currentdate.o: ../../../winix/winixd/core/winixsystem.h currentdate.o: ../../../winix/winixd/core/slog.h @@ -644,6 +649,7 @@ dir.o: ../../../pikotools/src/log/filelog.h ../../../ezc/src/patternparser.h dir.o: misc.h localefilter.h locale.h dir.o: ../../../pikotools/src/space/spaceparser.h dir.o: ../../../pikotools/src/space/space.h +dir.o: ../../../pikotools/src/convert/baseparser.h dir.o: ../../../winix/winixd/core/winixbase.h dir.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h dir.o: ../../../winix/winixd/core/logmanipulators.h ../../../morm/src/morm.h @@ -731,7 +737,7 @@ dir.o: ../../../winix/winixd/core/ipbancontainer.h dir.o: ../../../winix/winixd/core/system.h dir.o: ../../../winix/winixd/core/sessionidmanager.h dir.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -dir.o: ../../../pikotools/src/html/htmlfilter.h +dir.o: ../../../pikotools/src/html/htmlparser.h dir.o: ../../../winix/winixd/core/winixrequest.h dir.o: ../../../winix/winixd/core/winixsystem.h dir.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/misc.h @@ -809,6 +815,7 @@ doc.o: ../../../pikotools/src/log/filelog.h ../../../ezc/src/patternparser.h doc.o: misc.h localefilter.h locale.h doc.o: ../../../pikotools/src/space/spaceparser.h doc.o: ../../../pikotools/src/space/space.h +doc.o: ../../../pikotools/src/convert/baseparser.h doc.o: ../../../winix/winixd/core/winixbase.h doc.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h doc.o: ../../../winix/winixd/core/logmanipulators.h ../../../morm/src/morm.h @@ -896,7 +903,7 @@ doc.o: ../../../winix/winixd/core/ipbancontainer.h doc.o: ../../../winix/winixd/core/system.h doc.o: ../../../winix/winixd/core/sessionidmanager.h doc.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -doc.o: ../../../pikotools/src/html/htmlfilter.h +doc.o: ../../../pikotools/src/html/htmlparser.h doc.o: ../../../winix/winixd/core/winixrequest.h doc.o: ../../../winix/winixd/core/winixsystem.h doc.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/request.h @@ -929,6 +936,7 @@ filters.o: ../../../pikotools/src/log/filelog.h filters.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h filters.o: ../../../pikotools/src/space/spaceparser.h filters.o: ../../../pikotools/src/space/space.h +filters.o: ../../../pikotools/src/convert/baseparser.h filters.o: ../../../winix/winixd/core/winixbase.h filters.o: ../../../winix/winixd/core/config.h filters.o: ../../../winix/winixd/core/log.h @@ -1026,7 +1034,7 @@ filters.o: ../../../winix/winixd/core/ipbancontainer.h filters.o: ../../../winix/winixd/core/system.h filters.o: ../../../winix/winixd/core/sessionidmanager.h filters.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -filters.o: ../../../pikotools/src/html/htmlfilter.h +filters.o: ../../../pikotools/src/html/htmlparser.h filters.o: ../../../winix/winixd/core/winixrequest.h filters.o: ../../../winix/winixd/core/winixsystem.h filters.o: ../../../winix/winixd/core/slog.h @@ -1059,6 +1067,7 @@ generic.o: ../../../pikotools/src/log/filelog.h generic.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h generic.o: ../../../pikotools/src/space/spaceparser.h generic.o: ../../../pikotools/src/space/space.h +generic.o: ../../../pikotools/src/convert/baseparser.h generic.o: ../../../winix/winixd/core/winixbase.h generic.o: ../../../winix/winixd/core/config.h generic.o: ../../../winix/winixd/core/log.h @@ -1156,7 +1165,7 @@ generic.o: ../../../winix/winixd/core/ipbancontainer.h generic.o: ../../../winix/winixd/core/system.h generic.o: ../../../winix/winixd/core/sessionidmanager.h generic.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -generic.o: ../../../pikotools/src/html/htmlfilter.h +generic.o: ../../../pikotools/src/html/htmlparser.h generic.o: ../../../winix/winixd/core/winixrequest.h generic.o: ../../../winix/winixd/core/winixsystem.h generic.o: ../../../winix/winixd/core/slog.h @@ -1230,6 +1239,7 @@ indexpatterns.o: ../../../pikotools/src/log/filelog.h indexpatterns.o: ../../../ezc/src/patternparser.h patterns.h locale.h indexpatterns.o: ../../../pikotools/src/space/spaceparser.h indexpatterns.o: ../../../pikotools/src/space/space.h +indexpatterns.o: ../../../pikotools/src/convert/baseparser.h indexpatterns.o: ../../../winix/winixd/core/winixbase.h indexpatterns.o: ../../../winix/winixd/core/config.h indexpatterns.o: ../../../winix/winixd/core/log.h @@ -1288,6 +1298,7 @@ insert.o: ../../../pikotools/src/log/filelog.h insert.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h insert.o: ../../../pikotools/src/space/spaceparser.h insert.o: ../../../pikotools/src/space/space.h +insert.o: ../../../pikotools/src/convert/baseparser.h insert.o: ../../../winix/winixd/core/winixbase.h insert.o: ../../../winix/winixd/core/config.h insert.o: ../../../winix/winixd/core/log.h @@ -1384,7 +1395,7 @@ insert.o: ../../../winix/winixd/core/ipbancontainer.h insert.o: ../../../winix/winixd/core/system.h insert.o: ../../../winix/winixd/core/sessionidmanager.h insert.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -insert.o: ../../../pikotools/src/html/htmlfilter.h +insert.o: ../../../pikotools/src/html/htmlparser.h insert.o: ../../../winix/winixd/core/winixrequest.h insert.o: ../../../winix/winixd/core/winixsystem.h insert.o: ../../../winix/winixd/core/slog.h @@ -1418,6 +1429,7 @@ ipban.o: ../../../pikotools/src/log/filelog.h ipban.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h ipban.o: ../../../pikotools/src/space/spaceparser.h ipban.o: ../../../pikotools/src/space/space.h +ipban.o: ../../../pikotools/src/convert/baseparser.h ipban.o: ../../../winix/winixd/core/winixbase.h ipban.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h ipban.o: ../../../winix/winixd/core/logmanipulators.h @@ -1511,7 +1523,7 @@ ipban.o: ../../../winix/winixd/core/ipbancontainer.h ipban.o: ../../../winix/winixd/core/system.h ipban.o: ../../../winix/winixd/core/sessionidmanager.h ipban.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -ipban.o: ../../../pikotools/src/html/htmlfilter.h +ipban.o: ../../../pikotools/src/html/htmlparser.h ipban.o: ../../../winix/winixd/core/winixrequest.h ipban.o: ../../../winix/winixd/core/winixsystem.h ipban.o: ../../../winix/winixd/core/slog.h @@ -1590,6 +1602,7 @@ last.o: ../../../pikotools/src/log/filelog.h ../../../ezc/src/patternparser.h last.o: misc.h localefilter.h locale.h last.o: ../../../pikotools/src/space/spaceparser.h last.o: ../../../pikotools/src/space/space.h +last.o: ../../../pikotools/src/convert/baseparser.h last.o: ../../../winix/winixd/core/winixbase.h last.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h last.o: ../../../winix/winixd/core/logmanipulators.h ../../../morm/src/morm.h @@ -1680,7 +1693,7 @@ last.o: ../../../winix/winixd/core/ipbancontainer.h last.o: ../../../winix/winixd/core/system.h last.o: ../../../winix/winixd/core/sessionidmanager.h last.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -last.o: ../../../pikotools/src/html/htmlfilter.h +last.o: ../../../pikotools/src/html/htmlparser.h last.o: ../../../winix/winixd/core/winixrequest.h last.o: ../../../winix/winixd/core/winixsystem.h last.o: ../../../winix/winixd/core/slog.h ../core/lastcontainer.h @@ -1692,6 +1705,7 @@ last.o: ../../../pikotools/src/convert/patternreplacer.h last.o: ../../../pikotools/src/convert/double.h locale.o: locale.h ../../../pikotools/src/space/spaceparser.h locale.o: ../../../pikotools/src/space/space.h +locale.o: ../../../pikotools/src/convert/baseparser.h locale.o: ../../../pikotools/src/textstream/textstream.h locale.o: ../../../pikotools/src/textstream/stream.h locale.o: ../../../pikotools/src/space/space.h @@ -1753,6 +1767,7 @@ locale.o: ../../../pikotools/src/convert/double.h localefilter.o: localefilter.h locale.h localefilter.o: ../../../pikotools/src/space/spaceparser.h localefilter.o: ../../../pikotools/src/space/space.h +localefilter.o: ../../../pikotools/src/convert/baseparser.h localefilter.o: ../../../pikotools/src/textstream/textstream.h localefilter.o: ../../../pikotools/src/textstream/stream.h localefilter.o: ../../../pikotools/src/space/space.h @@ -1837,6 +1852,7 @@ login.o: ../../../pikotools/src/log/filelog.h login.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h login.o: ../../../pikotools/src/space/spaceparser.h login.o: ../../../pikotools/src/space/space.h +login.o: ../../../pikotools/src/convert/baseparser.h login.o: ../../../winix/winixd/core/winixbase.h login.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h login.o: ../../../winix/winixd/core/logmanipulators.h @@ -1930,7 +1946,7 @@ login.o: ../../../winix/winixd/core/ipbancontainer.h login.o: ../../../winix/winixd/core/system.h login.o: ../../../winix/winixd/core/sessionidmanager.h login.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -login.o: ../../../pikotools/src/html/htmlfilter.h +login.o: ../../../pikotools/src/html/htmlparser.h login.o: ../../../winix/winixd/core/winixrequest.h login.o: ../../../winix/winixd/core/winixsystem.h login.o: ../../../winix/winixd/core/slog.h @@ -2003,6 +2019,7 @@ ls.o: ../../../pikotools/src/log/filelog.h ../../../ezc/src/patternparser.h ls.o: misc.h localefilter.h locale.h ls.o: ../../../pikotools/src/space/spaceparser.h ls.o: ../../../pikotools/src/space/space.h +ls.o: ../../../pikotools/src/convert/baseparser.h ls.o: ../../../winix/winixd/core/winixbase.h ls.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h ls.o: ../../../winix/winixd/core/logmanipulators.h ../../../morm/src/morm.h @@ -2087,7 +2104,7 @@ ls.o: ../../../winix/winixd/core/ipbancontainer.h ls.o: ../../../winix/winixd/core/system.h ls.o: ../../../winix/winixd/core/sessionidmanager.h ls.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -ls.o: ../../../pikotools/src/html/htmlfilter.h +ls.o: ../../../pikotools/src/html/htmlparser.h ls.o: ../../../winix/winixd/core/winixrequest.h ls.o: ../../../winix/winixd/core/winixsystem.h ls.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/request.h @@ -2113,6 +2130,7 @@ man.o: ../../../pikotools/src/log/filelog.h ../../../ezc/src/patternparser.h man.o: misc.h localefilter.h locale.h man.o: ../../../pikotools/src/space/spaceparser.h man.o: ../../../pikotools/src/space/space.h +man.o: ../../../pikotools/src/convert/baseparser.h man.o: ../../../winix/winixd/core/winixbase.h man.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h man.o: ../../../winix/winixd/core/logmanipulators.h ../../../morm/src/morm.h @@ -2200,7 +2218,7 @@ man.o: ../../../winix/winixd/core/ipbancontainer.h man.o: ../../../winix/winixd/core/system.h man.o: ../../../winix/winixd/core/sessionidmanager.h man.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -man.o: ../../../pikotools/src/html/htmlfilter.h +man.o: ../../../pikotools/src/html/htmlparser.h man.o: ../../../winix/winixd/core/winixrequest.h man.o: ../../../winix/winixd/core/winixsystem.h man.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/request.h @@ -2278,6 +2296,7 @@ misc.o: ../../../pikotools/src/log/filelog.h ../../../ezc/src/patternparser.h misc.o: misc.h localefilter.h locale.h misc.o: ../../../pikotools/src/space/spaceparser.h misc.o: ../../../pikotools/src/space/space.h +misc.o: ../../../pikotools/src/convert/baseparser.h misc.o: ../../../winix/winixd/core/winixbase.h misc.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h misc.o: ../../../winix/winixd/core/logmanipulators.h ../../../morm/src/morm.h @@ -2368,7 +2387,7 @@ misc.o: ../../../winix/winixd/core/ipbancontainer.h misc.o: ../../../winix/winixd/core/system.h misc.o: ../../../winix/winixd/core/sessionidmanager.h misc.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -misc.o: ../../../pikotools/src/html/htmlfilter.h +misc.o: ../../../pikotools/src/html/htmlparser.h misc.o: ../../../winix/winixd/core/winixrequest.h misc.o: ../../../winix/winixd/core/winixsystem.h misc.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/misc.h @@ -2401,6 +2420,7 @@ mount.o: ../../../pikotools/src/log/filelog.h mount.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h mount.o: ../../../pikotools/src/space/spaceparser.h mount.o: ../../../pikotools/src/space/space.h +mount.o: ../../../pikotools/src/convert/baseparser.h mount.o: ../../../winix/winixd/core/winixbase.h mount.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h mount.o: ../../../winix/winixd/core/logmanipulators.h @@ -2494,7 +2514,7 @@ mount.o: ../../../winix/winixd/core/ipbancontainer.h mount.o: ../../../winix/winixd/core/system.h mount.o: ../../../winix/winixd/core/sessionidmanager.h mount.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -mount.o: ../../../pikotools/src/html/htmlfilter.h +mount.o: ../../../pikotools/src/html/htmlparser.h mount.o: ../../../winix/winixd/core/winixrequest.h mount.o: ../../../winix/winixd/core/winixsystem.h mount.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/misc.h @@ -2528,6 +2548,7 @@ passwd.o: ../../../pikotools/src/log/filelog.h passwd.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h passwd.o: ../../../pikotools/src/space/spaceparser.h passwd.o: ../../../pikotools/src/space/space.h +passwd.o: ../../../pikotools/src/convert/baseparser.h passwd.o: ../../../winix/winixd/core/winixbase.h passwd.o: ../../../winix/winixd/core/config.h passwd.o: ../../../winix/winixd/core/log.h @@ -2624,13 +2645,14 @@ passwd.o: ../../../winix/winixd/core/ipbancontainer.h passwd.o: ../../../winix/winixd/core/system.h passwd.o: ../../../winix/winixd/core/sessionidmanager.h passwd.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -passwd.o: ../../../pikotools/src/html/htmlfilter.h +passwd.o: ../../../pikotools/src/html/htmlparser.h passwd.o: ../../../winix/winixd/core/winixrequest.h passwd.o: ../../../winix/winixd/core/winixsystem.h passwd.o: ../../../winix/winixd/core/slog.h patterncacher.o: patterncacher.h misc.h localefilter.h locale.h patterncacher.o: ../../../pikotools/src/space/spaceparser.h patterncacher.o: ../../../pikotools/src/space/space.h +patterncacher.o: ../../../pikotools/src/convert/baseparser.h patterncacher.o: ../../../pikotools/src/textstream/textstream.h patterncacher.o: ../../../pikotools/src/textstream/stream.h patterncacher.o: ../../../pikotools/src/space/space.h @@ -2694,6 +2716,7 @@ patterncacher.o: ../../../winix/winixd/templates/htmltextstream.h patterncacher.o: ../../../winix/winixd/templates/misc.h patterns.o: patterns.h locale.h ../../../pikotools/src/space/spaceparser.h patterns.o: ../../../pikotools/src/space/space.h +patterns.o: ../../../pikotools/src/convert/baseparser.h patterns.o: ../../../pikotools/src/textstream/textstream.h patterns.o: ../../../pikotools/src/textstream/stream.h patterns.o: ../../../pikotools/src/space/space.h @@ -2768,6 +2791,7 @@ priv.o: ../../../pikotools/src/log/filelog.h ../../../ezc/src/patternparser.h priv.o: misc.h localefilter.h locale.h priv.o: ../../../pikotools/src/space/spaceparser.h priv.o: ../../../pikotools/src/space/space.h +priv.o: ../../../pikotools/src/convert/baseparser.h priv.o: ../../../winix/winixd/core/winixbase.h priv.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h priv.o: ../../../winix/winixd/core/logmanipulators.h ../../../morm/src/morm.h @@ -2858,7 +2882,7 @@ priv.o: ../../../winix/winixd/core/ipbancontainer.h priv.o: ../../../winix/winixd/core/system.h priv.o: ../../../winix/winixd/core/sessionidmanager.h priv.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -priv.o: ../../../pikotools/src/html/htmlfilter.h +priv.o: ../../../pikotools/src/html/htmlparser.h priv.o: ../../../winix/winixd/core/winixrequest.h priv.o: ../../../winix/winixd/core/winixsystem.h priv.o: ../../../winix/winixd/core/slog.h @@ -2939,6 +2963,7 @@ rebus.o: ../../../pikotools/src/log/filelog.h rebus.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h rebus.o: ../../../pikotools/src/space/spaceparser.h rebus.o: ../../../pikotools/src/space/space.h +rebus.o: ../../../pikotools/src/convert/baseparser.h rebus.o: ../../../winix/winixd/core/winixbase.h rebus.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h rebus.o: ../../../winix/winixd/core/logmanipulators.h @@ -3032,7 +3057,7 @@ rebus.o: ../../../winix/winixd/core/ipbancontainer.h rebus.o: ../../../winix/winixd/core/system.h rebus.o: ../../../winix/winixd/core/sessionidmanager.h rebus.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -rebus.o: ../../../pikotools/src/html/htmlfilter.h +rebus.o: ../../../pikotools/src/html/htmlparser.h rebus.o: ../../../winix/winixd/core/winixrequest.h rebus.o: ../../../winix/winixd/core/winixsystem.h rebus.o: ../../../winix/winixd/core/slog.h @@ -3059,6 +3084,7 @@ server.o: ../../../pikotools/src/log/filelog.h server.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h server.o: ../../../pikotools/src/space/spaceparser.h server.o: ../../../pikotools/src/space/space.h +server.o: ../../../pikotools/src/convert/baseparser.h server.o: ../../../winix/winixd/core/winixbase.h server.o: ../../../winix/winixd/core/config.h server.o: ../../../winix/winixd/core/log.h @@ -3155,7 +3181,7 @@ server.o: ../../../winix/winixd/core/ipbancontainer.h server.o: ../../../winix/winixd/core/system.h server.o: ../../../winix/winixd/core/sessionidmanager.h server.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -server.o: ../../../pikotools/src/html/htmlfilter.h +server.o: ../../../pikotools/src/html/htmlparser.h server.o: ../../../winix/winixd/core/winixrequest.h server.o: ../../../winix/winixd/core/winixsystem.h server.o: ../../../winix/winixd/core/slog.h @@ -3232,6 +3258,7 @@ slog.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/models.h slog.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h slog.o: ../../../pikotools/src/space/spaceparser.h slog.o: ../../../pikotools/src/space/space.h +slog.o: ../../../pikotools/src/convert/baseparser.h slog.o: ../../../winix/winixd/core/winixbase.h slog.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h slog.o: ../../../morm/src/morm.h ../../../morm/src/morm_types.h @@ -3320,7 +3347,7 @@ slog.o: ../../../winix/winixd/core/ipbancontainer.h slog.o: ../../../winix/winixd/core/system.h slog.o: ../../../winix/winixd/core/sessionidmanager.h slog.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -slog.o: ../../../pikotools/src/html/htmlfilter.h +slog.o: ../../../pikotools/src/html/htmlparser.h slog.o: ../../../winix/winixd/core/winixrequest.h slog.o: ../../../winix/winixd/core/winixsystem.h stat.o: templates.h ../../../ezc/src/ezc.h ../../../ezc/src/generator.h @@ -3345,6 +3372,7 @@ stat.o: ../../../pikotools/src/log/filelog.h ../../../ezc/src/patternparser.h stat.o: misc.h localefilter.h locale.h stat.o: ../../../pikotools/src/space/spaceparser.h stat.o: ../../../pikotools/src/space/space.h +stat.o: ../../../pikotools/src/convert/baseparser.h stat.o: ../../../winix/winixd/core/winixbase.h stat.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h stat.o: ../../../winix/winixd/core/logmanipulators.h ../../../morm/src/morm.h @@ -3435,7 +3463,7 @@ stat.o: ../../../winix/winixd/core/ipbancontainer.h stat.o: ../../../winix/winixd/core/system.h stat.o: ../../../winix/winixd/core/sessionidmanager.h stat.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -stat.o: ../../../pikotools/src/html/htmlfilter.h +stat.o: ../../../pikotools/src/html/htmlparser.h stat.o: ../../../winix/winixd/core/winixrequest.h stat.o: ../../../winix/winixd/core/winixsystem.h stat.o: ../../../winix/winixd/core/slog.h @@ -3468,6 +3496,7 @@ sys.o: ../../../pikotools/src/log/filelog.h ../../../ezc/src/patternparser.h sys.o: misc.h localefilter.h locale.h sys.o: ../../../pikotools/src/space/spaceparser.h sys.o: ../../../pikotools/src/space/space.h +sys.o: ../../../pikotools/src/convert/baseparser.h sys.o: ../../../winix/winixd/core/winixbase.h sys.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h sys.o: ../../../winix/winixd/core/logmanipulators.h ../../../morm/src/morm.h @@ -3555,7 +3584,7 @@ sys.o: ../../../winix/winixd/core/ipbancontainer.h sys.o: ../../../winix/winixd/core/system.h sys.o: ../../../winix/winixd/core/sessionidmanager.h sys.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -sys.o: ../../../pikotools/src/html/htmlfilter.h +sys.o: ../../../pikotools/src/html/htmlparser.h sys.o: ../../../winix/winixd/core/winixrequest.h sys.o: ../../../winix/winixd/core/winixsystem.h sys.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/request.h @@ -3583,6 +3612,7 @@ template.o: ../../../pikotools/src/log/filelog.h template.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h template.o: ../../../pikotools/src/space/spaceparser.h template.o: ../../../pikotools/src/space/space.h +template.o: ../../../pikotools/src/convert/baseparser.h template.o: ../../../winix/winixd/core/winixbase.h template.o: ../../../winix/winixd/core/config.h template.o: ../../../winix/winixd/core/log.h @@ -3681,7 +3711,7 @@ template.o: ../../../winix/winixd/core/ipbancontainer.h template.o: ../../../winix/winixd/core/system.h template.o: ../../../winix/winixd/core/sessionidmanager.h template.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -template.o: ../../../pikotools/src/html/htmlfilter.h +template.o: ../../../pikotools/src/html/htmlparser.h template.o: ../../../winix/winixd/core/winixrequest.h template.o: ../../../winix/winixd/core/winixsystem.h template.o: ../../../winix/winixd/core/slog.h @@ -3714,6 +3744,7 @@ templates.o: ../../../pikotools/src/log/filelog.h templates.o: ../../../ezc/src/patternparser.h misc.h localefilter.h 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 @@ -3812,7 +3843,7 @@ 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/htmlfilter.h +templates.o: ../../../pikotools/src/html/htmlparser.h templates.o: ../../../winix/winixd/core/winixrequest.h templates.o: ../../../winix/winixd/core/winixsystem.h templates.o: ../../../winix/winixd/core/slog.h @@ -3907,6 +3938,7 @@ upload.o: ../../../pikotools/src/log/filelog.h upload.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h upload.o: ../../../pikotools/src/space/spaceparser.h upload.o: ../../../pikotools/src/space/space.h +upload.o: ../../../pikotools/src/convert/baseparser.h upload.o: ../../../winix/winixd/core/winixbase.h upload.o: ../../../winix/winixd/core/config.h upload.o: ../../../winix/winixd/core/log.h @@ -4003,7 +4035,7 @@ upload.o: ../../../winix/winixd/core/ipbancontainer.h upload.o: ../../../winix/winixd/core/system.h upload.o: ../../../winix/winixd/core/sessionidmanager.h upload.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -upload.o: ../../../pikotools/src/html/htmlfilter.h +upload.o: ../../../pikotools/src/html/htmlparser.h upload.o: ../../../winix/winixd/core/winixrequest.h upload.o: ../../../winix/winixd/core/winixsystem.h upload.o: ../../../winix/winixd/core/slog.h @@ -4030,6 +4062,7 @@ uptime.o: ../../../pikotools/src/log/filelog.h uptime.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h uptime.o: ../../../pikotools/src/space/spaceparser.h uptime.o: ../../../pikotools/src/space/space.h +uptime.o: ../../../pikotools/src/convert/baseparser.h uptime.o: ../../../winix/winixd/core/winixbase.h uptime.o: ../../../winix/winixd/core/config.h uptime.o: ../../../winix/winixd/core/log.h @@ -4126,7 +4159,7 @@ uptime.o: ../../../winix/winixd/core/ipbancontainer.h uptime.o: ../../../winix/winixd/core/system.h uptime.o: ../../../winix/winixd/core/sessionidmanager.h uptime.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -uptime.o: ../../../pikotools/src/html/htmlfilter.h +uptime.o: ../../../pikotools/src/html/htmlparser.h uptime.o: ../../../winix/winixd/core/winixrequest.h uptime.o: ../../../winix/winixd/core/winixsystem.h uptime.o: ../../../winix/winixd/core/slog.h @@ -4152,6 +4185,7 @@ user.o: ../../../pikotools/src/log/filelog.h ../../../ezc/src/patternparser.h user.o: misc.h localefilter.h locale.h user.o: ../../../pikotools/src/space/spaceparser.h user.o: ../../../pikotools/src/space/space.h +user.o: ../../../pikotools/src/convert/baseparser.h user.o: ../../../winix/winixd/core/winixbase.h user.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h user.o: ../../../winix/winixd/core/logmanipulators.h ../../../morm/src/morm.h @@ -4242,7 +4276,7 @@ user.o: ../../../winix/winixd/core/ipbancontainer.h user.o: ../../../winix/winixd/core/system.h user.o: ../../../winix/winixd/core/sessionidmanager.h user.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -user.o: ../../../pikotools/src/html/htmlfilter.h +user.o: ../../../pikotools/src/html/htmlparser.h user.o: ../../../winix/winixd/core/winixrequest.h user.o: ../../../winix/winixd/core/winixsystem.h user.o: ../../../winix/winixd/core/slog.h @@ -4275,6 +4309,7 @@ who.o: ../../../pikotools/src/log/filelog.h ../../../ezc/src/patternparser.h who.o: misc.h localefilter.h locale.h who.o: ../../../pikotools/src/space/spaceparser.h who.o: ../../../pikotools/src/space/space.h +who.o: ../../../pikotools/src/convert/baseparser.h who.o: ../../../winix/winixd/core/winixbase.h who.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h who.o: ../../../winix/winixd/core/logmanipulators.h ../../../morm/src/morm.h @@ -4362,7 +4397,7 @@ who.o: ../../../winix/winixd/core/ipbancontainer.h who.o: ../../../winix/winixd/core/system.h who.o: ../../../winix/winixd/core/sessionidmanager.h who.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -who.o: ../../../pikotools/src/html/htmlfilter.h +who.o: ../../../pikotools/src/html/htmlparser.h who.o: ../../../winix/winixd/core/winixrequest.h who.o: ../../../winix/winixd/core/winixsystem.h who.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/request.h @@ -4395,6 +4430,7 @@ winix.o: ../../../pikotools/src/log/filelog.h winix.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h winix.o: ../../../pikotools/src/space/spaceparser.h winix.o: ../../../pikotools/src/space/space.h +winix.o: ../../../pikotools/src/convert/baseparser.h winix.o: ../../../winix/winixd/core/winixbase.h winix.o: ../../../winix/winixd/core/config.h ../../../winix/winixd/core/log.h winix.o: ../../../winix/winixd/core/logmanipulators.h @@ -4488,7 +4524,7 @@ winix.o: ../../../winix/winixd/core/ipbancontainer.h winix.o: ../../../winix/winixd/core/system.h winix.o: ../../../winix/winixd/core/sessionidmanager.h winix.o: ../../../tito/src/base64.h ../../../tito/src/aes.h -winix.o: ../../../pikotools/src/html/htmlfilter.h +winix.o: ../../../pikotools/src/html/htmlparser.h winix.o: ../../../winix/winixd/core/winixrequest.h winix.o: ../../../winix/winixd/core/winixsystem.h winix.o: ../../../winix/winixd/core/slog.h diff --git a/winixd/templates/templates.cpp b/winixd/templates/templates.cpp index 3652777..3aef0d7 100644 --- a/winixd/templates/templates.cpp +++ b/winixd/templates/templates.cpp @@ -64,7 +64,7 @@ Ezc::Blocks ezc_blocks; Ezc::Objects ezc_objects; Ezc::Vars ezc_vars; LocaleFilter locale_filter; -pt::HTMLFilter html_filter; +pt::HTMLParser html_filter; @@ -766,6 +766,7 @@ using namespace TemplatesFunctions; //html_filter.TrimWhite(config->html_filter_trim_white); //html_filter.BreakWord(config->html_filter_break_word); + html_filter.white_chars_mode(config->html_filter_white_char_mode); html_filter.WrapLine(config->html_filter_wrap_line); html_filter.InsertTabs(config->html_filter_tabs); html_filter.SetNoFilterTag(config->html_filter_nofilter_tag); diff --git a/winixd/templates/templates.h b/winixd/templates/templates.h index 2315f4e..eb45cb4 100644 --- a/winixd/templates/templates.h +++ b/winixd/templates/templates.h @@ -50,7 +50,7 @@ #include "core/cur.h" #include "core/system.h" #include "core/sessionmanager.h" -#include "html/htmlfilter.h" +#include "html/htmlparser.h" #include "db/db.h" #include "core/winixrequest.h" @@ -79,7 +79,7 @@ namespace TemplatesFunctions extern Locale locale; extern EzcFun ezc_functions; extern LocaleFilter locale_filter; - extern pt::HTMLFilter html_filter; + extern pt::HTMLParser html_filter; extern Ezc::Stack empty_stack; extern Db * db;