From 919c2f62f5f4b55bc70a374ca8918abb5380c706 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Thu, 1 Nov 2018 00:46:44 +0000 Subject: [PATCH] using PT::IsSubString* methods from pikotools git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1138 e52654a7-88a9-db11-a3e9-0013d4bc506e --- winixd/Makefile.dep | 2 +- winixd/core/Makefile.dep | 30 +++-- winixd/core/app.cpp | 8 +- winixd/core/misc.h | 3 +- winixd/core/postmultiparser.cpp | 5 +- winixd/core/postparser.h | 5 +- winixd/functions/Makefile.dep | 103 +++++++++----- winixd/functions/sort.cpp | 4 +- winixd/functions/sort.h | 2 +- winixd/main/Makefile.dep | 4 +- winixd/notify/Makefile.dep | 7 +- winixd/plugins/export/Makefile.dep | 6 + winixd/plugins/export/exportinfo.cpp | 6 +- winixd/plugins/export/exportthread.cpp | 10 +- winixd/plugins/gallery/Makefile.dep | 3 + winixd/plugins/group/Makefile.dep | 3 + winixd/plugins/mailregister/Makefile.dep | 4 + winixd/plugins/menu/Makefile.dep | 7 +- winixd/plugins/stats/Makefile.dep | 2 + winixd/plugins/thread/Makefile.dep | 7 + winixd/plugins/ticket/Makefile.dep | 8 ++ winixd/plugins/ticket/ticketinfo.cpp | 8 +- winixd/templates/Makefile.dep | 162 +++++++++++++---------- winixd/templates/dir.cpp | 4 +- winixd/templates/doc.cpp | 6 +- winixd/templates/mount.cpp | 6 +- 26 files changed, 272 insertions(+), 143 deletions(-) diff --git a/winixd/Makefile.dep b/winixd/Makefile.dep index 06226b2..9c13de4 100644 --- a/winixd/Makefile.dep +++ b/winixd/Makefile.dep @@ -1 +1 @@ -winix.src.files = ./core/synchro.h ./core/sessioncontainer.h ./core/cookieparser.h ./core/misc.cpp ./core/item.cpp ./core/error.h ./core/timezone.h ./core/compress.h ./core/crypt.cpp ./core/dirs.cpp ./core/slog.cpp ./core/config.cpp ./core/lastcontainer.cpp ./core/users.h ./core/httpsimpleparser.cpp ./core/threadmanager.h ./core/postparser.h ./core/pluginmsg.h ./core/acceptbaseparser.h ./core/loadavg.cpp ./core/job.h ./core/mountparser.cpp ./core/timezones.h ./core/sessionmanager.h ./core/groups.h ./core/system.cpp ./core/rebus.h ./core/synchro.cpp ./core/lock.cpp ./core/acceptencodingparser.h ./core/version.h ./core/compress.cpp ./core/ipbancontainer.cpp ./core/request.h ./core/plugindata.h ./core/plugin.cpp ./core/sessionparser.cpp ./core/bbcodeparser.h ./core/users.cpp ./core/mount.cpp ./core/item.h ./core/slog.h ./core/threadmanager.cpp ./core/acceptbaseparser.cpp ./core/lastcontainer.h ./core/httpsimpleparser.h ./core/timezones.cpp ./core/groups.cpp ./core/requesttypes.h ./core/system.h ./core/bbcodeparser.cpp ./core/lock.h ./core/ipbancontainer.h ./core/group.h ./core/plugin.h ./core/run.cpp ./core/textstream.h ./core/sessionparser.h ./core/basethread.h ./core/mount.h ./core/htmlfilter.cpp ./core/user.cpp ./core/app.cpp ./core/image.cpp ./core/ugcontainer.h ./core/postmultiparser.h ./core/logmanipulators.h ./core/sessioncontainer.cpp ./core/dircontainer.h ./core/log.h ./core/session.h ./core/timezone.cpp ./core/mounts.h ./core/ipban.h ./core/cur.h ./core/misc.h ./core/dirs.h ./core/crypt.h ./core/run.h ./core/config.h ./core/job.cpp ./core/postmultiparser.cpp ./core/sessionmanager.cpp ./core/htmlfilter.h ./core/rebus.cpp ./core/dircontainer.cpp ./core/log.cpp ./core/user.h ./core/loadavg.h ./core/session.cpp ./core/mountparser.h ./core/mounts.cpp ./core/image.h ./core/plugindata.cpp ./core/request.cpp ./core/app.h ./core/basethread.cpp ./core/sessionidmanager.h ./core/winix_const.h ./core/sessionidmanager.cpp ./db/dbconn.cpp ./db/db.cpp ./db/dbbase.h ./db/dbitemcolumns.cpp ./db/dbtextstream.cpp ./db/dbconn.h ./db/db.h ./db/dbitemcolumns.h ./db/dbitemquery.cpp ./db/dbtextstream.h ./db/dbitemquery.h ./db/dbbase.cpp ./functions/upload.cpp ./functions/priv.h ./functions/env.cpp ./functions/default.h ./functions/node.h ./functions/specialdefault.h ./functions/timezone.cpp ./functions/pw.h ./functions/adduser.h ./functions/chmod.h ./functions/imgcrop.cpp ./functions/vim.h ./functions/account.h ./functions/mount.cpp ./functions/uptime.cpp ./functions/ckeditor.cpp ./functions/mkdir.cpp ./functions/reload.cpp ./functions/functionparser.h ./functions/logout.cpp ./functions/rmuser.cpp ./functions/rm.cpp ./functions/chown.h ./functions/nicedit.h ./functions/mv.h ./functions/node.cpp ./functions/specialdefault.cpp ./functions/adduser.cpp ./functions/upload.h ./functions/vim.cpp ./functions/env.h ./functions/timezone.h ./functions/who.h ./functions/cp.cpp ./functions/run.cpp ./functions/locale.h ./functions/imgcrop.h ./functions/passwd.h ./functions/mount.h ./functions/privchanger.cpp ./functions/functions.cpp ./functions/last.h ./functions/ckeditor.h ./functions/mkdir.h ./functions/reload.h ./functions/cat.h ./functions/download.h ./functions/ln.h ./functions/nicedit.cpp ./functions/functionbase.cpp ./functions/man.h ./functions/rm.h ./functions/meta.cpp ./functions/emacs.cpp ./functions/sort.h ./functions/who.cpp ./functions/ipban.h ./functions/locale.cpp ./functions/passwd.cpp ./functions/last.cpp ./functions/subject.h ./functions/download.cpp ./functions/cp.h ./functions/cat.cpp ./functions/login.cpp ./functions/tinymce.cpp ./functions/ln.cpp ./functions/run.h ./functions/uname.h ./functions/man.cpp ./functions/functions.h ./functions/privchanger.h ./functions/ls.cpp ./functions/template.h ./functions/stat.h ./functions/priv.cpp ./functions/default.cpp ./functions/functionbase.h ./functions/pw.cpp ./functions/sort.cpp ./functions/ipban.cpp ./functions/chmod.cpp ./functions/meta.h ./functions/account.cpp ./functions/emacs.h ./functions/subject.cpp ./functions/functionparser.cpp ./functions/uname.cpp ./functions/uptime.h ./functions/template.cpp ./functions/stat.cpp ./functions/tinymce.h ./functions/login.h ./functions/chown.cpp ./functions/logout.h ./functions/mv.cpp ./functions/rmuser.h ./functions/ls.h ./main/main.cpp ./notify/notifypool.h ./notify/templatesnotify.cpp ./notify/notify.cpp ./notify/templatesnotify.h ./notify/notify.h ./notify/notifythread.cpp ./notify/notifypool.cpp ./notify/notifythread.h ./plugins/group/init.cpp ./plugins/group/groups.h ./plugins/group/groupinfo.cpp ./plugins/group/groupinfo.h ./plugins/group/templates.cpp ./plugins/group/groups.cpp ./plugins/stats/statssession.h ./plugins/stats/bot.h ./plugins/stats/stats.cpp ./plugins/stats/templates.cpp ./plugins/stats/init.cpp ./plugins/stats/stats.h ./plugins/stats/templates.h ./plugins/stats/bot.cpp ./plugins/gallery/galleryinfo.cpp ./plugins/gallery/templates.cpp ./plugins/gallery/gallery.cpp ./plugins/gallery/galleryinfo.h ./plugins/gallery/init.cpp ./plugins/gallery/gallery.h ./plugins/export/init.cpp ./plugins/export/export.h ./plugins/export/exportthread.cpp ./plugins/export/message.h ./plugins/export/edb.cpp ./plugins/export/funexport.cpp ./plugins/export/exportinfo.cpp ./plugins/export/exportthread.h ./plugins/export/edb.h ./plugins/export/funexport.h ./plugins/export/exportinfo.h ./plugins/ticket/funticket.h ./plugins/ticket/init.cpp ./plugins/ticket/ticketinfo.h ./plugins/ticket/showtickets.cpp ./plugins/ticket/createticket.cpp ./plugins/ticket/tdb.cpp ./plugins/ticket/pluginmsg.h ./plugins/ticket/createticket.h ./plugins/ticket/showtickets.h ./plugins/ticket/sessiondata.cpp ./plugins/ticket/tdb.h ./plugins/ticket/sessiondata.h ./plugins/ticket/ticket.h ./plugins/ticket/editticket.cpp ./plugins/ticket/funticket.cpp ./plugins/ticket/templates.cpp ./plugins/ticket/editticket.h ./plugins/ticket/ticketinfo.cpp ./plugins/menu/cache.cpp ./plugins/menu/init.cpp ./plugins/menu/cache.h ./plugins/menu/templates.cpp ./plugins/thread/funthread.cpp ./plugins/thread/threadinfo.cpp ./plugins/thread/funthread.h ./plugins/thread/threadinfo.h ./plugins/thread/createthread.cpp ./plugins/thread/reply.cpp ./plugins/thread/showthreads.cpp ./plugins/thread/templates.cpp ./plugins/thread/createthread.h ./plugins/thread/reply.h ./plugins/thread/showthreads.h ./plugins/thread/init.cpp ./plugins/thread/templates.h ./plugins/thread/tdb.cpp ./plugins/thread/pluginmsg.h ./plugins/thread/thread.h ./plugins/thread/tdb.h ./plugins/mailregister/funregistermail.h ./plugins/mailregister/mdb.h ./plugins/mailregister/funregistermail.cpp ./plugins/mailregister/mdb.cpp ./plugins/mailregister/init.cpp ./plugins/mailregister/templates.cpp ./plugins/mailregister/registermail_info.h ./plugins/mailregister/funregistermail_showusers.h ./plugins/mailregister/funregistermail_showusers.cpp ./plugins/mailregister/registermail_info.cpp ./templates/who.cpp ./templates/item.cpp ./templates/mount.cpp ./templates/templates.h ./templates/locale.h ./templates/slog.cpp ./templates/doc.cpp ./templates/localefilter.cpp ./templates/config.cpp ./templates/patterns.h ./templates/miscspace.cpp ./templates/filters.cpp ./templates/login.cpp ./templates/man.cpp ./templates/changepatterns.h ./templates/stat.cpp ./templates/template.cpp ./templates/dir.cpp ./templates/user.cpp ./templates/rebus.cpp ./templates/patterncacher.cpp ./templates/upload.cpp ./templates/textextstream.h ./templates/adduser.cpp ./templates/ipban.cpp ./templates/htmltextstream.h ./templates/indexpatterns.h ./templates/templates.cpp ./templates/winix.cpp ./templates/locale.cpp ./templates/misc.h ./templates/patterns.cpp ./templates/passwd.cpp ./templates/last.cpp ./templates/uptime.cpp ./templates/insert.cpp ./templates/changepatterns.cpp ./templates/localefilter.h ./templates/miscspace.h ./templates/ls.cpp ./templates/sys.cpp ./templates/priv.cpp ./templates/textextstream.cpp ./templates/htmltextstream.cpp ./templates/env.cpp ./templates/indexpatterns.cpp ./templates/patterncacher.h ./templates/misc.cpp ./templates/generic.cpp ./templates/currentdate.cpp ./templates/server.cpp ./templates/antispam.cpp ../../ezc/src/blocks.cpp ../../ezc/src/blocks.h ../../ezc/src/cache.cpp ../../ezc/src/cache.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 ../../tito/src/crypto.cpp ../../tito/src/misc.h ../../tito/src/base64.cpp ../../tito/src/crypto.h ../../tito/src/aes.cpp ../../tito/src/base64.h ../../tito/src/misc.cpp ../../tito/src/aes.h ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h ../../pikotools/convert/text.h ../../pikotools/convert/text.cpp ../../pikotools/convert/strtoint.h ../../pikotools/convert/misc.h ../../pikotools/convert/misc.cpp ../../pikotools/date/date.cpp ../../pikotools/date/date.h ../../pikotools/mainparser/sample/sample.cpp ../../pikotools/mainparser/mainparser.cpp ../../pikotools/mainparser/mainparser.h ../../pikotools/mainspaceparser/mainspaceparser.cpp ../../pikotools/mainspaceparser/mainspaceparser.h ../../pikotools/membuffer/membuffer.h ../../pikotools/space/jsontospaceparser.cpp ../../pikotools/space/jsontospaceparser.h ../../pikotools/space/space.cpp ../../pikotools/space/space.h ../../pikotools/space/spaceparser.cpp ../../pikotools/space/spaceparser.h ../../pikotools/space/spacetojson.cpp ../../pikotools/space/spacetojson.h ../../pikotools/textstream/textstream.h ../../pikotools/textstream/types.h ../../pikotools/utf8/utf8.cpp ../../pikotools/utf8/utf8.h ../../pikotools/logger/logger.cpp ../../pikotools/logger/logger.h ../../morm/src/finder.h ../../morm/src/model.cpp ../../morm/src/model.h ../../morm/src/modelconnector.cpp ../../morm/src/modelconnector.h ../../morm/src/morm.h ../../morm/src/morm_types.h ../../morm/src/outstream.h ../../morm/src/flatconnector.h ../../morm/src/flatconnector.cpp ../../morm/src/dbconnector.cpp ../../morm/src/jsonconnector.h ../../morm/src/jsonconnector.cpp ../../morm/src/dbconnector.h ../../morm/src/postgresqlconnector.h ../../morm/src/postgresqlconnector.cpp ../../morm/src/baseexpression.cpp ../../morm/src/baseexpression.h ../../morm/src/flatexpression.cpp ../../morm/src/postgresqlexpression.h ../../morm/src/dbexpression.h ../../morm/src/dbexpression.cpp ../../morm/src/flatexpression.h ../../morm/src/postgresqlexpression.cpp ../../morm/src/clearer.cpp ../../morm/src/jsonexpression.h ../../morm/src/jsonexpression.cpp ../../morm/src/clearer.h ../../morm/src/dochtmlconnector.cpp ../../morm/src/dochtmlconnector.h ../../morm/src/dochtmlexpression.cpp ../../morm/src/dochtmlexpression.h \ No newline at end of file +winix.src.files = ./templates/miscspace.h ./templates/generic.cpp ./templates/sys.cpp ./templates/user.cpp ./templates/currentdate.cpp ./templates/textextstream.cpp ./templates/upload.cpp ./templates/patterncacher.h ./templates/env.cpp ./templates/indexpatterns.cpp ./templates/htmltextstream.h ./templates/who.cpp ./templates/locale.cpp ./templates/misc.h ./templates/patterns.cpp ./templates/passwd.cpp ./templates/mount.cpp ./templates/templates.h ./templates/last.cpp ./templates/uptime.cpp ./templates/insert.cpp ./templates/doc.cpp ./templates/changepatterns.cpp ./templates/server.cpp ./templates/miscspace.cpp ./templates/login.cpp ./templates/filters.cpp ./templates/localefilter.h ./templates/man.cpp ./templates/ls.cpp ./templates/dir.cpp ./templates/priv.cpp ./templates/rebus.cpp ./templates/patterncacher.cpp ./templates/htmltextstream.cpp ./templates/textextstream.h ./templates/adduser.cpp ./templates/ipban.cpp ./templates/misc.cpp ./templates/indexpatterns.h ./templates/item.cpp ./templates/templates.cpp ./templates/winix.cpp ./templates/slog.cpp ./templates/locale.h ./templates/patterns.h ./templates/config.cpp ./templates/localefilter.cpp ./templates/changepatterns.h ./templates/stat.cpp ./templates/template.cpp ./templates/antispam.cpp ./plugins/mailregister/funregistermail_showusers.h ./plugins/mailregister/mdb.h ./plugins/mailregister/registermail_info.h ./plugins/mailregister/templates.cpp ./plugins/mailregister/funregistermail.cpp ./plugins/mailregister/funregistermail_showusers.cpp ./plugins/mailregister/mdb.cpp ./plugins/mailregister/registermail_info.cpp ./plugins/mailregister/init.cpp ./plugins/mailregister/funregistermail.h ./plugins/thread/tdb.cpp ./plugins/thread/pluginmsg.h ./plugins/thread/thread.h ./plugins/thread/tdb.h ./plugins/thread/funthread.cpp ./plugins/thread/threadinfo.cpp ./plugins/thread/funthread.h ./plugins/thread/threadinfo.h ./plugins/thread/createthread.cpp ./plugins/thread/reply.cpp ./plugins/thread/showthreads.cpp ./plugins/thread/templates.cpp ./plugins/thread/createthread.h ./plugins/thread/reply.h ./plugins/thread/showthreads.h ./plugins/thread/init.cpp ./plugins/thread/templates.h ./plugins/group/groupinfo.h ./plugins/group/templates.cpp ./plugins/group/groups.cpp ./plugins/group/init.cpp ./plugins/group/groups.h ./plugins/group/groupinfo.cpp ./plugins/stats/bot.cpp ./plugins/stats/statssession.h ./plugins/stats/bot.h ./plugins/stats/stats.cpp ./plugins/stats/templates.cpp ./plugins/stats/init.cpp ./plugins/stats/stats.h ./plugins/stats/templates.h ./plugins/gallery/gallery.h ./plugins/gallery/galleryinfo.cpp ./plugins/gallery/templates.cpp ./plugins/gallery/gallery.cpp ./plugins/gallery/galleryinfo.h ./plugins/gallery/init.cpp ./plugins/export/init.cpp ./plugins/export/export.h ./plugins/export/exportthread.cpp ./plugins/export/message.h ./plugins/export/edb.cpp ./plugins/export/funexport.cpp ./plugins/export/exportinfo.cpp ./plugins/export/exportthread.h ./plugins/export/edb.h ./plugins/export/funexport.h ./plugins/export/exportinfo.h ./plugins/ticket/sessiondata.h ./plugins/ticket/ticket.h ./plugins/ticket/editticket.cpp ./plugins/ticket/funticket.cpp ./plugins/ticket/templates.cpp ./plugins/ticket/editticket.h ./plugins/ticket/ticketinfo.cpp ./plugins/ticket/funticket.h ./plugins/ticket/init.cpp ./plugins/ticket/ticketinfo.h ./plugins/ticket/createticket.cpp ./plugins/ticket/showtickets.cpp ./plugins/ticket/tdb.cpp ./plugins/ticket/pluginmsg.h ./plugins/ticket/showtickets.h ./plugins/ticket/createticket.h ./plugins/ticket/sessiondata.cpp ./plugins/ticket/tdb.h ./plugins/menu/cache.cpp ./plugins/menu/init.cpp ./plugins/menu/cache.h ./plugins/menu/templates.cpp ./main/main.cpp ./db/dbbase.cpp ./db/dbconn.cpp ./db/db.cpp ./db/dbbase.h ./db/dbitemcolumns.cpp ./db/dbtextstream.cpp ./db/dbconn.h ./db/db.h ./db/dbitemcolumns.h ./db/dbitemquery.cpp ./db/dbtextstream.h ./db/dbitemquery.h ./core/loadavg.h ./core/session.cpp ./core/user.h ./core/mountparser.h ./core/mounts.cpp ./core/app.h ./core/image.h ./core/plugindata.cpp ./core/request.cpp ./core/synchro.h ./core/sessioncontainer.h ./core/cookieparser.h ./core/misc.cpp ./core/error.h ./core/item.cpp ./core/timezone.h ./core/compress.h ./core/dirs.cpp ./core/crypt.cpp ./core/slog.cpp ./core/config.cpp ./core/users.h ./core/lastcontainer.cpp ./core/httpsimpleparser.cpp ./core/postparser.h ./core/threadmanager.h ./core/pluginmsg.h ./core/acceptbaseparser.h ./core/loadavg.cpp ./core/mountparser.cpp ./core/job.h ./core/timezones.h ./core/sessionmanager.h ./core/groups.h ./core/system.cpp ./core/rebus.h ./core/synchro.cpp ./core/lock.cpp ./core/acceptencodingparser.h ./core/version.h ./core/compress.cpp ./core/ipbancontainer.cpp ./core/request.h ./core/plugindata.h ./core/plugin.cpp ./core/sessionparser.cpp ./core/sessionidmanager.h ./core/bbcodeparser.h ./core/users.cpp ./core/basethread.cpp ./core/mount.cpp ./core/item.h ./core/acceptbaseparser.cpp ./core/slog.h ./core/httpsimpleparser.h ./core/lastcontainer.h ./core/timezones.cpp ./core/groups.cpp ./core/requesttypes.h ./core/system.h ./core/sessionidmanager.cpp ./core/bbcodeparser.cpp ./core/lock.h ./core/group.h ./core/ipbancontainer.h ./core/plugin.h ./core/run.cpp ./core/textstream.h ./core/sessionparser.h ./core/mount.h ./core/basethread.h ./core/winix_const.h ./core/htmlfilter.cpp ./core/user.cpp ./core/app.cpp ./core/image.cpp ./core/postmultiparser.h ./core/ugcontainer.h ./core/logmanipulators.h ./core/log.h ./core/dircontainer.h ./core/sessioncontainer.cpp ./core/session.h ./core/mounts.h ./core/timezone.cpp ./core/ipban.h ./core/cur.h ./core/misc.h ./core/crypt.h ./core/threadmanager.cpp ./core/dirs.h ./core/run.h ./core/job.cpp ./core/config.h ./core/postmultiparser.cpp ./core/sessionmanager.cpp ./core/htmlfilter.h ./core/rebus.cpp ./core/log.cpp ./core/dircontainer.cpp ./functions/download.cpp ./functions/cp.h ./functions/functions.cpp ./functions/logout.cpp ./functions/cat.h ./functions/rmuser.cpp ./functions/login.h ./functions/rm.cpp ./functions/priv.cpp ./functions/man.h ./functions/specialdefault.cpp ./functions/sort.cpp ./functions/emacs.cpp ./functions/env.cpp ./functions/timezone.h ./functions/chmod.h ./functions/imgcrop.cpp ./functions/cp.cpp ./functions/subject.h ./functions/login.cpp ./functions/last.h ./functions/uptime.h ./functions/run.h ./functions/ckeditor.h ./functions/stat.cpp ./functions/template.cpp ./functions/download.h ./functions/privchanger.h ./functions/logout.h ./functions/rmuser.h ./functions/chown.h ./functions/ls.h ./functions/adduser.cpp ./functions/ipban.cpp ./functions/chmod.cpp ./functions/specialdefault.h ./functions/timezone.cpp ./functions/vim.cpp ./functions/pw.h ./functions/sort.h ./functions/locale.cpp ./functions/passwd.cpp ./functions/ckeditor.cpp ./functions/run.cpp ./functions/uname.cpp ./functions/functionparser.h ./functions/mount.h ./functions/privchanger.cpp ./functions/ln.cpp ./functions/mkdir.h ./functions/tinymce.h ./functions/ls.cpp ./functions/chown.cpp ./functions/nicedit.cpp ./functions/template.h ./functions/stat.h ./functions/node.cpp ./functions/functionbase.h ./functions/pw.cpp ./functions/mv.h ./functions/upload.h ./functions/default.h ./functions/meta.h ./functions/adduser.h ./functions/who.cpp ./functions/ipban.h ./functions/vim.h ./functions/account.h ./functions/functionparser.cpp ./functions/mount.cpp ./functions/locale.h ./functions/mkdir.cpp ./functions/passwd.h ./functions/cat.cpp ./functions/tinymce.cpp ./functions/uname.h ./functions/man.cpp ./functions/reload.h ./functions/functions.h ./functions/ln.h ./functions/functionbase.cpp ./functions/mv.cpp ./functions/rm.h ./functions/default.cpp ./functions/nicedit.h ./functions/upload.cpp ./functions/priv.h ./functions/meta.cpp ./functions/node.h ./functions/account.cpp ./functions/env.h ./functions/emacs.h ./functions/subject.cpp ./functions/who.h ./functions/last.cpp ./functions/uptime.cpp ./functions/imgcrop.h ./functions/reload.cpp ./notify/templatesnotify.h ./notify/notify.h ./notify/notifythread.cpp ./notify/notifypool.cpp ./notify/notifythread.h ./notify/notifypool.h ./notify/templatesnotify.cpp ./notify/notify.cpp ../../ezc/src/funinfo.h ../../ezc/src/patternparser.cpp ../../ezc/src/generator.h ../../ezc/src/functions.h ../../ezc/src/pattern.cpp ../../ezc/src/item.cpp ../../ezc/src/patternparser.h ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/ezc.h ../../ezc/src/cache.cpp ../../ezc/src/cache.h ../../ezc/src/blocks.h ../../ezc/src/blocks.cpp ../../ezc/src/expressionparser.h ../../ezc/src/objects.h ../../ezc/src/outstreams.h ../../tito/src/crypto.cpp ../../tito/src/misc.h ../../tito/src/base64.cpp ../../tito/src/crypto.h ../../tito/src/aes.cpp ../../tito/src/base64.h ../../tito/src/misc.cpp ../../tito/src/aes.h ../../pikotools/mainparser/sample/sample.cpp ../../pikotools/mainparser/mainparser.cpp ../../pikotools/mainparser/mainparser.h ../../pikotools/space/space.h ../../pikotools/space/spaceparser.cpp ../../pikotools/space/space.cpp ../../pikotools/space/spaceparser.h ../../pikotools/space/jsontospaceparser.cpp ../../pikotools/space/spacetojson.cpp ../../pikotools/space/jsontospaceparser.h ../../pikotools/space/spacetojson.h ../../pikotools/date/date.h ../../pikotools/date/date.cpp ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.cpp ../../pikotools/utf8/utf8.h ../../pikotools/textstream/textstream.h ../../pikotools/textstream/types.h ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h ../../pikotools/convert/misc.cpp ../../pikotools/convert/misc.h ../../pikotools/convert/strtoint.h ../../pikotools/convert/text.cpp ../../pikotools/convert/text.h ../../pikotools/mainspaceparser/mainspaceparser.cpp ../../pikotools/mainspaceparser/mainspaceparser.h ../../pikotools/logger/logger.cpp ../../pikotools/logger/logger.h ../../morm/src/dbconnector.cpp ../../morm/src/finder.h ../../morm/src/model.cpp ../../morm/src/model.h ../../morm/src/modelconnector.cpp ../../morm/src/modelconnector.h ../../morm/src/morm.h ../../morm/src/morm_types.h ../../morm/src/outstream.h ../../morm/src/baseexpression.cpp ../../morm/src/baseexpression.h ../../morm/src/dochtmlexpression.h ../../morm/src/dbconnector.h ../../morm/src/dbexpression.cpp ../../morm/src/dbexpression.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/postgresqlconnector.cpp ../../morm/src/postgresqlconnector.h ../../morm/src/postgresqlexpression.cpp ../../morm/src/postgresqlexpression.h ../../morm/src/dochtmlconnector.h ../../morm/src/dochtmlconnector.cpp ../../morm/src/dochtmlexpression.cpp ../../morm/src/clearer.cpp ../../morm/src/clearer.h \ No newline at end of file diff --git a/winixd/core/Makefile.dep b/winixd/core/Makefile.dep index fc86868..604923e 100644 --- a/winixd/core/Makefile.dep +++ b/winixd/core/Makefile.dep @@ -47,7 +47,8 @@ app.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h app.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h app.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h app.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h -app.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +app.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +app.o: ../../../ezc/src/patternparser.h app.o: ../../../winix/winixd/notify/notifythread.h app.o: ../../../winix/winixd/core/basethread.h app.o: ../../../winix/winixd/notify/templatesnotify.h @@ -112,8 +113,9 @@ app.o: ../../../winix/winixd/templates/patterns.h app.o: ../../../winix/winixd/templates/changepatterns.h app.o: ../../../winix/winixd/templates/htmltextstream.h app.o: ../../../winix/winixd/core/sessionmanager.h compress.h postparser.h -app.o: httpsimpleparser.h plugin.h pluginmsg.h cookieparser.h -app.o: postmultiparser.h acceptencodingparser.h acceptbaseparser.h +app.o: httpsimpleparser.h plugin.h pluginmsg.h +app.o: ../../../pikotools/convert/text.h cookieparser.h postmultiparser.h +app.o: acceptencodingparser.h acceptbaseparser.h app.o: ../../../pikotools/space/jsontospaceparser.h basethread.o: basethread.h synchro.h bbcodeparser.o: bbcodeparser.h htmlfilter.h @@ -176,6 +178,7 @@ config.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h config.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h config.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h config.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +config.o: ../../../ezc/src/expressionparser.h config.o: ../../../ezc/src/patternparser.h config.o: ../../../winix/winixd/notify/notifythread.h config.o: ../../../winix/winixd/core/basethread.h @@ -314,7 +317,8 @@ dirs.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h dirs.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h dirs.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h dirs.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h -dirs.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +dirs.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +dirs.o: ../../../ezc/src/patternparser.h dirs.o: ../../../winix/winixd/notify/notifythread.h dirs.o: ../../../winix/winixd/core/basethread.h dirs.o: ../../../winix/winixd/notify/templatesnotify.h @@ -400,7 +404,7 @@ image.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h image.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h image.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h image.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -image.o: ../../../ezc/src/patternparser.h +image.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h image.o: ../../../winix/winixd/notify/notifythread.h image.o: ../../../winix/winixd/core/basethread.h image.o: ../../../winix/winixd/notify/templatesnotify.h @@ -534,7 +538,8 @@ job.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h job.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h job.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h job.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h -job.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +job.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +job.o: ../../../ezc/src/patternparser.h job.o: ../../../winix/winixd/notify/notifythread.h job.o: ../../../winix/winixd/core/basethread.h job.o: ../../../winix/winixd/notify/templatesnotify.h @@ -677,7 +682,8 @@ misc.o: ../../../winix/winixd/templates/templates.h ../../../ezc/src/ezc.h misc.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h misc.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h misc.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h -misc.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +misc.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +misc.o: ../../../ezc/src/patternparser.h misc.o: ../../../winix/winixd/templates/patterncacher.h misc.o: ../../../winix/winixd/core/item.h misc.o: ../../../winix/winixd/templates/indexpatterns.h @@ -748,6 +754,7 @@ mountparser.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h mountparser.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h mountparser.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h mountparser.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +mountparser.o: ../../../ezc/src/expressionparser.h mountparser.o: ../../../ezc/src/patternparser.h mountparser.o: ../../../winix/winixd/notify/notifythread.h mountparser.o: ../../../winix/winixd/core/basethread.h @@ -794,6 +801,7 @@ mounts.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h mounts.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h mounts.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h mounts.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +mounts.o: ../../../ezc/src/expressionparser.h mounts.o: ../../../ezc/src/patternparser.h mounts.o: ../../../winix/winixd/notify/notifythread.h mounts.o: ../../../winix/winixd/core/basethread.h @@ -900,6 +908,7 @@ plugin.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h plugin.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h plugin.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h plugin.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +plugin.o: ../../../ezc/src/expressionparser.h plugin.o: ../../../ezc/src/patternparser.h plugin.o: ../../../winix/winixd/notify/notifythread.h plugin.o: ../../../winix/winixd/core/basethread.h @@ -1006,6 +1015,7 @@ plugindata.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h plugindata.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h plugindata.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h plugindata.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +plugindata.o: ../../../ezc/src/expressionparser.h plugindata.o: ../../../ezc/src/patternparser.h plugindata.o: ../../../winix/winixd/notify/notifythread.h plugindata.o: ../../../winix/winixd/core/basethread.h @@ -1094,6 +1104,7 @@ postmultiparser.o: ../../../pikotools/space/spacetojson.h postmultiparser.o: ../../../ezc/src/outstreams.h session.h user.h postmultiparser.o: plugindata.h rebus.h ipban.h mount.h postmultiparser.o: ../../../winix/winixd/templates/locale.h +postmultiparser.o: ../../../pikotools/convert/text.h rebus.o: log.h textstream.h logmanipulators.h rebus.o: ../../../pikotools/textstream/textstream.h rebus.o: ../../../pikotools/space/space.h @@ -1153,6 +1164,7 @@ request.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h request.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h request.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h request.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +request.o: ../../../ezc/src/expressionparser.h request.o: ../../../ezc/src/patternparser.h request.o: ../../../winix/winixd/notify/notifythread.h request.o: ../../../winix/winixd/core/basethread.h @@ -1336,6 +1348,7 @@ sessionmanager.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h sessionmanager.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h sessionmanager.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h sessionmanager.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +sessionmanager.o: ../../../ezc/src/expressionparser.h sessionmanager.o: ../../../ezc/src/patternparser.h sessionmanager.o: ../../../winix/winixd/notify/notifythread.h sessionmanager.o: ../../../winix/winixd/core/basethread.h @@ -1482,6 +1495,7 @@ system.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h system.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h system.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h system.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +system.o: ../../../ezc/src/expressionparser.h system.o: ../../../ezc/src/patternparser.h system.o: ../../../winix/winixd/notify/notifythread.h system.o: ../../../winix/winixd/core/basethread.h @@ -1638,7 +1652,7 @@ users.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h users.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h users.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h users.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -users.o: ../../../ezc/src/patternparser.h +users.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h users.o: ../../../winix/winixd/notify/notifythread.h users.o: ../../../winix/winixd/core/basethread.h users.o: ../../../winix/winixd/notify/templatesnotify.h diff --git a/winixd/core/app.cpp b/winixd/core/app.cpp index 9ef69ab..7356358 100644 --- a/winixd/core/app.cpp +++ b/winixd/core/app.cpp @@ -825,12 +825,12 @@ void App::ReadEnvHTTPVariables() { char * env = *e; - if( IsSubStringNoCasep("HTTP_", env) ) + if( PT::IsSubStringNoCasep("HTTP_", env) ) { env += http_prefix_len; // cookies we have in a different table - if( !IsSubStringNoCasep("COOKIE=", env) ) + if( !PT::IsSubStringNoCasep("COOKIE=", env) ) { if( SaveEnvHTTPVariable(env) ) { @@ -1030,13 +1030,13 @@ void App::ReadPostVars() if( cur.request->method == Request::post || cur.request->method == Request::delete_ ) { - if( IsSubStringNoCase(L"multipart/form-data", cur.request->env_content_type.c_str()) ) + if( PT::IsSubStringNoCase(L"multipart/form-data", cur.request->env_content_type.c_str()) ) { log << log3 << "App: post content type: multipart/form-data" << logend; post_multi_parser.Parse(fcgi_request.in, cur.request->post_tab, cur.request->post_file_tab); } else - if( IsSubStringNoCase(L"application/json", cur.request->env_content_type.c_str()) ) + if( PT::IsSubStringNoCase(L"application/json", cur.request->env_content_type.c_str()) ) { log << log3 << "App: post content type: application/json" << logend; ReadPostJson(); diff --git a/winixd/core/misc.h b/winixd/core/misc.h index e983a00..6a2f894 100644 --- a/winixd/core/misc.h +++ b/winixd/core/misc.h @@ -45,6 +45,7 @@ #include "textstream/textstream.h" #include "utf8/utf8.h" #include "winix_const.h" +#include "convert/convert.h" @@ -419,7 +420,7 @@ size_t i = 0; while( i < buf.size() ) { - if( IsSubString(look_for.c_str(), buf.c_str() + i) ) + if( PT::IsSubString(look_for.c_str(), buf.c_str() + i) ) { buf.erase(i, look_for.size()); buf.insert(i, replace); diff --git a/winixd/core/postmultiparser.cpp b/winixd/core/postmultiparser.cpp index a9e83cf..e0e04af 100644 --- a/winixd/core/postmultiparser.cpp +++ b/winixd/core/postmultiparser.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2014, Tomasz Sowa + * Copyright (c) 2008-2018, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,6 +37,7 @@ #include "postmultiparser.h" #include "log.h" #include "utf8/utf8.h" +#include "convert/text.h" @@ -381,7 +382,7 @@ void PostMultiParser::ReadContent() log << log2 << "PMP: content size: " << content_len << " bytes" << logend; - if( !IsSubStringNoCase("pass", name.c_str()) ) + if( !PT::IsSubStringNoCase("pass", name.c_str()) ) LogFirst(content, config->log_post_value_size); } diff --git a/winixd/core/postparser.h b/winixd/core/postparser.h index b0d939c..dd9d2ad 100644 --- a/winixd/core/postparser.h +++ b/winixd/core/postparser.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2014, Tomasz Sowa + * Copyright (c) 2008-2018, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ #include "utf8/utf8.h" #include "log.h" #include "plugin.h" +#include "convert/text.h" namespace Winix @@ -78,7 +79,7 @@ protected: { log << log2 << "Method POST, name: \"" << name << "\""; - if( log_value_size > 0 && !IsSubStringNoCase(L"pass", name.c_str()) ) + if( log_value_size > 0 && !PT::IsSubStringNoCase(L"pass", name.c_str()) ) { log << ", value: "; diff --git a/winixd/functions/Makefile.dep b/winixd/functions/Makefile.dep index 88719f5..df457bc 100644 --- a/winixd/functions/Makefile.dep +++ b/winixd/functions/Makefile.dep @@ -64,6 +64,7 @@ account.o: rm.h rmuser.h run.h sort.h specialdefault.h stat.h subject.h account.o: template.h timezone.h tinymce.h uname.h upload.h uptime.h who.h account.o: vim.h ../../../winix/winixd/core/htmlfilter.h account.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +account.o: ../../../ezc/src/expressionparser.h account.o: ../../../ezc/src/patternparser.h account.o: ../../../winix/winixd/notify/notifythread.h account.o: ../../../winix/winixd/core/basethread.h @@ -149,6 +150,7 @@ adduser.o: rm.h rmuser.h run.h sort.h specialdefault.h stat.h subject.h adduser.o: template.h timezone.h tinymce.h uname.h upload.h uptime.h who.h adduser.o: vim.h ../../../winix/winixd/core/htmlfilter.h adduser.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +adduser.o: ../../../ezc/src/expressionparser.h adduser.o: ../../../ezc/src/patternparser.h adduser.o: ../../../winix/winixd/notify/notifythread.h adduser.o: ../../../winix/winixd/core/basethread.h @@ -241,7 +243,8 @@ cat.o: mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h cat.o: run.h sort.h specialdefault.h stat.h subject.h template.h timezone.h cat.o: tinymce.h uname.h upload.h uptime.h who.h vim.h cat.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -cat.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +cat.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +cat.o: ../../../ezc/src/patternparser.h cat.o: ../../../winix/winixd/notify/notifythread.h cat.o: ../../../winix/winixd/core/basethread.h cat.o: ../../../winix/winixd/notify/templatesnotify.h @@ -317,7 +320,7 @@ chmod.o: reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h chmod.o: subject.h template.h timezone.h tinymce.h uname.h upload.h uptime.h chmod.o: who.h vim.h ../../../winix/winixd/core/htmlfilter.h chmod.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -chmod.o: ../../../ezc/src/patternparser.h +chmod.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h chmod.o: ../../../winix/winixd/notify/notifythread.h chmod.o: ../../../winix/winixd/core/basethread.h chmod.o: ../../../winix/winixd/notify/templatesnotify.h @@ -395,7 +398,7 @@ chown.o: reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h chown.o: subject.h template.h timezone.h tinymce.h uname.h upload.h uptime.h chown.o: who.h vim.h ../../../winix/winixd/core/htmlfilter.h chown.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -chown.o: ../../../ezc/src/patternparser.h +chown.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h chown.o: ../../../winix/winixd/notify/notifythread.h chown.o: ../../../winix/winixd/core/basethread.h chown.o: ../../../winix/winixd/notify/templatesnotify.h @@ -479,6 +482,7 @@ ckeditor.o: pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h ckeditor.o: subject.h template.h timezone.h tinymce.h uname.h upload.h ckeditor.o: uptime.h who.h vim.h ../../../winix/winixd/core/htmlfilter.h ckeditor.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +ckeditor.o: ../../../ezc/src/expressionparser.h ckeditor.o: ../../../ezc/src/patternparser.h ckeditor.o: ../../../winix/winixd/notify/notifythread.h ckeditor.o: ../../../winix/winixd/core/basethread.h @@ -550,7 +554,8 @@ cp.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h cp.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h cp.o: tinymce.h uname.h upload.h uptime.h who.h vim.h cp.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -cp.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +cp.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +cp.o: ../../../ezc/src/patternparser.h cp.o: ../../../winix/winixd/notify/notifythread.h cp.o: ../../../winix/winixd/core/basethread.h cp.o: ../../../winix/winixd/notify/templatesnotify.h @@ -646,6 +651,7 @@ default.o: pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h default.o: subject.h template.h timezone.h tinymce.h uname.h upload.h default.o: uptime.h who.h vim.h ../../../winix/winixd/core/htmlfilter.h default.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +default.o: ../../../ezc/src/expressionparser.h default.o: ../../../ezc/src/patternparser.h default.o: ../../../winix/winixd/notify/notifythread.h default.o: ../../../winix/winixd/core/basethread.h @@ -730,6 +736,7 @@ download.o: pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h download.o: subject.h template.h timezone.h tinymce.h uname.h upload.h download.o: uptime.h who.h vim.h ../../../winix/winixd/core/htmlfilter.h download.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +download.o: ../../../ezc/src/expressionparser.h download.o: ../../../ezc/src/patternparser.h download.o: ../../../winix/winixd/notify/notifythread.h download.o: ../../../winix/winixd/core/basethread.h @@ -808,7 +815,7 @@ emacs.o: reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h emacs.o: subject.h template.h timezone.h tinymce.h uname.h upload.h uptime.h emacs.o: who.h vim.h ../../../winix/winixd/core/htmlfilter.h emacs.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -emacs.o: ../../../ezc/src/patternparser.h +emacs.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h emacs.o: ../../../winix/winixd/notify/notifythread.h emacs.o: ../../../winix/winixd/core/basethread.h emacs.o: ../../../winix/winixd/notify/templatesnotify.h @@ -888,7 +895,8 @@ env.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h env.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h env.o: tinymce.h uname.h upload.h uptime.h who.h vim.h env.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -env.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +env.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +env.o: ../../../ezc/src/patternparser.h env.o: ../../../winix/winixd/notify/notifythread.h env.o: ../../../winix/winixd/core/basethread.h env.o: ../../../winix/winixd/notify/templatesnotify.h @@ -973,6 +981,7 @@ functionbase.o: run.h sort.h specialdefault.h stat.h subject.h template.h functionbase.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h functionbase.o: ../../../winix/winixd/core/htmlfilter.h functionbase.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +functionbase.o: ../../../ezc/src/expressionparser.h functionbase.o: ../../../ezc/src/patternparser.h functionbase.o: ../../../winix/winixd/notify/notifythread.h functionbase.o: ../../../winix/winixd/core/basethread.h @@ -1060,6 +1069,7 @@ functionparser.o: subject.h template.h timezone.h tinymce.h uname.h upload.h functionparser.o: uptime.h who.h vim.h functionparser.o: ../../../winix/winixd/core/htmlfilter.h functionparser.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +functionparser.o: ../../../ezc/src/expressionparser.h functionparser.o: ../../../ezc/src/patternparser.h functionparser.o: ../../../winix/winixd/notify/notifythread.h functionparser.o: ../../../winix/winixd/core/basethread.h @@ -1140,6 +1150,7 @@ functions.o: ../../../winix/winixd/templates/localefilter.h functions.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h functions.o: ../../../ezc/src/blocks.h ../../../ezc/src/cache.h functions.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +functions.o: ../../../ezc/src/expressionparser.h functions.o: ../../../ezc/src/patternparser.h functions.o: ../../../winix/winixd/notify/notifythread.h functions.o: ../../../winix/winixd/core/basethread.h @@ -1248,6 +1259,7 @@ imgcrop.o: pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h imgcrop.o: subject.h template.h timezone.h tinymce.h uname.h upload.h imgcrop.o: uptime.h who.h vim.h ../../../winix/winixd/core/htmlfilter.h imgcrop.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +imgcrop.o: ../../../ezc/src/expressionparser.h imgcrop.o: ../../../ezc/src/patternparser.h imgcrop.o: ../../../winix/winixd/notify/notifythread.h imgcrop.o: ../../../winix/winixd/core/basethread.h @@ -1326,7 +1338,7 @@ ipban.o: pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h ipban.o: subject.h template.h timezone.h tinymce.h uname.h upload.h uptime.h ipban.o: who.h vim.h ../../../winix/winixd/core/htmlfilter.h ipban.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -ipban.o: ../../../ezc/src/patternparser.h +ipban.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h ipban.o: ../../../winix/winixd/notify/notifythread.h ipban.o: ../../../winix/winixd/core/basethread.h ipban.o: ../../../winix/winixd/notify/templatesnotify.h @@ -1404,7 +1416,8 @@ last.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h last.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h last.o: tinymce.h uname.h upload.h uptime.h who.h vim.h last.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -last.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +last.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +last.o: ../../../ezc/src/patternparser.h last.o: ../../../winix/winixd/notify/notifythread.h last.o: ../../../winix/winixd/core/basethread.h last.o: ../../../winix/winixd/notify/templatesnotify.h @@ -1474,7 +1487,8 @@ ln.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h ln.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h ln.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ln.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -ln.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +ln.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +ln.o: ../../../ezc/src/patternparser.h ln.o: ../../../winix/winixd/notify/notifythread.h ln.o: ../../../winix/winixd/core/basethread.h ln.o: ../../../winix/winixd/notify/templatesnotify.h @@ -1553,7 +1567,8 @@ locale.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h sort.h locale.o: specialdefault.h stat.h subject.h template.h timezone.h tinymce.h locale.o: uname.h upload.h uptime.h who.h vim.h locale.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -locale.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +locale.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +locale.o: ../../../ezc/src/patternparser.h locale.o: ../../../winix/winixd/notify/notifythread.h locale.o: ../../../winix/winixd/core/basethread.h locale.o: ../../../winix/winixd/notify/templatesnotify.h @@ -1638,7 +1653,7 @@ login.o: reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h login.o: subject.h template.h timezone.h tinymce.h uname.h upload.h uptime.h login.o: who.h vim.h ../../../winix/winixd/core/htmlfilter.h login.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -login.o: ../../../ezc/src/patternparser.h +login.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h login.o: ../../../winix/winixd/notify/notifythread.h login.o: ../../../winix/winixd/core/basethread.h login.o: ../../../winix/winixd/notify/templatesnotify.h @@ -1718,6 +1733,7 @@ logout.o: pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h logout.o: subject.h template.h timezone.h tinymce.h uname.h upload.h uptime.h logout.o: who.h vim.h ../../../winix/winixd/core/htmlfilter.h logout.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +logout.o: ../../../ezc/src/expressionparser.h logout.o: ../../../ezc/src/patternparser.h logout.o: ../../../winix/winixd/notify/notifythread.h logout.o: ../../../winix/winixd/core/basethread.h @@ -1789,7 +1805,8 @@ ls.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h ls.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h ls.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ls.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -ls.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +ls.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +ls.o: ../../../ezc/src/patternparser.h ls.o: ../../../winix/winixd/notify/notifythread.h ls.o: ../../../winix/winixd/core/basethread.h ls.o: ../../../winix/winixd/notify/templatesnotify.h @@ -1859,7 +1876,8 @@ man.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h man.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h man.o: tinymce.h uname.h upload.h uptime.h who.h vim.h man.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -man.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +man.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +man.o: ../../../ezc/src/patternparser.h man.o: ../../../winix/winixd/notify/notifythread.h man.o: ../../../winix/winixd/core/basethread.h man.o: ../../../winix/winixd/notify/templatesnotify.h @@ -1934,7 +1952,8 @@ meta.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h meta.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h meta.o: tinymce.h uname.h upload.h uptime.h who.h vim.h meta.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -meta.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +meta.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +meta.o: ../../../ezc/src/patternparser.h meta.o: ../../../winix/winixd/notify/notifythread.h meta.o: ../../../winix/winixd/core/basethread.h meta.o: ../../../winix/winixd/notify/templatesnotify.h @@ -2011,7 +2030,7 @@ mkdir.o: reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h mkdir.o: subject.h template.h timezone.h tinymce.h uname.h upload.h uptime.h mkdir.o: who.h vim.h ../../../winix/winixd/core/htmlfilter.h mkdir.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -mkdir.o: ../../../ezc/src/patternparser.h +mkdir.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h mkdir.o: ../../../winix/winixd/notify/notifythread.h mkdir.o: ../../../winix/winixd/core/basethread.h mkdir.o: ../../../winix/winixd/notify/templatesnotify.h @@ -2105,7 +2124,7 @@ mount.o: pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h mount.o: subject.h template.h timezone.h tinymce.h uname.h upload.h uptime.h mount.o: who.h vim.h ../../../winix/winixd/core/htmlfilter.h mount.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -mount.o: ../../../ezc/src/patternparser.h +mount.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h mount.o: ../../../winix/winixd/notify/notifythread.h mount.o: ../../../winix/winixd/core/basethread.h mount.o: ../../../winix/winixd/notify/templatesnotify.h @@ -2176,7 +2195,8 @@ mv.o: nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h mv.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h mv.o: tinymce.h uname.h upload.h uptime.h who.h vim.h mv.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -mv.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +mv.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +mv.o: ../../../ezc/src/patternparser.h mv.o: ../../../winix/winixd/notify/notifythread.h mv.o: ../../../winix/winixd/core/basethread.h mv.o: ../../../winix/winixd/notify/templatesnotify.h @@ -2271,6 +2291,7 @@ nicedit.o: priv.h pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h nicedit.o: stat.h subject.h template.h timezone.h tinymce.h uname.h upload.h nicedit.o: uptime.h who.h vim.h ../../../winix/winixd/core/htmlfilter.h nicedit.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +nicedit.o: ../../../ezc/src/expressionparser.h nicedit.o: ../../../ezc/src/patternparser.h nicedit.o: ../../../winix/winixd/notify/notifythread.h nicedit.o: ../../../winix/winixd/core/basethread.h @@ -2348,7 +2369,8 @@ node.o: mkdir.h mv.h nicedit.h passwd.h priv.h pw.h reload.h rm.h rmuser.h node.o: run.h sort.h specialdefault.h stat.h subject.h template.h timezone.h node.o: tinymce.h uname.h upload.h uptime.h who.h vim.h node.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -node.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +node.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +node.o: ../../../ezc/src/patternparser.h node.o: ../../../winix/winixd/notify/notifythread.h node.o: ../../../winix/winixd/core/basethread.h node.o: ../../../winix/winixd/notify/templatesnotify.h @@ -2427,6 +2449,7 @@ passwd.o: priv.h pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h passwd.o: stat.h subject.h template.h timezone.h tinymce.h uname.h upload.h passwd.o: uptime.h who.h vim.h ../../../winix/winixd/core/htmlfilter.h passwd.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +passwd.o: ../../../ezc/src/expressionparser.h passwd.o: ../../../ezc/src/patternparser.h passwd.o: ../../../winix/winixd/notify/notifythread.h passwd.o: ../../../winix/winixd/core/basethread.h @@ -2506,7 +2529,8 @@ priv.o: mkdir.h mv.h nicedit.h node.h passwd.h pw.h reload.h rm.h rmuser.h priv.o: run.h sort.h specialdefault.h stat.h subject.h template.h timezone.h priv.o: tinymce.h uname.h upload.h uptime.h who.h vim.h priv.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -priv.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +priv.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +priv.o: ../../../ezc/src/patternparser.h priv.o: ../../../winix/winixd/notify/notifythread.h priv.o: ../../../winix/winixd/core/basethread.h priv.o: ../../../winix/winixd/notify/templatesnotify.h @@ -2593,6 +2617,7 @@ 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: ../../../winix/winixd/core/htmlfilter.h privchanger.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +privchanger.o: ../../../ezc/src/expressionparser.h privchanger.o: ../../../ezc/src/patternparser.h privchanger.o: ../../../winix/winixd/notify/notifythread.h privchanger.o: ../../../winix/winixd/core/basethread.h @@ -2663,7 +2688,8 @@ pw.o: mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h rmuser.h run.h pw.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h pw.o: tinymce.h uname.h upload.h uptime.h who.h vim.h pw.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -pw.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +pw.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +pw.o: ../../../ezc/src/patternparser.h pw.o: ../../../winix/winixd/notify/notifythread.h pw.o: ../../../winix/winixd/core/basethread.h pw.o: ../../../winix/winixd/notify/templatesnotify.h @@ -2742,6 +2768,7 @@ reload.o: passwd.h priv.h pw.h rm.h rmuser.h run.h sort.h specialdefault.h reload.o: stat.h subject.h template.h timezone.h tinymce.h uname.h upload.h reload.o: uptime.h who.h vim.h ../../../winix/winixd/core/htmlfilter.h reload.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +reload.o: ../../../ezc/src/expressionparser.h reload.o: ../../../ezc/src/patternparser.h reload.o: ../../../winix/winixd/notify/notifythread.h reload.o: ../../../winix/winixd/core/basethread.h @@ -2820,7 +2847,8 @@ rm.o: mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rmuser.h run.h rm.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h rm.o: tinymce.h uname.h upload.h uptime.h who.h vim.h rm.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -rm.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +rm.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +rm.o: ../../../ezc/src/patternparser.h rm.o: ../../../winix/winixd/notify/notifythread.h rm.o: ../../../winix/winixd/core/basethread.h rm.o: ../../../winix/winixd/notify/templatesnotify.h @@ -2915,6 +2943,7 @@ rmuser.o: passwd.h priv.h pw.h reload.h rm.h run.h sort.h specialdefault.h rmuser.o: stat.h subject.h template.h timezone.h tinymce.h uname.h upload.h rmuser.o: uptime.h who.h vim.h ../../../winix/winixd/core/htmlfilter.h rmuser.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +rmuser.o: ../../../ezc/src/expressionparser.h rmuser.o: ../../../ezc/src/patternparser.h rmuser.o: ../../../winix/winixd/notify/notifythread.h rmuser.o: ../../../winix/winixd/core/basethread.h @@ -3006,7 +3035,8 @@ run.o: mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h run.o: sort.h specialdefault.h stat.h subject.h template.h timezone.h run.o: tinymce.h uname.h upload.h uptime.h who.h vim.h run.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -run.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +run.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +run.o: ../../../ezc/src/patternparser.h run.o: ../../../winix/winixd/notify/notifythread.h run.o: ../../../winix/winixd/core/basethread.h run.o: ../../../winix/winixd/notify/templatesnotify.h @@ -3081,7 +3111,8 @@ sort.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h sort.o: rmuser.h run.h specialdefault.h stat.h subject.h template.h sort.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h sort.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -sort.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +sort.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +sort.o: ../../../ezc/src/patternparser.h sort.o: ../../../winix/winixd/notify/notifythread.h sort.o: ../../../winix/winixd/core/basethread.h sort.o: ../../../winix/winixd/notify/templatesnotify.h @@ -3185,6 +3216,7 @@ specialdefault.o: stat.h subject.h template.h timezone.h tinymce.h uname.h specialdefault.o: upload.h uptime.h who.h vim.h specialdefault.o: ../../../winix/winixd/core/htmlfilter.h specialdefault.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +specialdefault.o: ../../../ezc/src/expressionparser.h specialdefault.o: ../../../ezc/src/patternparser.h specialdefault.o: ../../../winix/winixd/notify/notifythread.h specialdefault.o: ../../../winix/winixd/core/basethread.h @@ -3262,7 +3294,8 @@ stat.o: mkdir.h mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h stat.o: rmuser.h run.h sort.h specialdefault.h subject.h template.h stat.o: timezone.h tinymce.h uname.h upload.h uptime.h who.h vim.h stat.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -stat.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +stat.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +stat.o: ../../../ezc/src/patternparser.h stat.o: ../../../winix/winixd/notify/notifythread.h stat.o: ../../../winix/winixd/core/basethread.h stat.o: ../../../winix/winixd/notify/templatesnotify.h @@ -3343,7 +3376,8 @@ subject.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h sort.h subject.o: specialdefault.h stat.h template.h timezone.h tinymce.h uname.h subject.o: upload.h uptime.h who.h vim.h subject.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -subject.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +subject.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +subject.o: ../../../ezc/src/patternparser.h subject.o: ../../../winix/winixd/notify/notifythread.h subject.o: ../../../winix/winixd/core/basethread.h subject.o: ../../../winix/winixd/notify/templatesnotify.h @@ -3444,6 +3478,7 @@ template.o: specialdefault.h stat.h subject.h timezone.h tinymce.h uname.h template.o: upload.h uptime.h who.h vim.h template.o: ../../../winix/winixd/core/htmlfilter.h template.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +template.o: ../../../ezc/src/expressionparser.h template.o: ../../../ezc/src/patternparser.h template.o: ../../../winix/winixd/notify/notifythread.h template.o: ../../../winix/winixd/core/basethread.h @@ -3531,6 +3566,7 @@ 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: ../../../winix/winixd/core/htmlfilter.h timezone.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h +timezone.o: ../../../ezc/src/expressionparser.h timezone.o: ../../../ezc/src/patternparser.h timezone.o: ../../../winix/winixd/notify/notifythread.h timezone.o: ../../../winix/winixd/core/basethread.h @@ -3613,7 +3649,8 @@ tinymce.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h sort.h tinymce.o: specialdefault.h stat.h subject.h template.h timezone.h uname.h tinymce.o: upload.h uptime.h who.h vim.h tinymce.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -tinymce.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +tinymce.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +tinymce.o: ../../../ezc/src/patternparser.h tinymce.o: ../../../winix/winixd/notify/notifythread.h tinymce.o: ../../../winix/winixd/core/basethread.h tinymce.o: ../../../winix/winixd/notify/templatesnotify.h @@ -3691,7 +3728,7 @@ uname.o: pw.h reload.h rm.h rmuser.h run.h sort.h specialdefault.h stat.h uname.o: subject.h template.h timezone.h tinymce.h upload.h uptime.h who.h uname.o: vim.h ../../../winix/winixd/core/htmlfilter.h uname.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -uname.o: ../../../ezc/src/patternparser.h +uname.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h uname.o: ../../../winix/winixd/notify/notifythread.h uname.o: ../../../winix/winixd/core/basethread.h uname.o: ../../../winix/winixd/notify/templatesnotify.h @@ -3771,7 +3808,8 @@ upload.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h sort.h upload.o: specialdefault.h stat.h subject.h template.h timezone.h tinymce.h upload.o: uname.h uptime.h who.h vim.h upload.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -upload.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +upload.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +upload.o: ../../../ezc/src/patternparser.h upload.o: ../../../winix/winixd/notify/notifythread.h upload.o: ../../../winix/winixd/core/basethread.h upload.o: ../../../winix/winixd/notify/templatesnotify.h @@ -3869,7 +3907,8 @@ uptime.o: passwd.h priv.h pw.h reload.h rm.h rmuser.h run.h sort.h uptime.o: specialdefault.h stat.h subject.h template.h timezone.h tinymce.h uptime.o: uname.h upload.h who.h vim.h uptime.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -uptime.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +uptime.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +uptime.o: ../../../ezc/src/patternparser.h uptime.o: ../../../winix/winixd/notify/notifythread.h uptime.o: ../../../winix/winixd/core/basethread.h uptime.o: ../../../winix/winixd/notify/templatesnotify.h @@ -3942,7 +3981,8 @@ vim.o: mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h vim.o: run.h sort.h specialdefault.h stat.h subject.h template.h timezone.h vim.o: tinymce.h uname.h upload.h uptime.h who.h vim.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -vim.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +vim.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +vim.o: ../../../ezc/src/patternparser.h vim.o: ../../../winix/winixd/notify/notifythread.h vim.o: ../../../winix/winixd/core/basethread.h vim.o: ../../../winix/winixd/notify/templatesnotify.h @@ -4013,7 +4053,8 @@ who.o: mv.h nicedit.h node.h passwd.h priv.h pw.h reload.h rm.h rmuser.h who.o: run.h sort.h specialdefault.h stat.h subject.h template.h timezone.h who.o: tinymce.h uname.h upload.h uptime.h vim.h who.o: ../../../winix/winixd/core/htmlfilter.h ../../../ezc/src/objects.h -who.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +who.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +who.o: ../../../ezc/src/patternparser.h who.o: ../../../winix/winixd/notify/notifythread.h who.o: ../../../winix/winixd/core/basethread.h who.o: ../../../winix/winixd/notify/templatesnotify.h diff --git a/winixd/functions/sort.cpp b/winixd/functions/sort.cpp index 312376d..3a48aae 100644 --- a/winixd/functions/sort.cpp +++ b/winixd/functions/sort.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2014, Tomasz Sowa + * Copyright (c) 2011-2018, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -109,7 +109,7 @@ SortPair sp; for( ; i2 != cur->request->post_tab.end() ; ++i2 ) { - if( IsSubStringNoCase(L"sort", i2->first.c_str()) ) + if( PT::IsSubStringNoCase(L"sort", i2->first.c_str()) ) { sp.id = Tol(i2->first.c_str() + 4); sp.sort_index = Toi(i2->second); diff --git a/winixd/functions/sort.h b/winixd/functions/sort.h index 440db52..1c0326b 100644 --- a/winixd/functions/sort.h +++ b/winixd/functions/sort.h @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2014, Tomasz Sowa + * Copyright (c) 2011-2018, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/winixd/main/Makefile.dep b/winixd/main/Makefile.dep index 94c1c11..664dc08 100644 --- a/winixd/main/Makefile.dep +++ b/winixd/main/Makefile.dep @@ -56,7 +56,8 @@ main.o: ../../../winix/winixd/templates/localefilter.h ../../../ezc/src/ezc.h main.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h main.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h main.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h -main.o: ../../../ezc/src/pattern.h ../../../ezc/src/patternparser.h +main.o: ../../../ezc/src/pattern.h ../../../ezc/src/expressionparser.h +main.o: ../../../ezc/src/patternparser.h main.o: ../../../winix/winixd/notify/notifythread.h main.o: ../../../winix/winixd/core/basethread.h main.o: ../../../winix/winixd/notify/templatesnotify.h @@ -141,6 +142,7 @@ main.o: ../../../winix/winixd/core/postparser.h main.o: ../../../winix/winixd/core/httpsimpleparser.h main.o: ../../../winix/winixd/core/plugin.h main.o: ../../../winix/winixd/core/pluginmsg.h +main.o: ../../../pikotools/convert/text.h main.o: ../../../winix/winixd/core/cookieparser.h main.o: ../../../winix/winixd/core/postmultiparser.h main.o: ../../../winix/winixd/core/acceptencodingparser.h diff --git a/winixd/notify/Makefile.dep b/winixd/notify/Makefile.dep index 61ece1b..ff79917 100644 --- a/winixd/notify/Makefile.dep +++ b/winixd/notify/Makefile.dep @@ -20,8 +20,9 @@ notify.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h notify.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h notify.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h notify.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -notify.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -notify.o: notifythread.h ../../../winix/winixd/core/basethread.h +notify.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +notify.o: ../../../ezc/src/patternparser.h notifythread.h +notify.o: ../../../winix/winixd/core/basethread.h notify.o: ../../../winix/winixd/core/synchro.h templatesnotify.h notify.o: ../../../winix/winixd/core/textstream.h notify.o: ../../../winix/winixd/core/config.h @@ -158,6 +159,7 @@ notifythread.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h notifythread.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h notifythread.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h notifythread.o: ../../../ezc/src/outstreams.h +notifythread.o: ../../../ezc/src/expressionparser.h notifythread.o: ../../../ezc/src/patternparser.h notifythread.o: ../../../winix/winixd/core/textstream.h notifythread.o: ../../../pikotools/convert/misc.h @@ -218,6 +220,7 @@ templatesnotify.o: ../../../ezc/src/functions.h templatesnotify.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h templatesnotify.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h templatesnotify.o: ../../../ezc/src/outstreams.h +templatesnotify.o: ../../../ezc/src/expressionparser.h templatesnotify.o: ../../../ezc/src/patternparser.h templatesnotify.o: ../../../winix/winixd/core/textstream.h templatesnotify.o: ../../../pikotools/convert/misc.h diff --git a/winixd/plugins/export/Makefile.dep b/winixd/plugins/export/Makefile.dep index 241483d..7e09352 100644 --- a/winixd/plugins/export/Makefile.dep +++ b/winixd/plugins/export/Makefile.dep @@ -60,6 +60,7 @@ edb.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h edb.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h edb.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h edb.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h +edb.o: ../../../../ezc/src/expressionparser.h edb.o: ../../../../ezc/src/patternparser.h edb.o: ../../../../winix/winixd/notify/notifythread.h edb.o: ../../../../winix/winixd/core/basethread.h @@ -132,6 +133,7 @@ exportinfo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h exportinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h exportinfo.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h exportinfo.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h +exportinfo.o: ../../../../ezc/src/expressionparser.h exportinfo.o: ../../../../ezc/src/patternparser.h exportinfo.o: ../../../../winix/winixd/notify/notifythread.h exportinfo.o: ../../../../winix/winixd/core/basethread.h @@ -157,6 +159,7 @@ exportinfo.o: ../../../../winix/winixd/db/dbconn.h exportinfo.o: ../../../../winix/winixd/db/dbtextstream.h exportinfo.o: ../../../../winix/winixd/core/error.h exportinfo.o: ../../../../winix/winixd/core/dirs.h message.h exportthread.h +exportinfo.o: ../../../../pikotools/convert/text.h exportthread.o: exportthread.h ../../../../winix/winixd/core/basethread.h exportthread.o: ../../../../winix/winixd/core/synchro.h message.h exportthread.o: ../../../../winix/winixd/core/log.h @@ -176,6 +179,7 @@ exportthread.o: ../../../../pikotools/membuffer/membuffer.h exportthread.o: ../../../../pikotools/textstream/types.h exportthread.o: ../../../../pikotools/utf8/utf8.h exportthread.o: ../../../../winix/winixd/core/winix_const.h +exportthread.o: ../../../../pikotools/convert/text.h funexport.o: funexport.h ../../../../winix/winixd/functions/functionbase.h funexport.o: ../../../../winix/winixd/core/item.h funexport.o: ../../../../winix/winixd/db/db.h @@ -240,6 +244,7 @@ funexport.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h funexport.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h funexport.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h funexport.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h +funexport.o: ../../../../ezc/src/expressionparser.h funexport.o: ../../../../ezc/src/patternparser.h funexport.o: ../../../../winix/winixd/notify/notifythread.h funexport.o: ../../../../winix/winixd/core/basethread.h @@ -328,6 +333,7 @@ init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h +init.o: ../../../../ezc/src/expressionparser.h init.o: ../../../../ezc/src/patternparser.h init.o: ../../../../winix/winixd/notify/notifythread.h init.o: ../../../../winix/winixd/core/basethread.h diff --git a/winixd/plugins/export/exportinfo.cpp b/winixd/plugins/export/exportinfo.cpp index 55e4add..170af5b 100644 --- a/winixd/plugins/export/exportinfo.cpp +++ b/winixd/plugins/export/exportinfo.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2014, Tomasz Sowa + * Copyright (c) 2011-2018, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -34,6 +34,8 @@ #include "core/log.h" #include "exportinfo.h" +#include "convert/text.h" + namespace Winix { @@ -140,7 +142,7 @@ bool ExportInfo::SkipDir(long dir_id, std::wstring & dir) { if( system->dirs.MakePath(dir_id, tmp_dir) ) { - if( !tmp_dir.empty() && IsSubString(tmp_dir, dir) ) + if( !tmp_dir.empty() && PT::IsSubString(tmp_dir, dir) ) { // tmp_dir has a slash at the end // we want the slash at the beginning diff --git a/winixd/plugins/export/exportthread.cpp b/winixd/plugins/export/exportthread.cpp index 404d364..7242488 100644 --- a/winixd/plugins/export/exportthread.cpp +++ b/winixd/plugins/export/exportthread.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2011-2014, Tomasz Sowa + * Copyright (c) 2011-2018, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -40,6 +40,8 @@ #include "core/log.h" #include "core/misc.h" #include "utf8/utf8.h" +#include "convert/text.h" + namespace Winix { @@ -406,13 +408,13 @@ bool ExportThread::HasThumbInAdress(std::string & buf, size_t i) for( ; iticket_form_prefix, i->first) ) + if( PT::IsSubString(config->ticket_form_prefix, i->first) ) { long param_id = Tol(i->first.c_str() + config->ticket_form_prefix.size()); ReadTicketParam(ticket, param_id, i->second, meta); } - if( IsSubString(ticket_delete_prefix, i->first) ) + if( PT::IsSubString(ticket_delete_prefix, i->first) ) { long file_id = Tol(i->first.c_str() + ticket_delete_prefix.size()); @@ -586,7 +588,7 @@ PostFileTab::iterator i2; for(i2=cur->request->post_file_tab.begin() ; i2!=cur->request->post_file_tab.end() ; ++i2) { - if( IsSubString(config->ticket_form_prefix, i2->first) ) + if( PT::IsSubString(config->ticket_form_prefix, i2->first) ) ReadTicketParam(Tol(i2->first.c_str() + config->ticket_form_prefix.size()), i2->second, meta); } diff --git a/winixd/templates/Makefile.dep b/winixd/templates/Makefile.dep index 1a00355..7b4d415 100644 --- a/winixd/templates/Makefile.dep +++ b/winixd/templates/Makefile.dep @@ -5,8 +5,8 @@ adduser.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h adduser.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h adduser.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h adduser.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -adduser.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -adduser.o: misc.h localefilter.h locale.h +adduser.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +adduser.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h adduser.o: ../../../pikotools/space/spaceparser.h adduser.o: ../../../pikotools/space/space.h adduser.o: ../../../pikotools/textstream/types.h @@ -90,8 +90,8 @@ antispam.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h antispam.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h antispam.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h antispam.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -antispam.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -antispam.o: misc.h localefilter.h locale.h +antispam.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +antispam.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h antispam.o: ../../../pikotools/space/spaceparser.h antispam.o: ../../../pikotools/space/space.h antispam.o: ../../../pikotools/textstream/types.h @@ -190,6 +190,7 @@ changepatterns.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h changepatterns.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h changepatterns.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h changepatterns.o: ../../../ezc/src/outstreams.h +changepatterns.o: ../../../ezc/src/expressionparser.h changepatterns.o: ../../../ezc/src/patternparser.h htmltextstream.h changepatterns.o: ../../../winix/winixd/core/textstream.h changepatterns.o: ../../../pikotools/membuffer/membuffer.h @@ -205,8 +206,8 @@ config.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h config.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h config.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h config.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -config.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -config.o: misc.h localefilter.h locale.h +config.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +config.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h config.o: ../../../pikotools/space/spaceparser.h config.o: ../../../pikotools/space/space.h config.o: ../../../pikotools/textstream/types.h @@ -289,6 +290,7 @@ currentdate.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h currentdate.o: ../../../ezc/src/functions.h ../../../pikotools/utf8/utf8.h currentdate.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h currentdate.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h +currentdate.o: ../../../ezc/src/expressionparser.h currentdate.o: ../../../ezc/src/patternparser.h misc.h localefilter.h currentdate.o: locale.h ../../../pikotools/space/spaceparser.h currentdate.o: ../../../pikotools/space/space.h @@ -423,8 +425,9 @@ dir.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h dir.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h dir.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h dir.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -dir.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h misc.h -dir.o: localefilter.h locale.h ../../../pikotools/space/spaceparser.h +dir.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +dir.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h +dir.o: ../../../pikotools/space/spaceparser.h dir.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h dir.o: ../../../pikotools/textstream/textstream.h dir.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h @@ -544,8 +547,9 @@ doc.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h doc.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h doc.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h doc.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -doc.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h misc.h -doc.o: localefilter.h locale.h ../../../pikotools/space/spaceparser.h +doc.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +doc.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h +doc.o: ../../../pikotools/space/spaceparser.h doc.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h doc.o: ../../../pikotools/textstream/textstream.h doc.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h @@ -619,8 +623,9 @@ env.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h env.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h env.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h env.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -env.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h misc.h -env.o: localefilter.h locale.h ../../../pikotools/space/spaceparser.h +env.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +env.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h +env.o: ../../../pikotools/space/spaceparser.h env.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h env.o: ../../../pikotools/textstream/textstream.h env.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h @@ -740,8 +745,8 @@ filters.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h filters.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h filters.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h filters.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -filters.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -filters.o: misc.h localefilter.h locale.h +filters.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +filters.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h filters.o: ../../../pikotools/space/spaceparser.h filters.o: ../../../pikotools/space/space.h filters.o: ../../../pikotools/textstream/types.h @@ -826,8 +831,8 @@ generic.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h generic.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h generic.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h generic.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -generic.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -generic.o: misc.h localefilter.h locale.h +generic.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +generic.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h generic.o: ../../../pikotools/space/spaceparser.h generic.o: ../../../pikotools/space/space.h generic.o: ../../../pikotools/textstream/types.h @@ -928,6 +933,7 @@ htmltextstream.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h htmltextstream.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h htmltextstream.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h htmltextstream.o: ../../../ezc/src/outstreams.h +htmltextstream.o: ../../../ezc/src/expressionparser.h htmltextstream.o: ../../../ezc/src/patternparser.h indexpatterns.o: indexpatterns.h ../../../ezc/src/ezc.h indexpatterns.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h @@ -935,6 +941,7 @@ indexpatterns.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h indexpatterns.o: ../../../ezc/src/functions.h ../../../pikotools/utf8/utf8.h indexpatterns.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h indexpatterns.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h +indexpatterns.o: ../../../ezc/src/expressionparser.h indexpatterns.o: ../../../ezc/src/patternparser.h patterns.h locale.h indexpatterns.o: ../../../pikotools/space/spaceparser.h indexpatterns.o: ../../../pikotools/space/space.h @@ -960,8 +967,8 @@ insert.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h insert.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h insert.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h insert.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -insert.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -insert.o: misc.h localefilter.h locale.h +insert.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +insert.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h insert.o: ../../../pikotools/space/spaceparser.h insert.o: ../../../pikotools/space/space.h insert.o: ../../../pikotools/textstream/types.h @@ -1046,8 +1053,8 @@ ipban.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h ipban.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h ipban.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h ipban.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -ipban.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -ipban.o: misc.h localefilter.h locale.h +ipban.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +ipban.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h ipban.o: ../../../pikotools/space/spaceparser.h ipban.o: ../../../pikotools/space/space.h ipban.o: ../../../pikotools/textstream/types.h @@ -1175,8 +1182,9 @@ item.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h item.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h item.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h item.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -item.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h misc.h -item.o: localefilter.h locale.h ../../../pikotools/space/spaceparser.h +item.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +item.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h +item.o: ../../../pikotools/space/spaceparser.h item.o: ../../../pikotools/space/space.h item.o: ../../../pikotools/textstream/types.h item.o: ../../../pikotools/textstream/textstream.h @@ -1257,8 +1265,9 @@ last.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h last.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h last.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h last.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -last.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h misc.h -last.o: localefilter.h locale.h ../../../pikotools/space/spaceparser.h +last.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +last.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h +last.o: ../../../pikotools/space/spaceparser.h last.o: ../../../pikotools/space/space.h last.o: ../../../pikotools/textstream/types.h last.o: ../../../pikotools/textstream/textstream.h @@ -1346,8 +1355,9 @@ locale.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h locale.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h locale.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h locale.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -locale.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -locale.o: htmltextstream.h ../../../winix/winixd/core/textstream.h +locale.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +locale.o: ../../../ezc/src/patternparser.h htmltextstream.h +locale.o: ../../../winix/winixd/core/textstream.h locale.o: ../../../pikotools/membuffer/membuffer.h locale.o: ../../../pikotools/textstream/types.h locale.o: ../../../winix/winixd/core/log.h @@ -1375,6 +1385,7 @@ localefilter.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h localefilter.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h localefilter.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h localefilter.o: ../../../ezc/src/outstreams.h +localefilter.o: ../../../ezc/src/expressionparser.h localefilter.o: ../../../ezc/src/patternparser.h htmltextstream.h localefilter.o: ../../../winix/winixd/core/textstream.h localefilter.o: ../../../pikotools/membuffer/membuffer.h @@ -1386,8 +1397,8 @@ login.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h login.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h login.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h login.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -login.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -login.o: misc.h localefilter.h locale.h +login.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +login.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h login.o: ../../../pikotools/space/spaceparser.h login.o: ../../../pikotools/space/space.h login.o: ../../../pikotools/textstream/types.h @@ -1513,9 +1524,10 @@ ls.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h ls.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h ls.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h ls.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -ls.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h misc.h -ls.o: localefilter.h locale.h ../../../pikotools/space/spaceparser.h -ls.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h +ls.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +ls.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h +ls.o: ../../../pikotools/space/spaceparser.h ../../../pikotools/space/space.h +ls.o: ../../../pikotools/textstream/types.h ls.o: ../../../pikotools/textstream/textstream.h ls.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h ls.o: ../../../pikotools/convert/convert.h @@ -1584,8 +1596,9 @@ man.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h man.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h man.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h man.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -man.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h misc.h -man.o: localefilter.h locale.h ../../../pikotools/space/spaceparser.h +man.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +man.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h +man.o: ../../../pikotools/space/spaceparser.h man.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h man.o: ../../../pikotools/textstream/textstream.h man.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h @@ -1704,8 +1717,9 @@ misc.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h misc.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h misc.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h misc.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -misc.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h misc.h -misc.o: localefilter.h locale.h ../../../pikotools/space/spaceparser.h +misc.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +misc.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h +misc.o: ../../../pikotools/space/spaceparser.h misc.o: ../../../pikotools/space/space.h misc.o: ../../../pikotools/textstream/types.h misc.o: ../../../pikotools/textstream/textstream.h @@ -1785,8 +1799,9 @@ miscspace.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h miscspace.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h miscspace.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h miscspace.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -miscspace.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -miscspace.o: misc.h localefilter.h locale.h +miscspace.o: ../../../ezc/src/outstreams.h +miscspace.o: ../../../ezc/src/expressionparser.h +miscspace.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h miscspace.o: ../../../pikotools/space/spaceparser.h miscspace.o: ../../../pikotools/space/space.h miscspace.o: ../../../pikotools/textstream/types.h @@ -1870,8 +1885,8 @@ mount.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h mount.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h mount.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h mount.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -mount.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -mount.o: misc.h localefilter.h locale.h +mount.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +mount.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h mount.o: ../../../pikotools/space/spaceparser.h mount.o: ../../../pikotools/space/space.h mount.o: ../../../pikotools/textstream/types.h @@ -1955,8 +1970,8 @@ passwd.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h passwd.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h passwd.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h passwd.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -passwd.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -passwd.o: misc.h localefilter.h locale.h +passwd.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +passwd.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h passwd.o: ../../../pikotools/space/spaceparser.h passwd.o: ../../../pikotools/space/space.h passwd.o: ../../../pikotools/textstream/types.h @@ -2051,6 +2066,7 @@ patterncacher.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h patterncacher.o: ../../../ezc/src/functions.h ../../../pikotools/utf8/utf8.h patterncacher.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h patterncacher.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h +patterncacher.o: ../../../ezc/src/expressionparser.h patterncacher.o: ../../../ezc/src/patternparser.h htmltextstream.h patterncacher.o: ../../../winix/winixd/core/textstream.h patterncacher.o: ../../../winix/winixd/core/log.h @@ -2073,8 +2089,9 @@ patterns.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h patterns.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h patterns.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h patterns.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -patterns.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -patterns.o: htmltextstream.h ../../../winix/winixd/core/textstream.h +patterns.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +patterns.o: ../../../ezc/src/patternparser.h htmltextstream.h +patterns.o: ../../../winix/winixd/core/textstream.h patterns.o: ../../../pikotools/membuffer/membuffer.h patterns.o: ../../../pikotools/textstream/types.h patterns.o: ../../../winix/winixd/core/log.h @@ -2088,8 +2105,9 @@ priv.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h priv.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h priv.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h priv.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -priv.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h misc.h -priv.o: localefilter.h locale.h ../../../pikotools/space/spaceparser.h +priv.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +priv.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h +priv.o: ../../../pikotools/space/spaceparser.h priv.o: ../../../pikotools/space/space.h priv.o: ../../../pikotools/textstream/types.h priv.o: ../../../pikotools/textstream/textstream.h @@ -2215,8 +2233,8 @@ rebus.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h rebus.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h rebus.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h rebus.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -rebus.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -rebus.o: misc.h localefilter.h locale.h +rebus.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +rebus.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h rebus.o: ../../../pikotools/space/spaceparser.h rebus.o: ../../../pikotools/space/space.h rebus.o: ../../../pikotools/textstream/types.h @@ -2296,8 +2314,8 @@ server.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h server.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h server.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h server.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -server.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -server.o: misc.h localefilter.h locale.h +server.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +server.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h server.o: ../../../pikotools/space/spaceparser.h server.o: ../../../pikotools/space/space.h server.o: ../../../pikotools/textstream/types.h @@ -2437,8 +2455,8 @@ slog.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h slog.o: ../../../ezc/src/functions.h ../../../pikotools/utf8/utf8.h slog.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h slog.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h -slog.o: ../../../ezc/src/patternparser.h htmltextstream.h -slog.o: ../../../winix/winixd/core/textstream.h +slog.o: ../../../ezc/src/expressionparser.h ../../../ezc/src/patternparser.h +slog.o: htmltextstream.h ../../../winix/winixd/core/textstream.h slog.o: ../../../pikotools/membuffer/membuffer.h slog.o: ../../../pikotools/textstream/types.h templates.h patterncacher.h slog.o: ../../../winix/winixd/core/item.h indexpatterns.h patterns.h @@ -2503,8 +2521,9 @@ stat.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h stat.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h stat.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h stat.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -stat.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h misc.h -stat.o: localefilter.h locale.h ../../../pikotools/space/spaceparser.h +stat.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +stat.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h +stat.o: ../../../pikotools/space/spaceparser.h stat.o: ../../../pikotools/space/space.h stat.o: ../../../pikotools/textstream/types.h stat.o: ../../../pikotools/textstream/textstream.h @@ -2584,8 +2603,9 @@ sys.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h sys.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h sys.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h sys.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -sys.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h misc.h -sys.o: localefilter.h locale.h ../../../pikotools/space/spaceparser.h +sys.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +sys.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h +sys.o: ../../../pikotools/space/spaceparser.h sys.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h sys.o: ../../../pikotools/textstream/textstream.h sys.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h @@ -2708,8 +2728,8 @@ template.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h template.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h template.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h template.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -template.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -template.o: misc.h localefilter.h locale.h +template.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +template.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h template.o: ../../../pikotools/space/spaceparser.h template.o: ../../../pikotools/space/space.h template.o: ../../../pikotools/textstream/types.h @@ -2795,8 +2815,9 @@ templates.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h templates.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h templates.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h templates.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -templates.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -templates.o: misc.h localefilter.h locale.h +templates.o: ../../../ezc/src/outstreams.h +templates.o: ../../../ezc/src/expressionparser.h +templates.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h templates.o: ../../../pikotools/space/spaceparser.h templates.o: ../../../pikotools/space/space.h templates.o: ../../../pikotools/textstream/types.h @@ -2946,6 +2967,7 @@ textextstream.o: ../../../ezc/src/item.h ../../../ezc/src/cache.h textextstream.o: ../../../ezc/src/functions.h ../../../pikotools/utf8/utf8.h textextstream.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h textextstream.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h +textextstream.o: ../../../ezc/src/expressionparser.h textextstream.o: ../../../ezc/src/patternparser.h htmltextstream.h upload.o: ../../../winix/winixd/core/request.h templates.h upload.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h @@ -2953,8 +2975,8 @@ upload.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h upload.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h upload.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h upload.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -upload.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -upload.o: misc.h localefilter.h locale.h +upload.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +upload.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h upload.o: ../../../pikotools/space/spaceparser.h upload.o: ../../../pikotools/space/space.h upload.o: ../../../pikotools/textstream/types.h @@ -3036,8 +3058,8 @@ uptime.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h uptime.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h uptime.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h uptime.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -uptime.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -uptime.o: misc.h localefilter.h locale.h +uptime.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +uptime.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h uptime.o: ../../../pikotools/space/spaceparser.h uptime.o: ../../../pikotools/space/space.h uptime.o: ../../../pikotools/textstream/types.h @@ -3119,8 +3141,9 @@ user.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h user.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h user.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h user.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -user.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h misc.h -user.o: localefilter.h locale.h ../../../pikotools/space/spaceparser.h +user.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +user.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h +user.o: ../../../pikotools/space/spaceparser.h user.o: ../../../pikotools/space/space.h user.o: ../../../pikotools/textstream/types.h user.o: ../../../pikotools/textstream/textstream.h @@ -3200,8 +3223,9 @@ who.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h who.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h who.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h who.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -who.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h misc.h -who.o: localefilter.h locale.h ../../../pikotools/space/spaceparser.h +who.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +who.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h +who.o: ../../../pikotools/space/spaceparser.h who.o: ../../../pikotools/space/space.h ../../../pikotools/textstream/types.h who.o: ../../../pikotools/textstream/textstream.h who.o: ../../../pikotools/space/space.h ../../../pikotools/date/date.h @@ -3275,8 +3299,8 @@ winix.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h winix.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h winix.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h winix.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h -winix.o: ../../../ezc/src/outstreams.h ../../../ezc/src/patternparser.h -winix.o: misc.h localefilter.h locale.h +winix.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h +winix.o: ../../../ezc/src/patternparser.h misc.h localefilter.h locale.h winix.o: ../../../pikotools/space/spaceparser.h winix.o: ../../../pikotools/space/space.h winix.o: ../../../pikotools/textstream/types.h diff --git a/winixd/templates/dir.cpp b/winixd/templates/dir.cpp index 3ce01a8..6e3fd74 100644 --- a/winixd/templates/dir.cpp +++ b/winixd/templates/dir.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2016, Tomasz Sowa + * Copyright (c) 2008-2018, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -192,7 +192,7 @@ void dir_has_parents(Info & i) dir_parents_str += '/'; } - i.res = IsSubString(i.par, dir_parents_str); + i.res = PT::IsSubString(i.par, dir_parents_str); } diff --git a/winixd/templates/doc.cpp b/winixd/templates/doc.cpp index efea1b9..719c697 100644 --- a/winixd/templates/doc.cpp +++ b/winixd/templates/doc.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2014, Tomasz Sowa + * Copyright (c) 2008-2018, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -163,8 +163,8 @@ void doc_css_tab_file_is_global(Info & i) // !! z konfiga wziasc przedrostki if( doc_css_index < cur->session->last_css.size() ) - i.res = IsSubString(L"http://", cur->session->last_css[doc_css_index].c_str()) || - IsSubString(L"https://", cur->session->last_css[doc_css_index].c_str()); + i.res = PT::IsSubString(L"http://", cur->session->last_css[doc_css_index].c_str()) || + PT::IsSubString(L"https://", cur->session->last_css[doc_css_index].c_str()); } diff --git a/winixd/templates/mount.cpp b/winixd/templates/mount.cpp index 50c7c3f..75a26ab 100644 --- a/winixd/templates/mount.cpp +++ b/winixd/templates/mount.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (c) 2008-2014, Tomasz Sowa + * Copyright (c) 2008-2018, Tomasz Sowa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -122,8 +122,8 @@ void mount_css_tab_file_is_global(Info & i) int parcss = system->mounts.MountParCss(); if( mount_css_index < cur->mount->param[parcss].arg.size() ) - i.res = IsSubString(L"http://", cur->mount->param[parcss].arg[mount_css_index].c_str()) || - IsSubString(L"https://", cur->mount->param[parcss].arg[mount_css_index].c_str()); + i.res = PT::IsSubString(L"http://", cur->mount->param[parcss].arg[mount_css_index].c_str()) || + PT::IsSubString(L"https://", cur->mount->param[parcss].arg[mount_css_index].c_str()); }