diff --git a/winixd/Makefile.dep b/winixd/Makefile.dep index bb1352f..06226b2 100644 --- a/winixd/Makefile.dep +++ b/winixd/Makefile.dep @@ -1 +1 @@ -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/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 +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 diff --git a/winixd/core/bbcodeparser.cpp b/winixd/core/bbcodeparser.cpp index 889387d..6559d4d 100644 --- a/winixd/core/bbcodeparser.cpp +++ b/winixd/core/bbcodeparser.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 @@ -66,36 +66,46 @@ return false; } -bool BBCODEParser::IsOpeningTagMark() +bool BBCODEParser::IsOpeningTagMark(wchar_t c) { - return (*pchar == '['); + return (c == '['); } -// there are no commentaries in bbcode -bool BBCODEParser::IsOpeningCommentaryTagMark() +bool BBCODEParser::IsClosingTagMark(wchar_t c) +{ + return (c == ']'); +} + +bool BBCODEParser::IsClosingXmlSimpleTagMark(wchar_t c) { return false; } + +// there are no commentaries in bbcode +bool BBCODEParser::IsOpeningCommentaryTagMark(const wchar_t *) +{ + return false; +} + + +size_t BBCODEParser::OpeningCommentaryTagMarkSize() +{ + return 0; +} + + + bool BBCODEParser::SkipCommentaryTagIfExists() { return false; } -bool BBCODEParser::IsClosingTagMark() -{ - return (*pchar == ']'); -} -bool BBCODEParser::IsClosingXmlSimpleTagMark() -{ - return false; -} - @@ -446,7 +456,7 @@ bool first_tag_removed = false; while( *pchar != 0 ) { - if( IsOpeningTagMark() ) + if( IsOpeningTagMark(*pchar) ) { if( IsClosingTagForLastItem() ) { diff --git a/winixd/core/bbcodeparser.h b/winixd/core/bbcodeparser.h index aacac88..6302dc4 100644 --- a/winixd/core/bbcodeparser.h +++ b/winixd/core/bbcodeparser.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 @@ -62,10 +62,12 @@ class BBCODEParser : public HTMLFilter virtual void Init(); virtual void Uninit(); - virtual bool IsOpeningTagMark(); - virtual bool IsOpeningCommentaryTagMark(); - virtual bool IsClosingTagMark(); - virtual bool IsClosingXmlSimpleTagMark(); + virtual bool IsOpeningTagMark(wchar_t c); + virtual bool IsClosingTagMark(wchar_t c); + virtual bool IsClosingXmlSimpleTagMark(wchar_t c); + + virtual bool IsOpeningCommentaryTagMark(const wchar_t *); + virtual size_t OpeningCommentaryTagMarkSize(); virtual bool IsValidCharForName(int c); virtual void CheckExceptions(); diff --git a/winixd/core/htmlfilter.cpp b/winixd/core/htmlfilter.cpp index e6c216b..dc257fa 100644 --- a/winixd/core/htmlfilter.cpp +++ b/winixd/core/htmlfilter.cpp @@ -88,7 +88,13 @@ void HTMLFilter::Uninit() void HTMLFilter::Filter(const std::wstring & in, std::wstring & out) { -size_t out_projected_len = in.size() * 2 + 1; + if( &in == &out ) + { + // out cannot be the same string as in + return; + } + + size_t out_projected_len = in.size() * 2 + 1; if( out.capacity() < out_projected_len ) out.reserve(out_projected_len); @@ -105,8 +111,10 @@ void HTMLFilter::SetSomeDefaults() wrap_line = 0; orphan_mode = orphan_nbsp; safe_mode = false; - skip_all_tags = false; + skip_tags = false; skip_commentaries = false; + skip_entities = false; + analyze_entities = false; } @@ -238,13 +246,34 @@ void HTMLFilter::SafeMode(bool safe_mode_) } -void HTMLFilter::SkipAllTags(bool skip_all_tags, bool skip_commentaries) +void HTMLFilter::SkipTags(bool skip_tags) +{ + this->skip_tags = skip_tags; +} + +void HTMLFilter::SkipCommentaries(bool skip_commentaries) { - this->skip_all_tags = skip_all_tags; this->skip_commentaries = skip_commentaries; } +void HTMLFilter::SkipEntities(bool skip_entities) +{ + this->skip_entities = skip_entities; + + if( this->skip_entities ) + { + this->analyze_entities = true; + } +} + + +void HTMLFilter::AnalyzeEntities(bool analyze_entities) +{ + this->analyze_entities = analyze_entities; +} + + void HTMLFilter::SetNoFilterTag(const std::wstring & tag_name) { no_filter_tag = tag_name; @@ -380,7 +409,7 @@ bool HTMLFilter::IsClosingTagForLastItem() pchar += LastItem().name.size(); SkipWhite(); - if( IsClosingTagMark() ) + if( IsClosingTagMark(*pchar) ) { pchar += 1; return true; @@ -402,7 +431,7 @@ const wchar_t * end = pchar; while( *pchar != 0 ) { - if( IsOpeningTagMark() ) + if( IsOpeningTagMark(*pchar) ) { if( IsClosingTagForLastItem() ) { @@ -450,12 +479,12 @@ void HTMLFilter::SkipAndCheckClosingTag() } } else - if( !is_quoted && LastItem().type == Item::opening && IsClosingXmlSimpleTagMark() ) // closing xml tag: default '/' + if( !is_quoted && LastItem().type == Item::opening && IsClosingXmlSimpleTagMark(*pchar) ) // closing xml tag: default '/' { LastItem().type = Item::simple; } else - if( !is_quoted && IsClosingTagMark() ) + if( !is_quoted && IsClosingTagMark(*pchar) ) { ++pchar; break; @@ -470,7 +499,7 @@ bool HTMLFilter::IsValidCharForName(int c) if( (c>='a' && c<='z') || (c>='A' && c<='Z') || (c>='0' && c<='9') || - c=='-' || c=='!' ) + c=='-' || c=='!' || c==':') // : for namespace character return true; return false; @@ -489,6 +518,18 @@ return false; } +bool HTMLFilter::IsValidCharForEntityName(int c) +{ + if( (c>='a' && c<='z') || + (c>='A' && c<='Z') || + (c>='0' && c<='9') || + c=='#' ) + return true; + +return false; +} + + void HTMLFilter::ReadItemName() { size_t i; @@ -521,12 +562,28 @@ size_t i; +void HTMLFilter::ReadItemAttrValueAdd(const wchar_t * value_start, const wchar_t * value_end) +{ + attr_value.push_back(std::wstring()); + + if( analyze_entities ) + { + AnalyzeEntitiesAndPut(value_start, value_end, &attr_value.back()); + } + else + { + attr_value.back().append(value_start, value_end); + } +} + + void HTMLFilter::ReadItemAttrValue(bool has_quote, wchar_t quote_char) { size_t i; attr_value.clear(); - attr_value_temp.clear(); + const wchar_t * value_start = pchar; + size_t value_len = 0; // how many non white characters for(i=0 ; *pchar ; ++i, ++pchar ) { @@ -537,30 +594,28 @@ size_t i; } else { - if( IsClosingTagMark() || *pchar == 10 || IsWhite(*pchar) ) + if( IsClosingTagMark(*pchar) || *pchar == 10 || IsWhite(*pchar) ) break; } if( *pchar==10 || IsWhite(*pchar) ) { - if( !attr_value_temp.empty() ) - { - attr_value.push_back(attr_value_temp); - attr_value_temp.clear(); - } + if( value_len > 0 && value_len <= WINIX_HTMLFILTER_ATTR_VALUE_MAXLEN ) + ReadItemAttrValueAdd(value_start, pchar); + + value_len = 0; } else - if( i < WINIX_HTMLFILTER_ATTR_VALUE_MAXLEN ) { - attr_value_temp += *pchar; + if( value_len == 0 ) + value_start = pchar; + + value_len += 1; } } - if( !attr_value_temp.empty() ) - { - attr_value.push_back(attr_value_temp); - attr_value_temp.clear(); - } + if( value_len > 0 && value_len <= WINIX_HTMLFILTER_ATTR_VALUE_MAXLEN ) + ReadItemAttrValueAdd(value_start, pchar); } @@ -611,6 +666,57 @@ void HTMLFilter::Put(const std::wstring & str) } +// out can be null +void HTMLFilter::AnalyzeEntitiesAndPut(const wchar_t * str, const wchar_t * end, std::wstring * out) +{ + size_t epsilon = 8; // !! IMPROVE ME put as a constant + const wchar_t * old_str = str; + + while( str < end ) + { + if( IsStartingEntityMark(*str) ) + { + const wchar_t * entity_start = str; + str += 1; // skip & + + for(size_t i=0 ; *str && IsValidCharForEntityName(*str) && i < epsilon ; ++i, ++str) + { + } + + if( IsEndingEntityMark(*str) && str - entity_start > 1 ) // at least one character in entity name + { + if( out ) + out->append(old_str, entity_start); + else + Put(old_str, entity_start); + + str += 1; // skip ; + + if( !skip_entities ) + { + if( out ) + out->append(entity_start, str); + else + Put(entity_start, str); + } + + EntityFound(entity_start + 1, str - 1); // without & and ; + old_str = str; + } + } + else + { + str += 1; + } + } + + if( out ) + out->append(old_str, end); + else + Put(old_str, end); +} + + int HTMLFilter::CheckOrphan(const wchar_t * str, const wchar_t * end, const std::wstring & orphan_str) @@ -700,12 +806,12 @@ return CheckOrphan(str, end, LastItem().porphans->tab); // (useful in html entities) // !! dodac sprawdzanie czy dlugosc stringu nie jest mala tez (end-str) // i wtedy tez nie dodajemy zadnego znaku -bool HTMLFilter::HasSemiloconAround(const wchar_t * str, const wchar_t * end) +bool HTMLFilter::HasEntityEndAround(const wchar_t * str, const wchar_t * end) { -size_t i, epsilon = 8; +size_t i, epsilon = 8;// !! IMPROVE ME put as a constant for(i=0 ; str < end && i= break_after && (was_semicolon || !HasSemiloconAround(str, end)) ) + if( break_after != 0 && non_whites >= break_after && (was_entity_end || !HasEntityEndAround(str, end)) ) { Put(word, str); word = str; @@ -739,10 +845,13 @@ bool was_semicolon = false; CheckLineWrap(); } - was_semicolon = (*str == ';'); + was_entity_end = (IsEndingEntityMark(*str)); } - Put(word, str); + if( analyze_entities ) + AnalyzeEntitiesAndPut(word, str, nullptr); + else + Put(word, str); } @@ -880,7 +989,7 @@ return true; void HTMLFilter::PutClosingTag(const wchar_t * tag) { - if( skip_all_tags || !IsTagSafe(tag) ) + if( skip_tags || !IsTagSafe(tag) ) return; PutOpeningTagMark(); @@ -925,28 +1034,28 @@ void HTMLFilter::PutNewLine() // we assume the size of the opening mark to be one -bool HTMLFilter::IsOpeningTagMark() +bool HTMLFilter::IsOpeningTagMark(wchar_t c) { - return (*pchar == '<'); + return (c == '<'); } // we assume the size of the closing mark to be one -bool HTMLFilter::IsClosingTagMark() +bool HTMLFilter::IsClosingTagMark(wchar_t c) { - return (*pchar == '>'); + return (c == '>'); } // the slash at the end (without '>' character) // we assume the size of the mark to be one -bool HTMLFilter::IsClosingXmlSimpleTagMark() +bool HTMLFilter::IsClosingXmlSimpleTagMark(wchar_t c) { - return (*pchar == '/'); + return (c == '/'); } -bool HTMLFilter::IsOpeningCommentaryTagMark() +bool HTMLFilter::IsOpeningCommentaryTagMark(const wchar_t * str) { static wchar_t comm_open[] = L""; size_t comm_close_len = sizeof(comm_close) / sizeof(wchar_t) - 1; - if( !IsOpeningCommentaryTagMark() ) + if( !IsOpeningCommentaryTagMark(pchar) ) return false; pchar += OpeningCommentaryTagMarkSize(); @@ -1012,7 +1133,7 @@ void HTMLFilter::ReadNormalTextSkipWhite(const wchar_t * & start, const wchar_t start = pchar; // exception for the commentary tag - if( IsOpeningCommentaryTagMark() || !IsOpeningTagMark() ) + if( IsOpeningCommentaryTagMark(pchar) || !IsOpeningTagMark(*pchar) ) { PutNewLine(); PutTabs(stack_len); @@ -1049,7 +1170,7 @@ const wchar_t * last_non_white = pchar; } else { - if( IsOpeningTagMark() ) + if( IsOpeningTagMark(*pchar) ) break; if( !IsWhite(*pchar) ) @@ -1067,7 +1188,7 @@ const wchar_t * last_non_white = pchar; bool HTMLFilter::PrintOpeningItem() { - if( skip_all_tags || IsNameEqual(no_filter_tag, LastItem().name) ) + if( skip_tags || IsNameEqual(no_filter_tag, LastItem().name) ) return true; if( last_new_line ) @@ -1149,7 +1270,7 @@ void HTMLFilter::PrintItemAttr() { size_t i; - if( skip_all_tags || IsNameEqual(no_filter_tag, LastItem().name) ) + if( skip_tags || IsNameEqual(no_filter_tag, LastItem().name) ) return; Put(' '); @@ -1188,7 +1309,7 @@ void HTMLFilter::ReadItemSpecial() { LastItem().type = Item::special; - if( !skip_all_tags ) + if( !skip_tags ) PutOpeningTagMark(); const wchar_t * start = pchar; @@ -1197,7 +1318,7 @@ void HTMLFilter::ReadItemSpecial() ReadItemName(); SkipAndCheckClosingTag(); - if( !skip_all_tags && pchar > start ) + if( !skip_tags && pchar > start ) Put(start, pchar); // closing tag mark is printed directly from the source @@ -1219,7 +1340,7 @@ void HTMLFilter::ReadItemOpening() SkipAndCheckClosingTag(); // here LastItem().type can be changed to 'simple' - if( !skip_all_tags && !IsNameEqual(no_filter_tag, LastItem().name) ) + if( !skip_tags && !IsNameEqual(no_filter_tag, LastItem().name) ) { if( LastItem().type == Item::simple ) Put(L" /"); @@ -1234,6 +1355,10 @@ void HTMLFilter::ItemFound() { } +void HTMLFilter::EntityFound(const wchar_t * str, const wchar_t * end) +{ +} + bool HTMLFilter::ReadItem() { @@ -1315,6 +1440,8 @@ bool HTMLFilter::IsNameEqual(const std::wstring & name1, const std::wstring & na // len characters from both strings must be equal +// IMPROVE ME change name to something like IsBeginningNameEqual +// and move to text.h (pikotools) bool HTMLFilter::IsNameEqual(const wchar_t * name1, const wchar_t * name2, size_t len) { for( ; *name1!=0 && *name2!=0 && len>0 ; ++name1, ++name2, --len ) @@ -1382,10 +1509,10 @@ void HTMLFilter::CheckExceptions() // in safe_mode the script tag is ignored if( !safe_mode && IsLastTag(L"script") ) - PutEverythingUntilClosingTag(!skip_all_tags); + PutEverythingUntilClosingTag(!skip_tags); if( IsLastTag(L"pre") || IsLastTag(L"textarea") ) - PutEverythingUntilClosingTag(!skip_all_tags); + PutEverythingUntilClosingTag(!skip_tags); if( IsLastTag(no_filter_tag) ) PutEverythingUntilClosingTag(false); @@ -1421,7 +1548,7 @@ int i; for(int z=(int)stack_len-2 ; z>=i ; --z) { - if( !skip_all_tags && pstack[z].new_line ) + if( !skip_tags && pstack[z].new_line ) { PutNewLine(); PutTabs(z); @@ -1471,7 +1598,7 @@ void HTMLFilter::CheckClosingTags() if( IsNameEqual(pstack[stack_len-1].name, pstack[stack_len-2].name) ) { // last closing tag is from the previous one - if( !skip_all_tags && pstack[stack_len-2].new_line ) + if( !skip_tags && pstack[stack_len-2].new_line ) { PutNewLine(); PutTabs(stack_len-2); @@ -1494,7 +1621,7 @@ bool HTMLFilter::PrintRest() const wchar_t * start = pchar; // in safe mode we do not print the rest html code - if( safe_mode || skip_all_tags ) + if( safe_mode || skip_tags ) return false; while( *pchar ) diff --git a/winixd/core/htmlfilter.h b/winixd/core/htmlfilter.h index d7f3009..daa1643 100644 --- a/winixd/core/htmlfilter.h +++ b/winixd/core/htmlfilter.h @@ -128,13 +128,11 @@ public: // false by default void TrimWhite(bool trim); - // first tabs in a tree // default: 2 (spaces) // set 0 to turn off void InsertTabs(size_t tabsize); - // set a name of a html tag which will be used as 'nofilter' tag // elements between such tags are not filtered (similarly as in 
 and