From 9830b0a50f9aa0ac2de51f9c049a577acf113751 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Tue, 10 Jul 2012 16:50:59 +0000 Subject: [PATCH] added: to misc: UrlEncode which takes PT::TextStreamBase as an argument added: to misc: QEncode which takes PT::TextStreamBase as an argument added: to Locale: methods: IsKey, Get which takes PT::TextStreamBase as an argument git-svn-id: svn://ttmath.org/publicrep/winix/trunk@860 e52654a7-88a9-db11-a3e9-0013d4bc506e --- core/Makefile.dep | 581 +++++++----- core/misc.cpp | 62 +- core/misc.h | 178 +++- db/Makefile.dep | 51 +- functions/Makefile.dep | 1740 ++++++++++++++++++---------------- main/Makefile.dep | 49 +- notify/Makefile.dep | 65 +- plugins/export/Makefile.dep | 69 +- plugins/gallery/Makefile.dep | 79 +- plugins/group/Makefile.dep | 57 +- plugins/menu/Makefile.dep | 59 +- plugins/stats/Makefile.dep | 85 +- plugins/thread/Makefile.dep | 174 ++-- plugins/ticket/Makefile.dep | 160 ++-- templates/Makefile.dep | 666 +++++++------ templates/locale.h | 43 + 16 files changed, 2413 insertions(+), 1705 deletions(-) diff --git a/core/Makefile.dep b/core/Makefile.dep index 79cdf28..16cd714 100755 --- a/core/Makefile.dep +++ b/core/Makefile.dep @@ -6,7 +6,10 @@ app.o: ../../pikotools/space/space.h htmlfilter.h system.h job.h basethread.h app.o: synchro.h ../../pikotools/space/space.h dirs.h item.h app.o: ../../pikotools/date/date.h dircontainer.h ../db/db.h ../db/dbbase.h app.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h -app.o: requesttypes.h ../core/error.h ../db/dbitemquery.h ../core/item.h +app.o: requesttypes.h ../../pikotools/textstream/textstream.h +app.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h +app.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h +app.o: ../core/error.h ../db/dbitemquery.h ../core/item.h app.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h app.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h app.o: logmanipulators.h slog.h cur.h request.h error.h @@ -16,16 +19,16 @@ app.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h app.o: ../templates/localefilter.h ../../ezc/src/ezc.h app.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h app.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -app.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h -app.o: ../notify/notifythread.h ../core/basethread.h -app.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -app.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h -app.o: users.h groups.h group.h loadavg.h image.h threadmanager.h timezones.h -app.o: timezone.h sessionmanager.h sessioncontainer.h -app.o: ../functions/functions.h ../functions/functionbase.h ../core/request.h -app.o: ../core/system.h ../core/synchro.h ../functions/functionparser.h -app.o: ../core/cur.h ../functions/adduser.h ../functions/cat.h -app.o: ../functions/chmod.h ../functions/privchanger.h ../functions/chown.h +app.o: ../../ezc/src/stringconv.h ../notify/notifythread.h +app.o: ../core/basethread.h ../notify/templatesnotify.h ../core/config.h +app.o: ../core/users.h ugcontainer.h lastcontainer.h mounts.h mountparser.h +app.o: crypt.h run.h users.h groups.h group.h loadavg.h image.h +app.o: threadmanager.h timezones.h timezone.h sessionmanager.h +app.o: sessioncontainer.h ../functions/functions.h +app.o: ../functions/functionbase.h ../core/request.h ../core/system.h +app.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h +app.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h +app.o: ../functions/privchanger.h ../functions/chown.h app.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h app.o: ../functions/download.h ../functions/emacs.h ../functions/env.h app.o: ../functions/last.h ../functions/login.h ../functions/logout.h @@ -51,15 +54,23 @@ compress.o: request.h requesttypes.h item.h ../../pikotools/space/space.h compress.o: ../../pikotools/date/date.h error.h config.h compress.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h compress.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h -compress.o: misc.h session.h user.h plugindata.h rebus.h mount.h +compress.o: misc.h ../../pikotools/textstream/textstream.h +compress.o: ../../pikotools/convert/convert.h +compress.o: ../../pikotools/convert/inttostr.h +compress.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h +compress.o: session.h user.h plugindata.h rebus.h mount.h compress.o: ../templates/locale.h config.o: config.h ../../pikotools/space/spaceparser.h config.o: ../../pikotools/space/space.h htmlfilter.h log.h textstream.h config.o: logmanipulators.h slog.h cur.h request.h requesttypes.h item.h config.o: ../../pikotools/space/space.h ../../pikotools/date/date.h error.h -config.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h -config.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h plugin.h -config.o: pluginmsg.h system.h job.h basethread.h synchro.h dirs.h +config.o: ../templates/htmltextstream.h ../core/textstream.h misc.h +config.o: ../../pikotools/textstream/textstream.h +config.o: ../../pikotools/convert/convert.h +config.o: ../../pikotools/convert/inttostr.h +config.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h +config.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h +config.o: plugin.h pluginmsg.h system.h job.h basethread.h synchro.h dirs.h config.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h config.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h config.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h @@ -69,26 +80,25 @@ config.o: ../templates/locale.h ../templates/localefilter.h config.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h config.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h config.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h -config.o: ../../pikotools/utf8/utf8.h ../notify/notifythread.h -config.o: ../core/basethread.h ../notify/templatesnotify.h ../core/config.h -config.o: ../core/users.h ugcontainer.h lastcontainer.h mounts.h -config.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h -config.o: image.h threadmanager.h timezones.h timezone.h sessionmanager.h -config.o: sessioncontainer.h ../functions/functions.h -config.o: ../functions/functionbase.h ../core/request.h ../core/system.h -config.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h -config.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h -config.o: ../functions/privchanger.h ../functions/chown.h -config.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h -config.o: ../functions/download.h ../functions/emacs.h ../functions/env.h -config.o: ../functions/last.h ../functions/login.h ../functions/logout.h -config.o: ../functions/ln.h ../functions/ls.h ../functions/man.h -config.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h -config.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h -config.o: ../functions/priv.h ../functions/pw.h ../functions/reload.h -config.o: ../functions/rm.h ../functions/rmuser.h ../functions/sort.h -config.o: ../functions/specialdefault.h ../functions/stat.h -config.o: ../functions/subject.h ../functions/template.h +config.o: ../notify/notifythread.h ../core/basethread.h +config.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h +config.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h +config.o: users.h groups.h group.h loadavg.h image.h threadmanager.h +config.o: timezones.h timezone.h sessionmanager.h sessioncontainer.h +config.o: ../functions/functions.h ../functions/functionbase.h +config.o: ../core/request.h ../core/system.h ../core/synchro.h +config.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h +config.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h +config.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h +config.o: ../functions/default.h ../functions/download.h ../functions/emacs.h +config.o: ../functions/env.h ../functions/last.h ../functions/login.h +config.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h +config.o: ../functions/man.h ../functions/meta.h ../functions/mkdir.h +config.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h +config.o: ../functions/passwd.h ../functions/priv.h ../functions/pw.h +config.o: ../functions/reload.h ../functions/rm.h ../functions/rmuser.h +config.o: ../functions/sort.h ../functions/specialdefault.h +config.o: ../functions/stat.h ../functions/subject.h ../functions/template.h config.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h config.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h config.o: ../core/htmlfilter.h ../templates/templates.h @@ -99,21 +109,31 @@ crypt.o: crypt.h run.h config.h ../../pikotools/space/spaceparser.h crypt.o: ../../pikotools/space/space.h htmlfilter.h user.h crypt.o: ../../pikotools/utf8/utf8.h misc.h item.h crypt.o: ../../pikotools/space/space.h ../../pikotools/date/date.h -crypt.o: requesttypes.h log.h textstream.h logmanipulators.h slog.h cur.h -crypt.o: request.h error.h ../templates/htmltextstream.h ../core/textstream.h -crypt.o: session.h plugindata.h rebus.h mount.h ../templates/locale.h +crypt.o: requesttypes.h ../../pikotools/textstream/textstream.h +crypt.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h +crypt.o: ../../pikotools/membuffer/membuffer.h log.h textstream.h +crypt.o: logmanipulators.h slog.h cur.h request.h error.h +crypt.o: ../templates/htmltextstream.h ../core/textstream.h session.h +crypt.o: plugindata.h rebus.h mount.h ../templates/locale.h dircontainer.o: dircontainer.h item.h ../../pikotools/space/space.h dircontainer.o: ../../pikotools/date/date.h log.h textstream.h dircontainer.o: logmanipulators.h slog.h cur.h request.h requesttypes.h dircontainer.o: error.h config.h ../../pikotools/space/spaceparser.h dircontainer.o: ../../pikotools/space/space.h htmlfilter.h dircontainer.o: ../templates/htmltextstream.h ../core/textstream.h misc.h -dircontainer.o: session.h user.h plugindata.h rebus.h mount.h -dircontainer.o: ../templates/locale.h +dircontainer.o: ../../pikotools/textstream/textstream.h +dircontainer.o: ../../pikotools/convert/convert.h +dircontainer.o: ../../pikotools/convert/inttostr.h +dircontainer.o: ../../pikotools/membuffer/membuffer.h +dircontainer.o: ../../pikotools/utf8/utf8.h session.h user.h plugindata.h +dircontainer.o: rebus.h mount.h ../templates/locale.h dirs.o: dirs.h item.h ../../pikotools/space/space.h dirs.o: ../../pikotools/date/date.h dircontainer.h ../db/db.h ../db/dbbase.h dirs.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h -dirs.o: requesttypes.h ../core/error.h ../../pikotools/space/spaceparser.h +dirs.o: requesttypes.h ../../pikotools/textstream/textstream.h +dirs.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h +dirs.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h +dirs.o: ../core/error.h ../../pikotools/space/spaceparser.h dirs.o: ../../pikotools/space/space.h ../db/dbitemquery.h ../core/item.h dirs.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h dirs.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h @@ -124,14 +144,17 @@ dirs.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h dirs.o: ../templates/localefilter.h ../../ezc/src/ezc.h dirs.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h dirs.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -dirs.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h -dirs.o: ../notify/notifythread.h ../core/basethread.h -dirs.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -dirs.o: ugcontainer.h lastcontainer.h +dirs.o: ../../ezc/src/stringconv.h ../notify/notifythread.h +dirs.o: ../core/basethread.h ../notify/templatesnotify.h ../core/config.h +dirs.o: ../core/users.h ugcontainer.h lastcontainer.h groups.o: groups.h group.h ugcontainer.h ../db/db.h ../db/dbbase.h groups.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h groups.o: item.h ../../pikotools/space/space.h ../../pikotools/date/date.h -groups.o: requesttypes.h ../core/error.h ../../pikotools/space/spaceparser.h +groups.o: requesttypes.h ../../pikotools/textstream/textstream.h +groups.o: ../../pikotools/convert/convert.h +groups.o: ../../pikotools/convert/inttostr.h +groups.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h +groups.o: ../core/error.h ../../pikotools/space/spaceparser.h groups.o: ../../pikotools/space/space.h ../db/dbitemquery.h ../core/item.h groups.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h groups.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h @@ -143,14 +166,17 @@ httpsimpleparser.o: httpsimpleparser.h image.o: image.h basethread.h synchro.h textstream.h ../db/db.h image.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h image.o: ../core/textstream.h misc.h item.h ../../pikotools/space/space.h -image.o: ../../pikotools/date/date.h requesttypes.h ../core/error.h -image.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -image.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h -image.o: ../core/user.h ../core/group.h ../core/dircontainer.h -image.o: ../core/ugcontainer.h log.h logmanipulators.h slog.h cur.h request.h -image.o: error.h config.h htmlfilter.h ../templates/htmltextstream.h -image.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h -image.o: ../core/config.h ../../pikotools/utf8/utf8.h system.h job.h dirs.h +image.o: ../../pikotools/date/date.h requesttypes.h +image.o: ../../pikotools/textstream/textstream.h +image.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h +image.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h +image.o: ../core/error.h ../../pikotools/space/spaceparser.h +image.o: ../../pikotools/space/space.h ../db/dbitemquery.h ../core/item.h +image.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h +image.o: ../core/dircontainer.h ../core/ugcontainer.h log.h logmanipulators.h +image.o: slog.h cur.h request.h error.h config.h htmlfilter.h +image.o: ../templates/htmltextstream.h session.h user.h plugindata.h rebus.h +image.o: mount.h ../templates/locale.h ../core/config.h system.h job.h dirs.h image.o: dircontainer.h ../notify/notify.h ../notify/notifypool.h image.o: ../templates/patterns.h ../templates/locale.h image.o: ../templates/localefilter.h ../../ezc/src/ezc.h @@ -182,34 +208,40 @@ image.o: ../templates/patterncacher.h ../templates/indexpatterns.h image.o: ../templates/patterns.h ../templates/changepatterns.h image.o: ../templates/htmltextstream.h ../core/sessionmanager.h item.o: item.h ../../pikotools/space/space.h ../../pikotools/date/date.h -item.o: misc.h requesttypes.h crypt.h run.h config.h -item.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -item.o: htmlfilter.h user.h +item.o: misc.h requesttypes.h ../../pikotools/textstream/textstream.h +item.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h +item.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h +item.o: crypt.h run.h config.h ../../pikotools/space/spaceparser.h +item.o: ../../pikotools/space/space.h htmlfilter.h user.h job.o: job.h basethread.h synchro.h ../../pikotools/space/space.h plugin.h job.o: pluginmsg.h log.h textstream.h logmanipulators.h slog.h cur.h job.o: request.h requesttypes.h item.h ../../pikotools/date/date.h error.h job.o: config.h ../../pikotools/space/spaceparser.h job.o: ../../pikotools/space/space.h htmlfilter.h -job.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h -job.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h system.h -job.o: dirs.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h -job.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h -job.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h -job.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h -job.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h +job.o: ../templates/htmltextstream.h ../core/textstream.h misc.h +job.o: ../../pikotools/textstream/textstream.h +job.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h +job.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h +job.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h +job.o: system.h dirs.h dircontainer.h ../db/db.h ../db/dbbase.h +job.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h +job.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h +job.o: ../core/user.h ../core/group.h ../core/dircontainer.h +job.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h +job.o: ../templates/patterns.h ../templates/locale.h job.o: ../templates/localefilter.h ../../ezc/src/ezc.h job.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h job.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -job.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h -job.o: ../notify/notifythread.h ../core/basethread.h -job.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -job.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h -job.o: users.h groups.h group.h loadavg.h image.h threadmanager.h timezones.h -job.o: timezone.h sessionmanager.h sessioncontainer.h -job.o: ../functions/functions.h ../functions/functionbase.h ../core/request.h -job.o: ../core/system.h ../core/synchro.h ../functions/functionparser.h -job.o: ../core/cur.h ../functions/adduser.h ../functions/cat.h -job.o: ../functions/chmod.h ../functions/privchanger.h ../functions/chown.h +job.o: ../../ezc/src/stringconv.h ../notify/notifythread.h +job.o: ../core/basethread.h ../notify/templatesnotify.h ../core/config.h +job.o: ../core/users.h ugcontainer.h lastcontainer.h mounts.h mountparser.h +job.o: crypt.h run.h users.h groups.h group.h loadavg.h image.h +job.o: threadmanager.h timezones.h timezone.h sessionmanager.h +job.o: sessioncontainer.h ../functions/functions.h +job.o: ../functions/functionbase.h ../core/request.h ../core/system.h +job.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h +job.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h +job.o: ../functions/privchanger.h ../functions/chown.h job.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h job.o: ../functions/download.h ../functions/emacs.h ../functions/env.h job.o: ../functions/last.h ../functions/login.h ../functions/logout.h @@ -232,34 +264,47 @@ lastcontainer.o: requesttypes.h item.h ../../pikotools/space/space.h error.h lastcontainer.o: config.h ../../pikotools/space/spaceparser.h lastcontainer.o: ../../pikotools/space/space.h htmlfilter.h lastcontainer.o: ../templates/htmltextstream.h ../core/textstream.h misc.h -lastcontainer.o: session.h user.h plugindata.h rebus.h mount.h -lastcontainer.o: ../templates/locale.h +lastcontainer.o: ../../pikotools/textstream/textstream.h +lastcontainer.o: ../../pikotools/convert/convert.h +lastcontainer.o: ../../pikotools/convert/inttostr.h +lastcontainer.o: ../../pikotools/membuffer/membuffer.h +lastcontainer.o: ../../pikotools/utf8/utf8.h session.h user.h plugindata.h +lastcontainer.o: rebus.h mount.h ../templates/locale.h loadavg.o: loadavg.h log.h textstream.h logmanipulators.h slog.h cur.h loadavg.o: request.h requesttypes.h item.h ../../pikotools/space/space.h loadavg.o: ../../pikotools/date/date.h error.h config.h loadavg.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h loadavg.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h -loadavg.o: misc.h session.h user.h plugindata.h rebus.h mount.h +loadavg.o: misc.h ../../pikotools/textstream/textstream.h +loadavg.o: ../../pikotools/convert/convert.h +loadavg.o: ../../pikotools/convert/inttostr.h +loadavg.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h +loadavg.o: session.h user.h plugindata.h rebus.h mount.h loadavg.o: ../templates/locale.h log.o: log.h textstream.h logmanipulators.h slog.h cur.h request.h log.o: requesttypes.h item.h ../../pikotools/space/space.h log.o: ../../pikotools/date/date.h error.h config.h log.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h log.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h misc.h +log.o: ../../pikotools/textstream/textstream.h +log.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h +log.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h log.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h -log.o: ../../pikotools/utf8/utf8.h misc.o: misc.h item.h ../../pikotools/space/space.h -misc.o: ../../pikotools/date/date.h requesttypes.h log.h textstream.h -misc.o: logmanipulators.h slog.h cur.h request.h error.h config.h -misc.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -misc.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h -misc.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h +misc.o: ../../pikotools/date/date.h requesttypes.h +misc.o: ../../pikotools/textstream/textstream.h +misc.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h +misc.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h +misc.o: log.h textstream.h logmanipulators.h slog.h cur.h request.h error.h +misc.o: config.h ../../pikotools/space/spaceparser.h +misc.o: ../../pikotools/space/space.h htmlfilter.h +misc.o: ../templates/htmltextstream.h ../core/textstream.h session.h user.h +misc.o: plugindata.h rebus.h mount.h ../templates/locale.h misc.o: ../templates/templates.h ../../ezc/src/ezc.h misc.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h misc.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -misc.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h -misc.o: ../templates/patterncacher.h ../core/item.h -misc.o: ../templates/indexpatterns.h ../templates/patterns.h +misc.o: ../../ezc/src/stringconv.h ../templates/patterncacher.h +misc.o: ../core/item.h ../templates/indexpatterns.h ../templates/patterns.h misc.o: ../templates/locale.h ../templates/changepatterns.h misc.o: ../templates/htmltextstream.h ../templates/localefilter.h misc.o: ../core/config.h ../core/cur.h ../core/system.h @@ -269,10 +314,18 @@ misc.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h misc.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h mount.o: mount.h misc.h item.h ../../pikotools/space/space.h mount.o: ../../pikotools/date/date.h requesttypes.h +mount.o: ../../pikotools/textstream/textstream.h +mount.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h +mount.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h mountparser.o: mountparser.h mount.h item.h ../../pikotools/space/space.h mountparser.o: ../../pikotools/date/date.h dirs.h dircontainer.h ../db/db.h mountparser.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h -mountparser.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h +mountparser.o: ../core/textstream.h misc.h requesttypes.h +mountparser.o: ../../pikotools/textstream/textstream.h +mountparser.o: ../../pikotools/convert/convert.h +mountparser.o: ../../pikotools/convert/inttostr.h +mountparser.o: ../../pikotools/membuffer/membuffer.h +mountparser.o: ../../pikotools/utf8/utf8.h ../core/error.h mountparser.o: ../../pikotools/space/spaceparser.h mountparser.o: ../../pikotools/space/space.h ../db/dbitemquery.h mountparser.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h @@ -285,14 +338,17 @@ mountparser.o: ../templates/patterns.h ../templates/locale.h mountparser.o: ../templates/localefilter.h ../../ezc/src/ezc.h mountparser.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h mountparser.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -mountparser.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h -mountparser.o: ../notify/notifythread.h ../core/basethread.h -mountparser.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -mountparser.o: ugcontainer.h lastcontainer.h +mountparser.o: ../../ezc/src/stringconv.h ../notify/notifythread.h +mountparser.o: ../core/basethread.h ../notify/templatesnotify.h +mountparser.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h mounts.o: mounts.h mount.h error.h dirs.h item.h mounts.o: ../../pikotools/space/space.h ../../pikotools/date/date.h mounts.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h mounts.o: ../db/dbtextstream.h ../core/textstream.h misc.h requesttypes.h +mounts.o: ../../pikotools/textstream/textstream.h +mounts.o: ../../pikotools/convert/convert.h +mounts.o: ../../pikotools/convert/inttostr.h +mounts.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h mounts.o: ../core/error.h ../../pikotools/space/spaceparser.h mounts.o: ../../pikotools/space/space.h ../db/dbitemquery.h ../core/item.h mounts.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h @@ -304,13 +360,12 @@ mounts.o: ../templates/patterns.h ../templates/locale.h mounts.o: ../templates/localefilter.h ../../ezc/src/ezc.h mounts.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h mounts.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -mounts.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h -mounts.o: ../notify/notifythread.h ../core/basethread.h -mounts.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -mounts.o: ugcontainer.h lastcontainer.h mountparser.h plugin.h pluginmsg.h -mounts.o: system.h job.h basethread.h synchro.h crypt.h run.h users.h -mounts.o: groups.h group.h loadavg.h image.h threadmanager.h timezones.h -mounts.o: timezone.h sessionmanager.h sessioncontainer.h +mounts.o: ../../ezc/src/stringconv.h ../notify/notifythread.h +mounts.o: ../core/basethread.h ../notify/templatesnotify.h ../core/config.h +mounts.o: ../core/users.h ugcontainer.h lastcontainer.h mountparser.h +mounts.o: plugin.h pluginmsg.h system.h job.h basethread.h synchro.h crypt.h +mounts.o: run.h users.h groups.h group.h loadavg.h image.h threadmanager.h +mounts.o: timezones.h timezone.h sessionmanager.h sessioncontainer.h mounts.o: ../functions/functions.h ../functions/functionbase.h mounts.o: ../core/request.h ../core/system.h ../core/synchro.h mounts.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h @@ -336,37 +391,40 @@ plugin.o: cur.h request.h requesttypes.h item.h ../../pikotools/space/space.h plugin.o: ../../pikotools/date/date.h error.h config.h plugin.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h plugin.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h -plugin.o: misc.h session.h user.h plugindata.h rebus.h mount.h -plugin.o: ../templates/locale.h system.h job.h basethread.h synchro.h dirs.h -plugin.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h -plugin.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h -plugin.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h +plugin.o: misc.h ../../pikotools/textstream/textstream.h +plugin.o: ../../pikotools/convert/convert.h +plugin.o: ../../pikotools/convert/inttostr.h +plugin.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h +plugin.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h +plugin.o: system.h job.h basethread.h synchro.h dirs.h dircontainer.h +plugin.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h +plugin.o: ../core/error.h ../db/dbitemquery.h ../core/item.h +plugin.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h plugin.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h plugin.o: ../notify/notifypool.h ../templates/patterns.h plugin.o: ../templates/locale.h ../templates/localefilter.h plugin.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h plugin.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h plugin.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h -plugin.o: ../../pikotools/utf8/utf8.h ../notify/notifythread.h -plugin.o: ../core/basethread.h ../notify/templatesnotify.h ../core/config.h -plugin.o: ../core/users.h ugcontainer.h lastcontainer.h mounts.h -plugin.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h -plugin.o: image.h threadmanager.h timezones.h timezone.h sessionmanager.h -plugin.o: sessioncontainer.h ../functions/functions.h -plugin.o: ../functions/functionbase.h ../core/request.h ../core/system.h -plugin.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h -plugin.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h -plugin.o: ../functions/privchanger.h ../functions/chown.h -plugin.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h -plugin.o: ../functions/download.h ../functions/emacs.h ../functions/env.h -plugin.o: ../functions/last.h ../functions/login.h ../functions/logout.h -plugin.o: ../functions/ln.h ../functions/ls.h ../functions/man.h -plugin.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h -plugin.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h -plugin.o: ../functions/priv.h ../functions/pw.h ../functions/reload.h -plugin.o: ../functions/rm.h ../functions/rmuser.h ../functions/sort.h -plugin.o: ../functions/specialdefault.h ../functions/stat.h -plugin.o: ../functions/subject.h ../functions/template.h +plugin.o: ../notify/notifythread.h ../core/basethread.h +plugin.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h +plugin.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h +plugin.o: users.h groups.h group.h loadavg.h image.h threadmanager.h +plugin.o: timezones.h timezone.h sessionmanager.h sessioncontainer.h +plugin.o: ../functions/functions.h ../functions/functionbase.h +plugin.o: ../core/request.h ../core/system.h ../core/synchro.h +plugin.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h +plugin.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h +plugin.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h +plugin.o: ../functions/default.h ../functions/download.h ../functions/emacs.h +plugin.o: ../functions/env.h ../functions/last.h ../functions/login.h +plugin.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h +plugin.o: ../functions/man.h ../functions/meta.h ../functions/mkdir.h +plugin.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h +plugin.o: ../functions/passwd.h ../functions/priv.h ../functions/pw.h +plugin.o: ../functions/reload.h ../functions/rm.h ../functions/rmuser.h +plugin.o: ../functions/sort.h ../functions/specialdefault.h +plugin.o: ../functions/stat.h ../functions/subject.h ../functions/template.h plugin.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h plugin.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h plugin.o: ../core/htmlfilter.h ../templates/templates.h @@ -379,18 +437,22 @@ plugindata.o: ../../pikotools/space/space.h ../../pikotools/date/date.h plugindata.o: error.h config.h ../../pikotools/space/spaceparser.h plugindata.o: ../../pikotools/space/space.h htmlfilter.h plugindata.o: ../templates/htmltextstream.h ../core/textstream.h misc.h -plugindata.o: session.h user.h rebus.h mount.h ../templates/locale.h system.h -plugindata.o: job.h basethread.h synchro.h dirs.h dircontainer.h ../db/db.h -plugindata.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h -plugindata.o: ../core/error.h ../db/dbitemquery.h ../core/item.h -plugindata.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -plugindata.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h -plugindata.o: ../notify/notifypool.h ../templates/patterns.h -plugindata.o: ../templates/locale.h ../templates/localefilter.h -plugindata.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h -plugindata.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h -plugindata.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h -plugindata.o: ../../pikotools/utf8/utf8.h ../notify/notifythread.h +plugindata.o: ../../pikotools/textstream/textstream.h +plugindata.o: ../../pikotools/convert/convert.h +plugindata.o: ../../pikotools/convert/inttostr.h +plugindata.o: ../../pikotools/membuffer/membuffer.h +plugindata.o: ../../pikotools/utf8/utf8.h session.h user.h rebus.h mount.h +plugindata.o: ../templates/locale.h system.h job.h basethread.h synchro.h +plugindata.o: dirs.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +plugindata.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h +plugindata.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h +plugindata.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +plugindata.o: ../notify/notify.h ../notify/notifypool.h +plugindata.o: ../templates/patterns.h ../templates/locale.h +plugindata.o: ../templates/localefilter.h ../../ezc/src/ezc.h +plugindata.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h +plugindata.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h +plugindata.o: ../../ezc/src/stringconv.h ../notify/notifythread.h plugindata.o: ../core/basethread.h ../notify/templatesnotify.h plugindata.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h plugindata.o: mounts.h mountparser.h crypt.h run.h users.h groups.h group.h @@ -422,34 +484,45 @@ postmultiparser.o: postmultiparser.h error.h requesttypes.h config.h postmultiparser.o: ../../pikotools/space/spaceparser.h postmultiparser.o: ../../pikotools/space/space.h htmlfilter.h misc.h item.h postmultiparser.o: ../../pikotools/space/space.h ../../pikotools/date/date.h -postmultiparser.o: log.h textstream.h logmanipulators.h slog.h cur.h -postmultiparser.o: request.h ../templates/htmltextstream.h -postmultiparser.o: ../core/textstream.h session.h user.h plugindata.h rebus.h -postmultiparser.o: mount.h ../templates/locale.h ../../pikotools/utf8/utf8.h +postmultiparser.o: ../../pikotools/textstream/textstream.h +postmultiparser.o: ../../pikotools/convert/convert.h +postmultiparser.o: ../../pikotools/convert/inttostr.h +postmultiparser.o: ../../pikotools/membuffer/membuffer.h +postmultiparser.o: ../../pikotools/utf8/utf8.h log.h textstream.h +postmultiparser.o: logmanipulators.h slog.h cur.h request.h +postmultiparser.o: ../templates/htmltextstream.h ../core/textstream.h +postmultiparser.o: session.h user.h plugindata.h rebus.h mount.h +postmultiparser.o: ../templates/locale.h rebus.o: log.h textstream.h logmanipulators.h slog.h cur.h request.h rebus.o: requesttypes.h item.h ../../pikotools/space/space.h rebus.o: ../../pikotools/date/date.h error.h config.h rebus.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h rebus.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h -rebus.o: misc.h session.h user.h plugindata.h rebus.h mount.h -rebus.o: ../templates/locale.h +rebus.o: misc.h ../../pikotools/textstream/textstream.h +rebus.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h +rebus.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h +rebus.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h request.o: request.h requesttypes.h item.h ../../pikotools/space/space.h request.o: ../../pikotools/date/date.h error.h config.h request.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h request.o: htmlfilter.h textstream.h ../templates/htmltextstream.h -request.o: ../core/textstream.h misc.h log.h logmanipulators.h slog.h cur.h -request.o: session.h user.h plugindata.h rebus.h mount.h -request.o: ../templates/locale.h plugin.h pluginmsg.h system.h job.h -request.o: basethread.h synchro.h dirs.h dircontainer.h ../db/db.h -request.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h -request.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h -request.o: ../core/user.h ../core/group.h ../core/dircontainer.h -request.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h -request.o: ../templates/patterns.h ../templates/locale.h -request.o: ../templates/localefilter.h ../../ezc/src/ezc.h -request.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -request.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -request.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h +request.o: ../core/textstream.h misc.h +request.o: ../../pikotools/textstream/textstream.h +request.o: ../../pikotools/convert/convert.h +request.o: ../../pikotools/convert/inttostr.h +request.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h +request.o: log.h logmanipulators.h slog.h cur.h session.h user.h plugindata.h +request.o: rebus.h mount.h ../templates/locale.h plugin.h pluginmsg.h +request.o: system.h job.h basethread.h synchro.h dirs.h dircontainer.h +request.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h +request.o: ../core/error.h ../db/dbitemquery.h ../core/item.h +request.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h +request.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h +request.o: ../notify/notifypool.h ../templates/patterns.h +request.o: ../templates/locale.h ../templates/localefilter.h +request.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h +request.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h +request.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h request.o: ../notify/notifythread.h ../core/basethread.h request.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h request.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h @@ -481,10 +554,17 @@ run.o: requesttypes.h item.h ../../pikotools/space/space.h run.o: ../../pikotools/date/date.h error.h config.h run.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h run.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h misc.h +run.o: ../../pikotools/textstream/textstream.h +run.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h +run.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h run.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h session.o: session.h item.h ../../pikotools/space/space.h session.o: ../../pikotools/date/date.h error.h user.h plugindata.h rebus.h session.o: textstream.h misc.h requesttypes.h +session.o: ../../pikotools/textstream/textstream.h +session.o: ../../pikotools/convert/convert.h +session.o: ../../pikotools/convert/inttostr.h +session.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h sessioncontainer.o: sessioncontainer.h session.h item.h sessioncontainer.o: ../../pikotools/space/space.h ../../pikotools/date/date.h sessioncontainer.o: error.h user.h plugindata.h rebus.h textstream.h cur.h @@ -492,8 +572,12 @@ sessioncontainer.o: request.h requesttypes.h config.h sessioncontainer.o: ../../pikotools/space/spaceparser.h sessioncontainer.o: ../../pikotools/space/space.h htmlfilter.h sessioncontainer.o: ../templates/htmltextstream.h ../core/textstream.h misc.h -sessioncontainer.o: mount.h log.h logmanipulators.h slog.h -sessioncontainer.o: ../templates/locale.h +sessioncontainer.o: ../../pikotools/textstream/textstream.h +sessioncontainer.o: ../../pikotools/convert/convert.h +sessioncontainer.o: ../../pikotools/convert/inttostr.h +sessioncontainer.o: ../../pikotools/membuffer/membuffer.h +sessioncontainer.o: ../../pikotools/utf8/utf8.h mount.h log.h +sessioncontainer.o: logmanipulators.h slog.h ../templates/locale.h sessionmanager.o: sessionmanager.h sessioncontainer.h session.h item.h sessionmanager.o: ../../pikotools/space/space.h ../../pikotools/date/date.h sessionmanager.o: error.h user.h plugindata.h rebus.h textstream.h cur.h @@ -501,11 +585,16 @@ sessionmanager.o: request.h requesttypes.h config.h sessionmanager.o: ../../pikotools/space/spaceparser.h sessionmanager.o: ../../pikotools/space/space.h htmlfilter.h sessionmanager.o: ../templates/htmltextstream.h ../core/textstream.h misc.h -sessionmanager.o: mount.h lastcontainer.h system.h job.h basethread.h -sessionmanager.o: synchro.h dirs.h dircontainer.h ../db/db.h ../db/dbbase.h -sessionmanager.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h -sessionmanager.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h -sessionmanager.o: ../core/user.h ../core/group.h ../core/dircontainer.h +sessionmanager.o: ../../pikotools/textstream/textstream.h +sessionmanager.o: ../../pikotools/convert/convert.h +sessionmanager.o: ../../pikotools/convert/inttostr.h +sessionmanager.o: ../../pikotools/membuffer/membuffer.h +sessionmanager.o: ../../pikotools/utf8/utf8.h mount.h lastcontainer.h +sessionmanager.o: system.h job.h basethread.h synchro.h dirs.h dircontainer.h +sessionmanager.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h +sessionmanager.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h +sessionmanager.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h +sessionmanager.o: ../core/group.h ../core/dircontainer.h sessionmanager.o: ../core/ugcontainer.h log.h logmanipulators.h slog.h sessionmanager.o: ../templates/locale.h ../notify/notify.h sessionmanager.o: ../notify/notifypool.h ../templates/patterns.h @@ -513,14 +602,14 @@ sessionmanager.o: ../templates/locale.h ../templates/localefilter.h sessionmanager.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h sessionmanager.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h sessionmanager.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h -sessionmanager.o: ../../pikotools/utf8/utf8.h ../notify/notifythread.h -sessionmanager.o: ../core/basethread.h ../notify/templatesnotify.h -sessionmanager.o: ../core/config.h ../core/users.h ugcontainer.h mounts.h -sessionmanager.o: mountparser.h crypt.h run.h users.h groups.h group.h -sessionmanager.o: loadavg.h image.h threadmanager.h timezones.h timezone.h -sessionmanager.o: sessionparser.h plugin.h pluginmsg.h -sessionmanager.o: ../functions/functions.h ../functions/functionbase.h -sessionmanager.o: ../core/request.h ../core/system.h ../core/synchro.h +sessionmanager.o: ../notify/notifythread.h ../core/basethread.h +sessionmanager.o: ../notify/templatesnotify.h ../core/config.h +sessionmanager.o: ../core/users.h ugcontainer.h mounts.h mountparser.h +sessionmanager.o: crypt.h run.h users.h groups.h group.h loadavg.h image.h +sessionmanager.o: threadmanager.h timezones.h timezone.h sessionparser.h +sessionmanager.o: plugin.h pluginmsg.h ../functions/functions.h +sessionmanager.o: ../functions/functionbase.h ../core/request.h +sessionmanager.o: ../core/system.h ../core/synchro.h sessionmanager.o: ../functions/functionparser.h ../core/cur.h sessionmanager.o: ../functions/adduser.h ../functions/cat.h sessionmanager.o: ../functions/chmod.h ../functions/privchanger.h @@ -550,55 +639,66 @@ sessionparser.o: sessioncontainer.h cur.h request.h requesttypes.h config.h sessionparser.o: ../../pikotools/space/spaceparser.h sessionparser.o: ../../pikotools/space/space.h htmlfilter.h sessionparser.o: ../templates/htmltextstream.h ../core/textstream.h misc.h -sessionparser.o: mount.h users.h log.h logmanipulators.h slog.h -sessionparser.o: ../templates/locale.h +sessionparser.o: ../../pikotools/textstream/textstream.h +sessionparser.o: ../../pikotools/convert/convert.h +sessionparser.o: ../../pikotools/convert/inttostr.h +sessionparser.o: ../../pikotools/membuffer/membuffer.h +sessionparser.o: ../../pikotools/utf8/utf8.h mount.h users.h log.h +sessionparser.o: logmanipulators.h slog.h ../templates/locale.h slog.o: slog.h cur.h request.h requesttypes.h item.h slog.o: ../../pikotools/space/space.h ../../pikotools/date/date.h error.h slog.o: config.h ../../pikotools/space/spaceparser.h slog.o: ../../pikotools/space/space.h htmlfilter.h textstream.h -slog.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h -slog.o: user.h plugindata.h rebus.h mount.h logmanipulators.h +slog.o: ../templates/htmltextstream.h ../core/textstream.h misc.h +slog.o: ../../pikotools/textstream/textstream.h +slog.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h +slog.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h +slog.o: session.h user.h plugindata.h rebus.h mount.h logmanipulators.h slog.o: ../templates/locale.h synchro.o: synchro.h system.o: system.h job.h basethread.h synchro.h ../../pikotools/space/space.h system.o: dirs.h item.h ../../pikotools/date/date.h dircontainer.h ../db/db.h system.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h -system.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h -system.o: ../../pikotools/space/spaceparser.h ../../pikotools/space/space.h -system.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h -system.o: ../core/user.h ../core/group.h ../core/dircontainer.h -system.o: ../core/ugcontainer.h log.h textstream.h logmanipulators.h slog.h -system.o: cur.h request.h error.h config.h htmlfilter.h -system.o: ../templates/htmltextstream.h session.h user.h plugindata.h rebus.h -system.o: mount.h ../templates/locale.h ../notify/notify.h -system.o: ../notify/notifypool.h ../templates/patterns.h +system.o: ../core/textstream.h misc.h requesttypes.h +system.o: ../../pikotools/textstream/textstream.h +system.o: ../../pikotools/convert/convert.h +system.o: ../../pikotools/convert/inttostr.h +system.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h +system.o: ../core/error.h ../../pikotools/space/spaceparser.h +system.o: ../../pikotools/space/space.h ../db/dbitemquery.h ../core/item.h +system.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h +system.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h +system.o: logmanipulators.h slog.h cur.h request.h error.h config.h +system.o: htmlfilter.h ../templates/htmltextstream.h session.h user.h +system.o: plugindata.h rebus.h mount.h ../templates/locale.h +system.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h system.o: ../templates/locale.h ../templates/localefilter.h system.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h system.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h system.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h -system.o: ../../pikotools/utf8/utf8.h ../notify/notifythread.h -system.o: ../core/basethread.h ../notify/templatesnotify.h ../core/config.h -system.o: ../core/users.h ugcontainer.h lastcontainer.h mounts.h -system.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h -system.o: image.h threadmanager.h timezones.h timezone.h -system.o: ../templates/templates.h ../templates/patterncacher.h -system.o: ../templates/indexpatterns.h ../templates/patterns.h -system.o: ../templates/changepatterns.h ../templates/htmltextstream.h -system.o: ../core/cur.h ../core/system.h ../core/sessionmanager.h -system.o: ../core/htmlfilter.h ../functions/functions.h -system.o: ../functions/functionbase.h ../core/request.h ../core/synchro.h -system.o: ../functions/functionparser.h ../functions/adduser.h -system.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h -system.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h -system.o: ../functions/default.h ../functions/download.h ../functions/emacs.h -system.o: ../functions/env.h ../functions/last.h ../functions/login.h -system.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h -system.o: ../functions/man.h ../functions/meta.h ../functions/mkdir.h -system.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h -system.o: ../functions/passwd.h ../functions/priv.h ../functions/pw.h -system.o: ../functions/reload.h ../functions/rm.h ../functions/rmuser.h -system.o: ../functions/sort.h ../functions/specialdefault.h -system.o: ../functions/stat.h ../functions/subject.h ../functions/template.h +system.o: ../notify/notifythread.h ../core/basethread.h +system.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h +system.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h +system.o: users.h groups.h group.h loadavg.h image.h threadmanager.h +system.o: timezones.h timezone.h ../templates/templates.h +system.o: ../templates/patterncacher.h ../templates/indexpatterns.h +system.o: ../templates/patterns.h ../templates/changepatterns.h +system.o: ../templates/htmltextstream.h ../core/cur.h ../core/system.h +system.o: ../core/sessionmanager.h ../core/htmlfilter.h +system.o: ../functions/functions.h ../functions/functionbase.h +system.o: ../core/request.h ../core/synchro.h ../functions/functionparser.h +system.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h +system.o: ../functions/privchanger.h ../functions/chown.h +system.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h +system.o: ../functions/download.h ../functions/emacs.h ../functions/env.h +system.o: ../functions/last.h ../functions/login.h ../functions/logout.h +system.o: ../functions/ln.h ../functions/ls.h ../functions/man.h +system.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h +system.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h +system.o: ../functions/priv.h ../functions/pw.h ../functions/reload.h +system.o: ../functions/rm.h ../functions/rmuser.h ../functions/sort.h +system.o: ../functions/specialdefault.h ../functions/stat.h +system.o: ../functions/subject.h ../functions/template.h system.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h system.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h system.o: plugin.h pluginmsg.h sessionmanager.h sessioncontainer.h @@ -609,26 +709,41 @@ threadmanager.o: ../../pikotools/date/date.h error.h config.h threadmanager.o: ../../pikotools/space/spaceparser.h threadmanager.o: ../../pikotools/space/space.h htmlfilter.h threadmanager.o: ../templates/htmltextstream.h ../core/textstream.h misc.h -threadmanager.o: session.h user.h plugindata.h rebus.h mount.h -threadmanager.o: ../templates/locale.h +threadmanager.o: ../../pikotools/textstream/textstream.h +threadmanager.o: ../../pikotools/convert/convert.h +threadmanager.o: ../../pikotools/convert/inttostr.h +threadmanager.o: ../../pikotools/membuffer/membuffer.h +threadmanager.o: ../../pikotools/utf8/utf8.h session.h user.h plugindata.h +threadmanager.o: rebus.h mount.h ../templates/locale.h timezone.o: timezone.h ../../pikotools/date/date.h timezone.o: ../../pikotools/space/space.h misc.h item.h requesttypes.h +timezone.o: ../../pikotools/textstream/textstream.h +timezone.o: ../../pikotools/convert/convert.h +timezone.o: ../../pikotools/convert/inttostr.h +timezone.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h timezones.o: timezones.h timezone.h ../../pikotools/date/date.h timezones.o: ../../pikotools/space/space.h timezones.o: ../../pikotools/space/spaceparser.h -timezones.o: ../../pikotools/space/space.h misc.h item.h requesttypes.h log.h -timezones.o: textstream.h logmanipulators.h slog.h cur.h request.h error.h -timezones.o: config.h htmlfilter.h ../templates/htmltextstream.h -timezones.o: ../core/textstream.h session.h user.h plugindata.h rebus.h -timezones.o: mount.h ../templates/locale.h +timezones.o: ../../pikotools/space/space.h misc.h item.h requesttypes.h +timezones.o: ../../pikotools/textstream/textstream.h +timezones.o: ../../pikotools/convert/convert.h +timezones.o: ../../pikotools/convert/inttostr.h +timezones.o: ../../pikotools/membuffer/membuffer.h +timezones.o: ../../pikotools/utf8/utf8.h log.h textstream.h logmanipulators.h +timezones.o: slog.h cur.h request.h error.h config.h htmlfilter.h +timezones.o: ../templates/htmltextstream.h ../core/textstream.h session.h +timezones.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h user.o: user.h users.o: users.h sessionmanager.h sessioncontainer.h session.h item.h users.o: ../../pikotools/space/space.h ../../pikotools/date/date.h error.h users.o: user.h plugindata.h rebus.h textstream.h cur.h request.h users.o: requesttypes.h config.h ../../pikotools/space/spaceparser.h users.o: ../../pikotools/space/space.h htmlfilter.h -users.o: ../templates/htmltextstream.h ../core/textstream.h misc.h mount.h -users.o: lastcontainer.h system.h job.h basethread.h synchro.h dirs.h +users.o: ../templates/htmltextstream.h ../core/textstream.h misc.h +users.o: ../../pikotools/textstream/textstream.h +users.o: ../../pikotools/convert/convert.h ../../pikotools/convert/inttostr.h +users.o: ../../pikotools/membuffer/membuffer.h ../../pikotools/utf8/utf8.h +users.o: mount.h lastcontainer.h system.h job.h basethread.h synchro.h dirs.h users.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h users.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h users.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h @@ -638,25 +753,25 @@ users.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h users.o: ../templates/localefilter.h ../../ezc/src/ezc.h users.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h users.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -users.o: ../../ezc/src/stringconv.h ../../pikotools/utf8/utf8.h -users.o: ../notify/notifythread.h ../core/basethread.h -users.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -users.o: ugcontainer.h mounts.h mountparser.h crypt.h run.h groups.h group.h -users.o: loadavg.h image.h threadmanager.h timezones.h timezone.h plugin.h -users.o: pluginmsg.h ../functions/functions.h ../functions/functionbase.h -users.o: ../core/request.h ../core/system.h ../core/synchro.h -users.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h -users.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h -users.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h -users.o: ../functions/default.h ../functions/download.h ../functions/emacs.h -users.o: ../functions/env.h ../functions/last.h ../functions/login.h -users.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h -users.o: ../functions/man.h ../functions/meta.h ../functions/mkdir.h -users.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h -users.o: ../functions/passwd.h ../functions/priv.h ../functions/pw.h -users.o: ../functions/reload.h ../functions/rm.h ../functions/rmuser.h -users.o: ../functions/sort.h ../functions/specialdefault.h -users.o: ../functions/stat.h ../functions/subject.h ../functions/template.h +users.o: ../../ezc/src/stringconv.h ../notify/notifythread.h +users.o: ../core/basethread.h ../notify/templatesnotify.h ../core/config.h +users.o: ../core/users.h ugcontainer.h mounts.h mountparser.h crypt.h run.h +users.o: groups.h group.h loadavg.h image.h threadmanager.h timezones.h +users.o: timezone.h plugin.h pluginmsg.h ../functions/functions.h +users.o: ../functions/functionbase.h ../core/request.h ../core/system.h +users.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h +users.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h +users.o: ../functions/privchanger.h ../functions/chown.h +users.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h +users.o: ../functions/download.h ../functions/emacs.h ../functions/env.h +users.o: ../functions/last.h ../functions/login.h ../functions/logout.h +users.o: ../functions/ln.h ../functions/ls.h ../functions/man.h +users.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h +users.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h +users.o: ../functions/priv.h ../functions/pw.h ../functions/reload.h +users.o: ../functions/rm.h ../functions/rmuser.h ../functions/sort.h +users.o: ../functions/specialdefault.h ../functions/stat.h +users.o: ../functions/subject.h ../functions/template.h users.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h users.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h users.o: ../core/htmlfilter.h ../templates/templates.h diff --git a/core/misc.cpp b/core/misc.cpp index 165f68f..cd5363f 100755 --- a/core/misc.cpp +++ b/core/misc.cpp @@ -13,7 +13,6 @@ #include "misc.h" #include "log.h" #include "templates/templates.h" -#include "utf8/utf8.h" @@ -28,6 +27,8 @@ namespace misc_private std::ifstream get_file_content; std::string get_file_content_ansi; + + PT::WTextStream tmp_qencode; } @@ -1037,63 +1038,20 @@ void UrlEncode(const std::wstring & in, std::wstring & out, bool clear_out) -void QEncodeAddChar(wchar_t c, std::string & out) -{ - if( (c>='A' && c<='Z') || - (c>='a' && c<='z') || - (c>='0' && c<='9') ) - { - out += char(c); - } - else - { - char buf1[10]; - char buf2[10]; - - size_t len1 = sizeof(buf1) / sizeof(char); - size_t len2 = sizeof(buf2) / sizeof(char); - size_t len = PT::IntToUTF8(int(c), buf1, len1); - - for(size_t i=0 ; i -void UrlEncode(char c, StringType & out, bool clear_out = true) + + + +// thread safe +template +void UrlEncode(char c, + PT::TextStreamBase & out, + bool clear_out = true) { char buffer[10]; size_t buflen = sizeof(buffer)/sizeof(char); @@ -722,21 +731,89 @@ size_t buflen = sizeof(buffer)/sizeof(char); (c >= '0' && c <= '9') || c == '.' || c == ',' || c == '-' || c == '_' || c == '(' || c == ')' ) { - out += c; + out << c; } else { Toa(static_cast(c), buffer, buflen, 16); - out += '%'; + out << '%'; if( buffer[1] == 0 ) - out += '0'; // there is only one character in the buffer + out << '0'; // there is only one character in the buffer - for(size_t i=0 ; buffer[i] != 0 ; ++i) - out += buffer[i]; + out << buffer; } } + +// thread safe +template +void UrlEncode(const char * in, + PT::TextStreamBase & out, + bool clear_out = true) +{ + if( clear_out ) + out.clear(); + + for(size_t i=0 ; in[i] != 0 ; ++i) + UrlEncode(in[i], out, false); +} + + +// thread safe +template +void UrlEncode(const std::string & in, + PT::TextStreamBase & out, + bool clear_out = true) +{ + UrlEncode(in.c_str(), out, clear_out); +} + + + +// not thread safe +template +void UrlEncode(const wchar_t * in, + PT::TextStreamBase & out, + bool clear_out = true) +{ +static std::string ain; + + PT::WideToUTF8(in, ain); + + if( clear_out ) + out.clear(); + + for(size_t i=0 ; i < ain.size() ; ++i) + UrlEncode(ain[i], out, false); +} + + +// not thread safe +template +void UrlEncode(const std::wstring & in, + PT::TextStreamBase & out, + bool clear_out = true) +{ + UrlEncode(in.c_str(), out, clear_out); +} + + + +// no thread safe +template +void UrlEncode(char c, StringType & out, bool clear_out = true) +{ +static PT::TextStream tmp; + + UrlEncode(c, tmp); + tmp.to_string(out, clear_out); +} + + +// !! IMROVE ME we need some UrlEncode methods with PT::TextBuffer instead of std::string + + void UrlEncode(const char * in, std::string & out, bool clear_out = true); void UrlEncode(const std::string & in, std::string & out, bool clear_out = true); void UrlEncode(const wchar_t * in, std::string & out, bool clear_out = true); @@ -745,8 +822,95 @@ void UrlEncode(const wchar_t * in, std::wstring & out, bool clear_out = true); void UrlEncode(const std::wstring & in, std::wstring & out, bool clear_out = true); + + +template +void QEncodeAddChar(char_type c, PT::TextStreamBase & out) +{ + if( (c>='A' && c<='Z') || + (c>='a' && c<='z') || + (c>='0' && c<='9') ) + { + out << c; + } + else + { + char buf1[10]; + char buf2[10]; + + size_t len1 = sizeof(buf1) / sizeof(char); + size_t len2 = sizeof(buf2) / sizeof(char); + size_t len = PT::IntToUTF8(int(c), buf1, len1); + + for(size_t i=0 ; i +void QEncode(const wchar_t * in, PT::TextStreamBase & out, + bool clear = true) +{ + if( clear ) + out.clear(); + + out << "=?UTF-8?Q?"; + + for( ; *in ; ++in) + QEncodeAddChar(*in, out); + + out << "?="; +} + + +template +void QEncode(const std::wstring & in, PT::TextStreamBase & out, + bool clear = true) +{ + if( clear ) + out.clear(); + + out << "=?UTF-8?Q?"; + + // do not use QEncode(in.c_str()) as 'in' can have a zero byte + for(size_t i=0 ; i + bool IsKey(const PT::TextStreamBase & key, + bool try_default_too = true); + // checking whether there is a 'key' in the lang_id language // or in the default language if try_default_too is true bool IsKey(const wchar_t * key, size_t lang_id, bool try_default_too = true); bool IsKey(const std::wstring & key, size_t lang_id, bool try_default_too = true) const; + template + bool IsKey(const PT::TextStreamBase & key, + size_t lang_id, bool try_default_too = true); + // returning a value for a specific key const std::wstring & Get(const wchar_t * key, bool try_default_too = true); const std::wstring & Get(const wchar_t * key, size_t lang_id, bool try_default_too = true); const std::wstring & Get(const std::wstring & key, bool try_default_too = true) const; const std::wstring & Get(const std::wstring & key, size_t lang_id, bool try_default_too = true) const; + template + const std::wstring & Get(const PT::TextStreamBase & key, + bool try_default_too = true); + // lists // current limitation: // we are looking only in 'space.table' so lists with only one item are not found @@ -194,4 +207,34 @@ private: }; +template +bool Locale::IsKey(const PT::TextStreamBase & key, + bool try_default_too) +{ + key.to_string(key_str); + return IsKey(key_str, try_default_too); +} + + +template +bool Locale::IsKey(const PT::TextStreamBase & key, + size_t lang_id, bool try_default_too) +{ + key.to_string(key_str); + return IsKey(key_str, lang_id, try_default_too); +} + + + +template +const std::wstring & Locale::Get(const PT::TextStreamBase & key, + bool try_default_too) +{ + key.to_string(key_str); + return Get(key_str, try_default_too); +} + + + + #endif