From 06f42dd9cbac78ffb3c4b058a9c0e06c21e187d7 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Fri, 24 Jun 2011 20:53:21 +0000 Subject: [PATCH] changed: winix 'upload' function is a file manager now we're using an jquery upload plugin added: Item struct has new rows: hash, hash_type, file_size, sort_index added: css mount parameter you can specify css files there, and javascript wysiwyg editors (ckeditor, tinymce) can make use of it changed: post parsers can parse post variables with the same name (a postfix is added in such a case) added: common_dir parameter to the config this is a path to common directory (directory with common static files) it is needed to the 'css' mount parameter git-svn-id: svn://ttmath.org/publicrep/winix/trunk@746 e52654a7-88a9-db11-a3e9-0013d4bc506e --- core/Makefile.dep | 378 ++++---- core/app.cpp | 4 +- core/config.cpp | 7 +- core/config.h | 8 + core/crypt.cpp | 4 +- core/crypt.h | 2 +- core/error.h | 1 + core/item.cpp | 8 +- core/item.h | 88 +- core/misc.cpp | 78 +- core/misc.h | 10 + core/postmultiparser.cpp | 52 +- core/postmultiparser.h | 34 +- core/postparser.h | 36 +- core/request.cpp | 21 +- core/request.h | 10 +- core/requesttypes.h | 3 +- core/session.h | 5 + core/system.cpp | 57 ++ core/system.h | 5 + db/Makefile.dep | 24 +- db/db.cpp | 107 ++- db/db.h | 12 +- db/dbitemcolumns.cpp | 11 +- db/dbitemcolumns.h | 6 +- db/dbitemquery.cpp | 3 +- db/dbitemquery.h | 5 +- functions/Makefile.dep | 1409 ++++++++++++++-------------- functions/ckeditor.cpp | 17 +- functions/ckeditor.h | 4 +- functions/rm.cpp | 43 +- functions/rm.h | 1 + functions/tinymce.cpp | 18 +- functions/tinymce.h | 4 +- functions/upload.cpp | 67 +- functions/upload.h | 4 + functions/vim.cpp | 63 +- html/fun_cat.html | 22 +- html/fun_ckeditor.html | 4 +- html/fun_upload.html | 113 ++- html/index_head_functions_add.html | 37 +- locale/en | 30 +- locale/pl | 29 +- main/Makefile.dep | 14 +- notify/Makefile.dep | 50 +- plugins/gallery/Makefile.dep | 125 ++- plugins/groupitem/Makefile.dep | 24 +- plugins/stats/Makefile.dep | 27 +- plugins/thread/Makefile.dep | 192 ++-- plugins/ticket/Makefile.dep | 290 +++--- static/layout1/winix.css | 5 + templates/Makefile.dep | 347 ++++--- templates/doc.cpp | 65 +- templates/item.cpp | 29 + templates/mount.cpp | 80 ++ templates/templates.cpp | 30 + templates/templates.h | 23 +- templates/upload.cpp | 2 + 58 files changed, 2462 insertions(+), 1685 deletions(-) diff --git a/core/Makefile.dep b/core/Makefile.dep index 2fd2e83..ab35dfe 100755 --- a/core/Makefile.dep +++ b/core/Makefile.dep @@ -3,26 +3,27 @@ acceptbaseparser.o: acceptbaseparser.h app.o: app.h config.h confparser.h htmlfilter.h system.h dirs.h item.h app.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h -app.o: ../db/dbtextstream.h ../core/textstream.h misc.h ../core/error.h -app.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h -app.o: ../core/user.h ../core/group.h ../core/dircontainer.h -app.o: ../core/ugcontainer.h log.h textstream.h logmanipulators.h slog.h -app.o: cur.h request.h requesttypes.h error.h ../templates/htmltextstream.h -app.o: session.h user.h plugindata.h rebus.h ../templates/locale.h -app.o: ../core/confparser.h ../notify/notify.h ../notify/notifypool.h -app.o: ../templates/misc.h ../templates/localefilter.h ../templates/locale.h -app.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -app.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h -app.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h -app.o: ../templates/htmltextstream.h ../notify/notifythread.h -app.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h -app.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h -app.o: mounts.h mount.h mountparser.h crypt.h run.h users.h groups.h group.h -app.o: loadavg.h thumb.h basethread.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: ../db/dbtextstream.h ../core/textstream.h misc.h requesttypes.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 +app.o: ../templates/htmltextstream.h session.h user.h plugindata.h rebus.h +app.o: mount.h ../templates/locale.h ../core/confparser.h ../notify/notify.h +app.o: ../notify/notifypool.h ../templates/misc.h ../templates/localefilter.h +app.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.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 ../templates/htmltextstream.h +app.o: ../notify/notifythread.h ../core/basethread.h synchro.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 thumb.h basethread.h +app.o: sessionmanager.h 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/last.h app.o: ../functions/login.h ../functions/logout.h ../functions/ln.h @@ -41,18 +42,18 @@ app.o: acceptbaseparser.h plugin.h pluginmsg.h basethread.o: basethread.h log.h textstream.h logmanipulators.h slog.h cur.h basethread.o: request.h requesttypes.h item.h error.h config.h confparser.h basethread.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h -basethread.o: misc.h session.h user.h plugindata.h rebus.h +basethread.o: misc.h session.h user.h plugindata.h rebus.h mount.h basethread.o: ../templates/locale.h ../core/confparser.h bbcodeparser.o: bbcodeparser.h htmlfilter.h compress.o: compress.h log.h textstream.h logmanipulators.h slog.h cur.h compress.o: request.h requesttypes.h item.h error.h config.h confparser.h compress.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h -compress.o: misc.h session.h user.h plugindata.h rebus.h +compress.o: misc.h session.h user.h plugindata.h rebus.h mount.h compress.o: ../templates/locale.h ../core/confparser.h config.o: config.h confparser.h htmlfilter.h log.h textstream.h config.o: logmanipulators.h slog.h cur.h request.h requesttypes.h item.h config.o: error.h ../templates/htmltextstream.h ../core/textstream.h misc.h -config.o: session.h user.h plugindata.h rebus.h ../templates/locale.h +config.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h config.o: ../core/confparser.h plugin.h pluginmsg.h system.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 @@ -66,19 +67,18 @@ config.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h config.o: ../templates/htmltextstream.h ../notify/notifythread.h config.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h config.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h -config.o: mounts.h mount.h mountparser.h crypt.h run.h users.h groups.h -config.o: group.h loadavg.h thumb.h basethread.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/last.h -config.o: ../functions/login.h ../functions/logout.h ../functions/ln.h -config.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h -config.o: ../functions/nicedit.h ../functions/node.h ../functions/priv.h -config.o: ../functions/reload.h ../functions/rm.h +config.o: mounts.h mountparser.h crypt.h run.h users.h groups.h group.h +config.o: loadavg.h thumb.h basethread.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/last.h ../functions/login.h ../functions/logout.h +config.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h +config.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h +config.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h config.o: ../functions/specialdefault.h ../functions/stat.h config.o: ../functions/subject.h ../functions/template.h config.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h @@ -87,28 +87,29 @@ config.o: ../core/htmlfilter.h ../templates/templates.h config.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h config.o: ../core/httpsimpleparser.h ../core/log.h config.o: ../templates/indexpatterns.h ../core/sessionmanager.h -confparser.o: confparser.h misc.h item.h ../../ezc/src/utf8.h +confparser.o: confparser.h misc.h item.h requesttypes.h ../../ezc/src/utf8.h crypt.o: crypt.h run.h config.h confparser.h htmlfilter.h user.h -crypt.o: ../../ezc/src/utf8.h misc.h item.h log.h textstream.h -crypt.o: logmanipulators.h slog.h cur.h request.h requesttypes.h error.h +crypt.o: ../../ezc/src/utf8.h misc.h item.h requesttypes.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 ../templates/locale.h ../core/confparser.h +crypt.o: plugindata.h rebus.h mount.h ../templates/locale.h +crypt.o: ../core/confparser.h dircontainer.o: dircontainer.h item.h log.h textstream.h logmanipulators.h dircontainer.o: slog.h cur.h request.h requesttypes.h error.h config.h dircontainer.o: confparser.h htmlfilter.h ../templates/htmltextstream.h dircontainer.o: ../core/textstream.h misc.h session.h user.h plugindata.h -dircontainer.o: rebus.h ../templates/locale.h ../core/confparser.h +dircontainer.o: rebus.h mount.h ../templates/locale.h ../core/confparser.h dirs.o: dirs.h item.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h -dirs.o: ../db/dbtextstream.h ../core/textstream.h misc.h ../core/error.h -dirs.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h -dirs.o: ../core/user.h ../core/group.h ../core/dircontainer.h -dirs.o: ../core/ugcontainer.h log.h textstream.h logmanipulators.h slog.h -dirs.o: cur.h request.h requesttypes.h error.h config.h confparser.h -dirs.o: htmlfilter.h ../templates/htmltextstream.h session.h user.h -dirs.o: plugindata.h rebus.h ../templates/locale.h ../core/confparser.h -dirs.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -dirs.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h -dirs.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h +dirs.o: ../db/dbtextstream.h ../core/textstream.h misc.h requesttypes.h +dirs.o: ../core/error.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 +dirs.o: logmanipulators.h slog.h cur.h request.h error.h config.h +dirs.o: confparser.h htmlfilter.h ../templates/htmltextstream.h session.h +dirs.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h +dirs.o: ../core/confparser.h ../notify/notify.h ../notify/notifypool.h +dirs.o: ../templates/misc.h ../templates/localefilter.h ../templates/locale.h +dirs.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h dirs.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h dirs.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h dirs.o: ../templates/htmltextstream.h ../notify/notifythread.h @@ -116,57 +117,59 @@ dirs.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h dirs.o: ../core/config.h ../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 ../core/error.h ../db/dbitemquery.h ../core/item.h -groups.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h +groups.o: item.h requesttypes.h ../core/error.h ../db/dbitemquery.h +groups.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h groups.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h -groups.o: logmanipulators.h slog.h cur.h request.h requesttypes.h error.h -groups.o: config.h confparser.h htmlfilter.h ../templates/htmltextstream.h -groups.o: session.h user.h plugindata.h rebus.h ../templates/locale.h +groups.o: logmanipulators.h slog.h cur.h request.h error.h config.h +groups.o: confparser.h htmlfilter.h ../templates/htmltextstream.h session.h +groups.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h groups.o: ../core/confparser.h htmlfilter.o: htmlfilter.h httpsimpleparser.o: httpsimpleparser.h -item.o: item.h misc.h +item.o: item.h misc.h requesttypes.h crypt.h run.h config.h confparser.h +item.o: htmlfilter.h user.h lastcontainer.o: lastcontainer.h log.h textstream.h logmanipulators.h slog.h lastcontainer.o: cur.h request.h requesttypes.h item.h error.h config.h lastcontainer.o: confparser.h htmlfilter.h ../templates/htmltextstream.h lastcontainer.o: ../core/textstream.h misc.h session.h user.h plugindata.h -lastcontainer.o: rebus.h ../templates/locale.h ../core/confparser.h +lastcontainer.o: rebus.h mount.h ../templates/locale.h ../core/confparser.h loadavg.o: loadavg.h log.h textstream.h logmanipulators.h slog.h cur.h loadavg.o: request.h requesttypes.h item.h error.h config.h confparser.h loadavg.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h -loadavg.o: misc.h session.h user.h plugindata.h rebus.h ../templates/locale.h -loadavg.o: ../core/confparser.h +loadavg.o: misc.h session.h user.h plugindata.h rebus.h mount.h +loadavg.o: ../templates/locale.h ../core/confparser.h log.o: log.h textstream.h logmanipulators.h slog.h cur.h request.h log.o: requesttypes.h item.h error.h config.h confparser.h htmlfilter.h log.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h -log.o: user.h plugindata.h rebus.h ../templates/locale.h ../core/confparser.h -log.o: ../../ezc/src/utf8.h -misc.o: misc.h item.h log.h textstream.h logmanipulators.h slog.h cur.h -misc.o: request.h requesttypes.h error.h config.h confparser.h htmlfilter.h +log.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h +log.o: ../core/confparser.h ../../ezc/src/utf8.h +misc.o: misc.h item.h requesttypes.h log.h textstream.h logmanipulators.h +misc.o: slog.h cur.h request.h error.h config.h confparser.h htmlfilter.h misc.o: ../templates/htmltextstream.h ../core/textstream.h session.h user.h -misc.o: plugindata.h rebus.h ../templates/locale.h ../core/confparser.h -misc.o: ../templates/templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.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 ../templates/patterncacher.h -misc.o: ../core/item.h ../templates/ckeditorgetparser.h -misc.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h +misc.o: plugindata.h rebus.h mount.h ../templates/locale.h +misc.o: ../core/confparser.h ../templates/templates.h ../../ezc/src/ezc.h +misc.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h +misc.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h +misc.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h +misc.o: ../templates/patterncacher.h ../core/item.h +misc.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h +misc.o: ../core/log.h ../templates/indexpatterns.h misc.o: ../templates/localefilter.h ../templates/locale.h ../core/config.h misc.o: ../templates/htmltextstream.h ../core/cur.h ../core/system.h misc.o: ../core/sessionmanager.h ../core/htmlfilter.h ../db/db.h misc.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h 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 +mount.o: mount.h misc.h item.h requesttypes.h mountparser.o: mountparser.h mount.h item.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 ../core/error.h +mountparser.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h mountparser.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h mountparser.o: ../core/user.h ../core/group.h ../core/dircontainer.h mountparser.o: ../core/ugcontainer.h log.h textstream.h logmanipulators.h -mountparser.o: slog.h cur.h request.h requesttypes.h error.h config.h -mountparser.o: confparser.h htmlfilter.h ../templates/htmltextstream.h -mountparser.o: session.h user.h plugindata.h rebus.h ../templates/locale.h +mountparser.o: slog.h cur.h request.h error.h config.h confparser.h +mountparser.o: htmlfilter.h ../templates/htmltextstream.h session.h user.h +mountparser.o: plugindata.h rebus.h ../templates/locale.h mountparser.o: ../core/confparser.h ../notify/notify.h ../notify/notifypool.h mountparser.o: ../templates/misc.h ../templates/localefilter.h mountparser.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h @@ -178,33 +181,34 @@ mountparser.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h mountparser.o: ugcontainer.h lastcontainer.h mounts.o: mounts.h mount.h error.h dirs.h item.h dircontainer.h ../db/db.h mounts.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h -mounts.o: ../core/textstream.h misc.h ../core/error.h ../db/dbitemquery.h -mounts.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h -mounts.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h -mounts.o: logmanipulators.h slog.h cur.h request.h requesttypes.h config.h -mounts.o: confparser.h htmlfilter.h ../templates/htmltextstream.h session.h -mounts.o: user.h plugindata.h rebus.h ../templates/locale.h -mounts.o: ../core/confparser.h ../notify/notify.h ../notify/notifypool.h -mounts.o: ../templates/misc.h ../templates/localefilter.h -mounts.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.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 ../templates/htmltextstream.h -mounts.o: ../notify/notifythread.h ../core/basethread.h synchro.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 crypt.h run.h users.h groups.h group.h loadavg.h thumb.h -mounts.o: basethread.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 -mounts.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h -mounts.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h -mounts.o: ../functions/default.h ../functions/download.h ../functions/emacs.h -mounts.o: ../functions/last.h ../functions/login.h ../functions/logout.h -mounts.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h -mounts.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h -mounts.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h +mounts.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h +mounts.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h +mounts.o: ../core/user.h ../core/group.h ../core/dircontainer.h +mounts.o: ../core/ugcontainer.h log.h textstream.h logmanipulators.h slog.h +mounts.o: cur.h request.h config.h confparser.h htmlfilter.h +mounts.o: ../templates/htmltextstream.h session.h user.h plugindata.h rebus.h +mounts.o: ../templates/locale.h ../core/confparser.h ../notify/notify.h +mounts.o: ../notify/notifypool.h ../templates/misc.h +mounts.o: ../templates/localefilter.h ../templates/locale.h +mounts.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +mounts.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h +mounts.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h +mounts.o: ../templates/htmltextstream.h ../notify/notifythread.h +mounts.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h +mounts.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h +mounts.o: mountparser.h plugin.h pluginmsg.h system.h crypt.h run.h users.h +mounts.o: groups.h group.h loadavg.h thumb.h basethread.h sessionmanager.h +mounts.o: sessioncontainer.h ../functions/functions.h +mounts.o: ../functions/functionbase.h ../core/request.h ../core/system.h +mounts.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h +mounts.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h +mounts.o: ../functions/privchanger.h ../functions/chown.h +mounts.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h +mounts.o: ../functions/download.h ../functions/emacs.h ../functions/last.h +mounts.o: ../functions/login.h ../functions/logout.h ../functions/ln.h +mounts.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h +mounts.o: ../functions/nicedit.h ../functions/node.h ../functions/priv.h +mounts.o: ../functions/reload.h ../functions/rm.h mounts.o: ../functions/specialdefault.h ../functions/stat.h mounts.o: ../functions/subject.h ../functions/template.h mounts.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h @@ -216,22 +220,22 @@ mounts.o: ../templates/indexpatterns.h ../core/sessionmanager.h plugin.o: plugin.h pluginmsg.h log.h textstream.h logmanipulators.h slog.h plugin.o: cur.h request.h requesttypes.h item.h error.h config.h confparser.h plugin.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h -plugin.o: misc.h session.h user.h plugindata.h rebus.h ../templates/locale.h -plugin.o: ../core/confparser.h system.h dirs.h dircontainer.h ../db/db.h -plugin.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h -plugin.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h -plugin.o: ../core/user.h ../core/group.h ../core/dircontainer.h -plugin.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h -plugin.o: ../templates/misc.h ../templates/localefilter.h -plugin.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -plugin.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -plugin.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -plugin.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -plugin.o: ../notify/notifythread.h ../core/basethread.h synchro.h -plugin.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -plugin.o: ugcontainer.h lastcontainer.h mounts.h mount.h mountparser.h -plugin.o: crypt.h run.h users.h groups.h group.h loadavg.h thumb.h -plugin.o: basethread.h sessionmanager.h sessioncontainer.h +plugin.o: misc.h session.h user.h plugindata.h rebus.h mount.h +plugin.o: ../templates/locale.h ../core/confparser.h system.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: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h +plugin.o: ../notify/notifypool.h ../templates/misc.h +plugin.o: ../templates/localefilter.h ../templates/locale.h +plugin.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.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: ../templates/htmltextstream.h ../notify/notifythread.h +plugin.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h +plugin.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h +plugin.o: mounts.h mountparser.h crypt.h run.h users.h groups.h group.h +plugin.o: loadavg.h thumb.h basethread.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 @@ -254,7 +258,7 @@ plugindata.o: plugindata.h plugin.h pluginmsg.h log.h textstream.h plugindata.o: logmanipulators.h slog.h cur.h request.h requesttypes.h item.h plugindata.o: error.h config.h confparser.h htmlfilter.h plugindata.o: ../templates/htmltextstream.h ../core/textstream.h misc.h -plugindata.o: session.h user.h rebus.h ../templates/locale.h +plugindata.o: session.h user.h rebus.h mount.h ../templates/locale.h plugindata.o: ../core/confparser.h system.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 @@ -268,12 +272,11 @@ plugindata.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h plugindata.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h plugindata.o: ../notify/notifythread.h ../core/basethread.h synchro.h plugindata.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -plugindata.o: ugcontainer.h lastcontainer.h mounts.h mount.h mountparser.h -plugindata.o: crypt.h run.h users.h groups.h group.h loadavg.h thumb.h -plugindata.o: basethread.h sessionmanager.h sessioncontainer.h -plugindata.o: ../functions/functions.h ../functions/functionbase.h -plugindata.o: ../core/request.h ../core/system.h ../core/synchro.h -plugindata.o: ../functions/functionparser.h ../core/cur.h +plugindata.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h +plugindata.o: run.h users.h groups.h group.h loadavg.h thumb.h basethread.h +plugindata.o: sessionmanager.h sessioncontainer.h ../functions/functions.h +plugindata.o: ../functions/functionbase.h ../core/request.h ../core/system.h +plugindata.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h plugindata.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h plugindata.o: ../functions/privchanger.h ../functions/chown.h plugindata.o: ../functions/ckeditor.h ../functions/cp.h @@ -292,37 +295,37 @@ plugindata.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h plugindata.o: ../core/httpsimpleparser.h ../core/log.h plugindata.o: ../templates/indexpatterns.h ../core/sessionmanager.h postmultiparser.o: postmultiparser.h error.h requesttypes.h config.h -postmultiparser.o: confparser.h htmlfilter.h log.h textstream.h -postmultiparser.o: logmanipulators.h slog.h cur.h request.h item.h -postmultiparser.o: ../templates/htmltextstream.h ../core/textstream.h misc.h -postmultiparser.o: session.h user.h plugindata.h rebus.h +postmultiparser.o: confparser.h htmlfilter.h misc.h item.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 ../core/confparser.h postmultiparser.o: ../../ezc/src/utf8.h rebus.o: log.h textstream.h logmanipulators.h slog.h cur.h request.h rebus.o: requesttypes.h item.h error.h config.h confparser.h htmlfilter.h rebus.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h -rebus.o: user.h plugindata.h rebus.h ../templates/locale.h +rebus.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h rebus.o: ../core/confparser.h request.o: request.h requesttypes.h item.h error.h config.h confparser.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 ../templates/locale.h -request.o: ../core/confparser.h plugin.h pluginmsg.h system.h dirs.h -request.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h -request.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h -request.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h -request.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h -request.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -request.o: ../templates/localefilter.h ../templates/locale.h -request.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.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: ../templates/htmltextstream.h ../notify/notifythread.h -request.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h -request.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h -request.o: mounts.h mount.h mountparser.h crypt.h run.h users.h groups.h -request.o: group.h loadavg.h thumb.h basethread.h sessionmanager.h -request.o: sessioncontainer.h ../functions/functions.h +request.o: session.h user.h plugindata.h rebus.h mount.h +request.o: ../templates/locale.h ../core/confparser.h plugin.h pluginmsg.h +request.o: system.h dirs.h dircontainer.h ../db/db.h ../db/dbbase.h +request.o: ../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/misc.h ../templates/localefilter.h +request.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.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 ../templates/htmltextstream.h +request.o: ../notify/notifythread.h ../core/basethread.h synchro.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 +request.o: users.h groups.h group.h loadavg.h thumb.h basethread.h +request.o: sessionmanager.h sessioncontainer.h ../functions/functions.h request.o: ../functions/functionbase.h ../core/request.h ../core/system.h request.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h request.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h @@ -344,35 +347,36 @@ request.o: ../templates/indexpatterns.h ../core/sessionmanager.h run.o: run.h log.h textstream.h logmanipulators.h slog.h cur.h request.h run.o: requesttypes.h item.h error.h config.h confparser.h htmlfilter.h run.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h -run.o: user.h plugindata.h rebus.h ../templates/locale.h ../core/confparser.h +run.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h +run.o: ../core/confparser.h session.o: session.h item.h error.h user.h plugindata.h rebus.h textstream.h -session.o: misc.h +session.o: misc.h requesttypes.h sessioncontainer.o: sessioncontainer.h session.h item.h error.h user.h sessioncontainer.o: plugindata.h rebus.h textstream.h cur.h request.h sessioncontainer.o: requesttypes.h config.h confparser.h htmlfilter.h sessioncontainer.o: ../templates/htmltextstream.h ../core/textstream.h misc.h -sessioncontainer.o: log.h logmanipulators.h slog.h ../templates/locale.h -sessioncontainer.o: ../core/confparser.h +sessioncontainer.o: mount.h log.h logmanipulators.h slog.h +sessioncontainer.o: ../templates/locale.h ../core/confparser.h sessionmanager.o: sessionmanager.h sessioncontainer.h session.h item.h sessionmanager.o: error.h user.h plugindata.h rebus.h textstream.h cur.h sessionmanager.o: request.h requesttypes.h config.h confparser.h htmlfilter.h sessionmanager.o: ../templates/htmltextstream.h ../core/textstream.h misc.h -sessionmanager.o: lastcontainer.h system.h dirs.h dircontainer.h ../db/db.h -sessionmanager.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h -sessionmanager.o: ../core/error.h ../db/dbitemquery.h ../core/item.h -sessionmanager.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -sessionmanager.o: ../core/dircontainer.h ../core/ugcontainer.h log.h -sessionmanager.o: logmanipulators.h slog.h ../templates/locale.h -sessionmanager.o: ../core/confparser.h ../notify/notify.h -sessionmanager.o: ../notify/notifypool.h ../templates/misc.h -sessionmanager.o: ../templates/localefilter.h ../templates/locale.h -sessionmanager.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h -sessionmanager.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -sessionmanager.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -sessionmanager.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -sessionmanager.o: ../notify/notifythread.h ../core/basethread.h synchro.h -sessionmanager.o: ../notify/templatesnotify.h ../core/config.h -sessionmanager.o: ../core/users.h ugcontainer.h mounts.h mount.h +sessionmanager.o: mount.h lastcontainer.h system.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 ../core/confparser.h +sessionmanager.o: ../notify/notify.h ../notify/notifypool.h +sessionmanager.o: ../templates/misc.h ../templates/localefilter.h +sessionmanager.o: ../templates/locale.h ../../ezc/src/ezc.h +sessionmanager.o: ../../ezc/src/utf8.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: ../templates/htmltextstream.h ../notify/notifythread.h +sessionmanager.o: ../core/basethread.h synchro.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 thumb.h basethread.h sessionparser.h plugin.h sessionmanager.o: pluginmsg.h ../functions/functions.h @@ -402,21 +406,21 @@ sessionparser.o: sessionparser.h session.h item.h error.h user.h plugindata.h sessionparser.o: rebus.h textstream.h sessioncontainer.h cur.h request.h sessionparser.o: requesttypes.h config.h confparser.h htmlfilter.h sessionparser.o: ../templates/htmltextstream.h ../core/textstream.h misc.h -sessionparser.o: users.h log.h logmanipulators.h slog.h ../templates/locale.h -sessionparser.o: ../core/confparser.h +sessionparser.o: mount.h users.h log.h logmanipulators.h slog.h +sessionparser.o: ../templates/locale.h ../core/confparser.h slog.o: slog.h cur.h request.h requesttypes.h item.h error.h config.h slog.o: confparser.h htmlfilter.h textstream.h ../templates/htmltextstream.h slog.o: ../core/textstream.h misc.h session.h user.h plugindata.h rebus.h -slog.o: logmanipulators.h ../templates/locale.h ../core/confparser.h +slog.o: mount.h logmanipulators.h ../templates/locale.h ../core/confparser.h synchro.o: synchro.h system.o: system.h dirs.h item.h dircontainer.h ../db/db.h ../db/dbbase.h system.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h -system.o: ../core/error.h ../db/dbitemquery.h ../core/item.h +system.o: requesttypes.h ../core/error.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 requesttypes.h error.h -system.o: config.h confparser.h htmlfilter.h ../templates/htmltextstream.h -system.o: session.h user.h plugindata.h rebus.h ../templates/locale.h +system.o: logmanipulators.h slog.h cur.h request.h error.h config.h +system.o: confparser.h htmlfilter.h ../templates/htmltextstream.h session.h +system.o: user.h plugindata.h rebus.h mount.h ../templates/locale.h system.o: ../core/confparser.h ../notify/notify.h ../notify/notifypool.h system.o: ../templates/misc.h ../templates/localefilter.h system.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h @@ -425,23 +429,23 @@ system.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h system.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h system.o: ../notify/notifythread.h ../core/basethread.h synchro.h system.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -system.o: ugcontainer.h lastcontainer.h mounts.h mount.h mountparser.h -system.o: crypt.h run.h users.h groups.h group.h loadavg.h thumb.h -system.o: basethread.h ../templates/templates.h ../templates/patterncacher.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 thumb.h basethread.h +system.o: ../templates/templates.h ../templates/patterncacher.h system.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h system.o: ../core/log.h ../templates/indexpatterns.h ../core/cur.h system.o: ../core/system.h ../core/sessionmanager.h ../core/htmlfilter.h system.o: ../functions/functionbase.h ../core/request.h ../core/synchro.h -textstream.o: textstream.h misc.h item.h +textstream.o: textstream.h misc.h item.h requesttypes.h thumb.o: thumb.h basethread.h textstream.h ../db/db.h ../db/dbbase.h thumb.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h -thumb.o: item.h ../core/error.h ../db/dbitemquery.h ../core/item.h -thumb.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h +thumb.o: item.h requesttypes.h ../core/error.h ../db/dbitemquery.h +thumb.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h thumb.o: ../core/dircontainer.h ../core/ugcontainer.h log.h logmanipulators.h -thumb.o: slog.h cur.h request.h requesttypes.h error.h config.h confparser.h -thumb.o: htmlfilter.h ../templates/htmltextstream.h session.h user.h -thumb.o: plugindata.h rebus.h ../templates/locale.h ../core/confparser.h -thumb.o: ../core/config.h ../../ezc/src/utf8.h system.h dirs.h dircontainer.h +thumb.o: slog.h cur.h request.h error.h config.h confparser.h htmlfilter.h +thumb.o: ../templates/htmltextstream.h session.h user.h plugindata.h rebus.h +thumb.o: mount.h ../templates/locale.h ../core/confparser.h ../core/config.h +thumb.o: ../../ezc/src/utf8.h system.h dirs.h dircontainer.h thumb.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h thumb.o: ../templates/localefilter.h ../templates/locale.h thumb.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h @@ -449,6 +453,6 @@ thumb.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h thumb.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h thumb.o: ../templates/htmltextstream.h ../notify/notifythread.h thumb.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h -thumb.o: ../core/users.h ugcontainer.h lastcontainer.h mounts.h mount.h -thumb.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h +thumb.o: ../core/users.h ugcontainer.h lastcontainer.h mounts.h mountparser.h +thumb.o: crypt.h run.h users.h groups.h group.h loadavg.h users.o: users.h diff --git a/core/app.cpp b/core/app.cpp index 4dcdaf3..727816e 100755 --- a/core/app.cpp +++ b/core/app.cpp @@ -303,7 +303,7 @@ void App::MakePage() bool sent = false; - if( !cur.request->redirect_to.empty() || !cur.request->x_sendfile.empty() ) + if( cur.request->page_generated || !cur.request->redirect_to.empty() || !cur.request->x_sendfile.empty() ) return; @@ -673,7 +673,7 @@ void App::FilterCompressSend(bool compressing, int compress_encoding, const std: bool raw = cur.request->is_item && cur.request->item.content_type == Item::ct_raw && cur.request->status == WINIX_ERR_OK && cur.request->function && (cur.request->function == &functions.fun_cat || cur.request->function == &functions.fun_run); - if( config.html_filter && !raw ) + if( config.html_filter && cur.request->use_html_filter && !raw ) { TemplatesFunctions::html_filter.Filter(*source, clean_html); AddDebugInfo(clean_html); diff --git a/core/config.cpp b/core/config.cpp index bc72c7f..e14961a 100755 --- a/core/config.cpp +++ b/core/config.cpp @@ -113,7 +113,12 @@ void Config::AssignValues(bool stdout_is_closed) log_post_value_size = Size(L"log_post_value_size", 80); post_file_max = Size(L"post_file_max", 8388608); // 8 MB + upload_dir = Text(L"upload_dir"); + common_dir = Text(L"common_dir"); + NoLastSlash(upload_dir); + NoLastSlash(common_dir); + upload_dirs_chmod = Int(L"upload_dirs_chmod", 0750); upload_files_chmod = Int(L"upload_files_chmod", 0640); ListText(L"static_dirs", static_dirs); @@ -259,7 +264,7 @@ void Config::CheckPasswd() { switch(pass_type) { - case WINIX_CRYPT_HASH_PLAIN: + case WINIX_CRYPT_HASH_NONE: case WINIX_CRYPT_HASH_MD4: case WINIX_CRYPT_HASH_MD5: case WINIX_CRYPT_HASH_SHA1: diff --git a/core/config.h b/core/config.h index 90cb0b5..ff6d6f0 100755 --- a/core/config.h +++ b/core/config.h @@ -224,6 +224,14 @@ public: // so you can correct your mistake and then set this value to false bool dont_use_static_dirs; + // static common directory + // this is a place where there are some common javascripts, images, css files + // winix is allowed to read some files from there + // for example ckeditor config, vim config and so on + // winix read it as a ezc template and put it into database + // default: empty + std::wstring common_dir; + // chmod of newly created directories (under upload_dir) // default: 0750 int upload_dirs_chmod; diff --git a/core/crypt.cpp b/core/crypt.cpp index 507b626..30fc070 100755 --- a/core/crypt.cpp +++ b/core/crypt.cpp @@ -193,7 +193,7 @@ bool Crypt::PassHash(const std::wstring & salt, UserPass & up) bool result = true; up.pass_hash_salted = false; - if( up.pass_type != WINIX_CRYPT_HASH_PLAIN ) + if( up.pass_type != WINIX_CRYPT_HASH_NONE ) { pass_org = up.pass; pass_salted = up.pass; @@ -209,7 +209,7 @@ bool Crypt::PassHash(const std::wstring & salt, UserPass & up) log << log1 << "Crypt: problem with generating a hash, the password will not be hashed" << logend; up.pass = pass_org; - up.pass_type = WINIX_CRYPT_HASH_PLAIN; + up.pass_type = WINIX_CRYPT_HASH_NONE; result = false; } diff --git a/core/crypt.h b/core/crypt.h index 32ecdde..297ed98 100755 --- a/core/crypt.h +++ b/core/crypt.h @@ -20,7 +20,7 @@ /* the kind of hashes we are able to obtain in winix */ -#define WINIX_CRYPT_HASH_PLAIN 0 +#define WINIX_CRYPT_HASH_NONE 0 #define WINIX_CRYPT_HASH_MD4 1 #define WINIX_CRYPT_HASH_MD5 2 #define WINIX_CRYPT_HASH_SHA1 10 diff --git a/core/error.h b/core/error.h index 1936e99..9c4b97d 100755 --- a/core/error.h +++ b/core/error.h @@ -71,6 +71,7 @@ + typedef int Error; diff --git a/core/item.cpp b/core/item.cpp index 9601251..939f14b 100755 --- a/core/item.cpp +++ b/core/item.cpp @@ -2,13 +2,14 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2011, Tomasz Sowa * All rights reserved. * */ #include "item.h" #include "misc.h" +#include "crypt.h" @@ -61,10 +62,13 @@ void Item::Clear() file_path.clear(); file_fs = -1; file_type = WINIX_ITEM_FILETYPE_NONE; - + hash.clear(); + hash_type = WINIX_CRYPT_HASH_NONE; + file_size = 0; has_thumb = false; html_template.clear(); + sort_index = 0; SetDateToNow(); } diff --git a/core/item.h b/core/item.h index 4628472..0333eba 100755 --- a/core/item.h +++ b/core/item.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ @@ -23,66 +23,74 @@ struct Item { -long id; -long parent_id; + long id; + long parent_id; -long user_id; -long group_id; -std::wstring guest_name; // used as a user name when user_id is equal -1 + long user_id; + long group_id; + std::wstring guest_name; // used as a user name when user_id is equal -1 -long modification_user_id; // who has modified the item last (not taken into account when checking permissions) + long modification_user_id; // who has modified the item last (not taken into account when checking permissions) -int privileges; + int privileges; -tm date_creation; -tm date_modification; + tm date_creation; + tm date_modification; -std::wstring subject; -std::wstring content; + std::wstring subject; + std::wstring content; -std::wstring url; -int modify_index; + std::wstring url; + int modify_index; -enum ContentType -{ - ct_text = 0, - ct_formatted_text, - ct_html, - ct_bbcode, - ct_raw -}; + enum ContentType + { + ct_text = 0, + ct_formatted_text, + ct_html, + ct_bbcode, + ct_raw + }; -ContentType content_type; + ContentType content_type; -enum Type -{ - dir = 0, - file = 1, - symlink = 2, + enum Type + { + dir = 0, + file = 1, + symlink = 2, - none = 1000 -}; + none = 1000 + }; -Type type; + Type type; -// used when type is symlink or to a directory too (function 'default') -std::wstring link_to; -int link_redirect; + // used when type is symlink or to a directory too (function 'default') + std::wstring link_to; + int link_redirect; -// static file (if exists) -std::wstring file_path; // relative file path -int file_fs; // file system type where the file was saved -int file_type; // file type (none, image, doc, etc) -bool has_thumb; + // static file (if exists) + std::wstring file_path; // relative file path + int file_fs; // file system type where the file was saved + int file_type; // file type (none, image, doc, etc) + bool has_thumb; // whether or not we have a thumbnail + std::wstring hash; // file hash (md4, md5, ...) + int hash_type; // hash type WINIX_CRYPT_HASH_* (see crypt.h) + size_t file_size; // size of the file -std::wstring html_template; + + std::wstring html_template; + + + // sort index used when displaying a group of items + int sort_index; // methods diff --git a/core/misc.cpp b/core/misc.cpp index 5f8ddb9..6b47e1c 100755 --- a/core/misc.cpp +++ b/core/misc.cpp @@ -9,12 +9,27 @@ #include #include +#include #include "misc.h" #include "log.h" #include "templates/templates.h" #include "utf8.h" + +namespace misc_private +{ + std::ifstream get_file_content; + std::string get_file_content_ansi; + + + + + +} + + + int Toi(const std::string & str, int base) { return Toi(str.c_str(), base); @@ -805,6 +820,50 @@ bool RenameFile(const std::wstring & from, const std::wstring & to) } + + + +bool GetUTF8File(const char * file_path, std::wstring & content, bool clear_content) +{ +using namespace misc_private; + + if( clear_content ) + content.clear(); + + get_file_content.clear(); + get_file_content.open(file_path, std::ios_base::in | std::ios_base::binary); + + if( !get_file_content ) + return false; + + Ezc::UTF8ToWide(get_file_content, content); + get_file_content.close(); + +return true; +} + + +bool GetUTF8File(const wchar_t * file_path, std::wstring & content, bool clear_content) +{ +using namespace misc_private; + + Ezc::WideToUTF8(file_path, get_file_content_ansi); + return GetUTF8File(get_file_content_ansi.c_str(), content, clear_content); +} + + +bool GetUTF8File(const std::string & file_path, std::wstring & content, bool clear_content) +{ + return GetUTF8File(file_path.c_str(), content, clear_content); +} + + +bool GetUTF8File(const std::wstring & file_path, std::wstring & content, bool clear_content) +{ + return GetUTF8File(file_path.c_str(), content, clear_content); +} + + // if there is not an extension it returns a pointer to the last '\0' character const wchar_t * GetFileExt(const wchar_t * name) { @@ -1012,7 +1071,24 @@ void QEncode(const std::wstring & in, std::string & out, bool clear) } - +/* + deleting all post temporary files +*/ +void RemovePostFileTmp(PostFileTab & post_file_tab) +{ + PostFileTab::iterator i = post_file_tab.begin(); + + for( ; i != post_file_tab.end() ; ++i ) + { + const std::wstring & tmp_filename = i->second.tmp_filename; + + if( !tmp_filename.empty() && RemoveFile(tmp_filename) ) + log << log3 << "Deleted tmp file: " << tmp_filename << logend; + else + if( !tmp_filename.empty() ) + log << "swinka" << logend; //!!usunac + } +} diff --git a/core/misc.h b/core/misc.h index b4bc044..d0036f5 100755 --- a/core/misc.h +++ b/core/misc.h @@ -16,6 +16,7 @@ #include #include #include "item.h" +#include "requesttypes.h" @@ -567,6 +568,12 @@ bool RemoveFile(const std::wstring & file); bool RenameFile(const wchar_t * from, const wchar_t * to); bool RenameFile(const std::wstring & from, const std::wstring & to); +bool GetUTF8File(const char * file_path, std::wstring & content, bool clear_content = true); +bool GetUTF8File(const wchar_t * file_path, std::wstring & content, bool clear_content = true); +bool GetUTF8File(const std::string & file_path, std::wstring & content, bool clear_content = true); +bool GetUTF8File(const std::wstring & file_path, std::wstring & content, bool clear_content = true); + + const wchar_t * GetFileExt(const wchar_t * name); int SelectFileType(const wchar_t * file_name); int SelectFileType(const std::wstring & file_name); @@ -583,5 +590,8 @@ void UrlEncode(const std::wstring & in, std::string & out, bool clear_out = true void QEncode(const std::wstring & in, std::string & out, bool clear = true); +void RemovePostFileTmp(PostFileTab & post_file_tab); + + #endif diff --git a/core/postmultiparser.cpp b/core/postmultiparser.cpp index 96f6cd8..0f9cbd9 100755 --- a/core/postmultiparser.cpp +++ b/core/postmultiparser.cpp @@ -10,7 +10,7 @@ #include "postmultiparser.h" #include "log.h" #include "utf8.h" -#include "misc.h" + PostMultiParser::PostMultiParser() @@ -353,6 +353,15 @@ void PostMultiParser::ReadContent() } +void PostMultiParser::ConvStr(const std::string & src, std::wstring & dst) +{ + if( config->utf8 ) + Ezc::UTF8ToWide(src, dst); + else + AssignString(src, dst); +} + + void PostMultiParser::AddNormalPostVar() { if( post_tab->size() >= WINIX_POSTTABLE_MAXSIZE ) @@ -362,20 +371,10 @@ void PostMultiParser::AddNormalPostVar() return; } + ConvStr(name, namew); + ConvStr(content, contentw); - if( config->utf8 ) - { - Ezc::UTF8ToWide(name, namew); - Ezc::UTF8ToWide(content, contentw); - } - else - { - AssignString(name, namew); - AssignString(content, contentw); - } - - std::pair res = post_tab->insert( std::make_pair(namew, contentw) ); - bool added = res.second; + bool added = InsertPostVar(*post_tab, namew, contentw); log << log2 << "PMP: POST var, name: \"" << namew << "\""; @@ -395,20 +394,12 @@ void PostMultiParser::AddFilePostVar() return; } - if( config->utf8 ) - { - Ezc::UTF8ToWide(name, namew); - Ezc::UTF8ToWide(filename, post_file_temp.filename); - } - else - { - AssignString(name, namew); - AssignString(filename, post_file_temp.filename); - } - + ConvStr(name, namew); + ConvStr(filename, post_file_temp.filename); post_file_temp.tmp_filename = tmp_filename; - std::pair res = post_file_tab->insert( std::make_pair(namew, post_file_temp) ); - bool added = res.second; + post_file_temp.file_size = content_len; + + bool added = InsertPostVar(*post_file_tab, namew, post_file_temp); log << log2 << "PMP: POST FILE var, name: \"" << namew << "\""; @@ -424,15 +415,10 @@ void PostMultiParser::AddPostVar() if( name.empty() ) return; - if( filename.empty() ) - { AddNormalPostVar(); - } else - { AddFilePostVar(); - } } @@ -569,6 +555,7 @@ Error PostMultiParser::Parse(FCGX_Stream * in_, PostTab & post_tab_, PostFileTab in = in_; last = 0; err = WINIX_ERR_OK; + var_index = 1; line_end_dos = false; in_buffer_ind = WINIX_POSTMULTI_INPUT_BUFFER; in_buffer_len = WINIX_POSTMULTI_INPUT_BUFFER; @@ -587,6 +574,7 @@ Error PostMultiParser::Parse(FCGX_Stream * in_, PostTab & post_tab_, PostFileTab if( err != WINIX_ERR_OK ) { + RemovePostFileTmp(*post_file_tab); post_tab->clear(); post_file_tab->clear(); diff --git a/core/postmultiparser.h b/core/postmultiparser.h index 1f0b06c..2c38703 100755 --- a/core/postmultiparser.h +++ b/core/postmultiparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ @@ -16,6 +16,7 @@ #include "error.h" #include "requesttypes.h" #include "config.h" +#include "misc.h" // 2 MB @@ -53,6 +54,7 @@ private: PostFileTab * post_file_tab; int last; // last read character + int var_index; // used as a postfix to the same name (is auto increment) bool line_end_dos; std::string boundary; @@ -67,6 +69,7 @@ private: PostFile post_file_temp; void LogFirst(const std::string & to_log, size_t len); + void ConvStr(const std::string & src, std::wstring & dst); bool IsWhite(int c); void SkipWhite(); @@ -94,7 +97,36 @@ private: void ReadChar(); + + template + bool InsertPostVar(Container & container, std::wstring & key, const Value & value); + }; + +template +bool PostMultiParser::InsertPostVar(Container & container, std::wstring & key, const Value & value) +{ +bool added; +std::pair res; + + res = container.insert( std::make_pair(key, value) ); + added = res.second; + + if( !added ) + { + key += L"_inc"; + key += Toa(var_index); + res = container.insert( std::make_pair(key, value) ); + added = res.second; + var_index += 1; + } + +return added; +} + + + + #endif diff --git a/core/postparser.h b/core/postparser.h index 0a9c778..f763a2e 100755 --- a/core/postparser.h +++ b/core/postparser.h @@ -29,7 +29,7 @@ class PostParser : public HttpSimpleParser std::wstring temp_name, temp_value; bool input_as_utf8; size_t log_value_size; - + int var_index; protected: @@ -63,21 +63,36 @@ protected: } - virtual void Parameter(std::string & name, std::string & value) + void ConvStr(const std::string & src, std::wstring & dst) { if( input_as_utf8 ) - { - Ezc::UTF8ToWide(name, temp_name); - Ezc::UTF8ToWide(value, temp_value); - } + Ezc::UTF8ToWide(src, dst); else + AssignString(src, dst); + } + + + virtual void Parameter(std::string & name, std::string & value) + { + bool added; + std::pair res; + + ConvStr(name, temp_name); + ConvStr(value, temp_value); + + res = post_tab->insert( std::make_pair(temp_name, temp_value) ); + added = res.second; + + if( !added ) { - AssignString(name, temp_name); - AssignString(value, temp_value); + temp_name += L"_inc"; + temp_name += Toa(var_index); + res = post_tab->insert( std::make_pair(temp_name, temp_value) ); + added = res.second; + var_index += 1; } - std::pair res = post_tab->insert( std::make_pair(temp_name, temp_value) ); - CreateLog(res.second); + CreateLog(added); } @@ -104,6 +119,7 @@ public: { in = in_; post_tab = &post_tab_; + var_index = 1; HttpSimpleParser::Parse(); } diff --git a/core/request.cpp b/core/request.cpp index 40f8a01..c93c0fc 100755 --- a/core/request.cpp +++ b/core/request.cpp @@ -32,29 +32,13 @@ void Request::SetConfig(Config * pconfig) -void Request::ClearPostFileTmp() -{ - // deleting temporary files (if exists) - - while( !post_file_tab.empty() ) - { - const std::wstring & tmp_filename = post_file_tab.begin()->second.tmp_filename; - - if( RemoveFile(tmp_filename) ) - log << log3 << "Request: deleted tmp file: " << tmp_filename << logend; - - post_file_tab.erase(post_file_tab.begin()); - } -} - - void Request::Clear() { // id is never 0 if( ++id == 0 ) ++id; - ClearPostFileTmp(); + RemovePostFileTmp(post_file_tab); get_tab.clear(); post_tab.clear(); @@ -67,6 +51,9 @@ void Request::Clear() headers.Clear(); page.Clear(); debug.Clear(); + + page_generated = false; + use_html_filter = true; env_request_method = &char_empty; env_request_uri = &char_empty; diff --git a/core/request.h b/core/request.h index cbe21d8..70babcc 100755 --- a/core/request.h +++ b/core/request.h @@ -43,6 +43,14 @@ struct Request TextStream headers; HtmlTextStream page, debug; + // if set to true then the standard template system will not be generated + // default: false + bool page_generated; + + // whether or not the html filter should be used + // default: true + bool use_html_filter; + // raw parameters GetTab get_tab; PostTab post_tab; @@ -135,8 +143,6 @@ private: Config * config; - void ClearPostFileTmp(); - // contains '\0' // used to set env_* pointers to the empty value const char char_empty; diff --git a/core/requesttypes.h b/core/requesttypes.h index efea870..13a1c07 100755 --- a/core/requesttypes.h +++ b/core/requesttypes.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ @@ -24,6 +24,7 @@ struct PostFile { std::wstring filename; // original file name std::wstring tmp_filename; // file with content (in /tmp) + size_t file_size; }; diff --git a/core/session.h b/core/session.h index 3cd0f12..311cbe7 100755 --- a/core/session.h +++ b/core/session.h @@ -10,6 +10,8 @@ #ifndef headerfile_winix_core_session #define headerfile_winix_core_session +#include +#include #include #include "item.h" #include "error.h" @@ -66,6 +68,9 @@ struct Session // buffer for the session log TextStream log_buffer; + // table with css files + // used by some javascript wysiwyg editors (ckeditor, tinymce) + std::vector last_css; Session(); void SetTimeToNow(); diff --git a/core/system.cpp b/core/system.cpp index 11a3aaa..69c225d 100755 --- a/core/system.cpp +++ b/core/system.cpp @@ -965,3 +965,60 @@ return ok; + +/* + adding a new file to winix + file_path - a name of a static file (from common directory) + url - url of a file which will be inserted (in /var directory) + + current limitation: + warning: the url is not prepared by PrepareUrl() (PrepareUrl is from functions) +*/ +bool System::AddCommonFileToVar(const wchar_t * file_path, const wchar_t * url, bool overwrite_existing) +{ + if( config->common_dir.empty() ) + { + log << log1 << "System: can't open a file from common directory, common_dir not set in the config" << logend; + return false; + } + + file_name = config->common_dir; + file_name += '/'; + file_name += file_path; + + if( !GetUTF8File(file_name, file_content) ) + { + log << log1 << "System: can't open a file: " << file_name << logend; + return false; + } + + Item * var = dirs.CreateVarDir(); + + if( !var ) + { + log << log1 << "System: can't create /var directory" << logend; + return false; + } + + if( db->GetItem(var->id, url, file_content_item) == WINIX_ERR_OK ) + { + if( overwrite_existing ) + db->DelItem(file_content_item); + else + return true; + } + + file_content_item.Clear(); + file_content_item.parent_id = var->id; + file_content_item.user_id = -1; + file_content_item.group_id = -1; + file_content_item.privileges = 0755; + file_content_item.subject = url; + file_content_item.url = url; + file_content_item.type = Item::file; + file_content_item.content_type = Item::ct_raw; + file_content_item.content = file_content; + +return AddFile(file_content_item, false) == WINIX_ERR_OK; +} + diff --git a/core/system.h b/core/system.h index 112e8c0..d0c225b 100755 --- a/core/system.h +++ b/core/system.h @@ -127,6 +127,9 @@ public: bool FollowAllLinks(const std::wstring & link_to, bool follow_dir_default = false, bool stop_on_link_redirect = false, bool check_access = true); + + bool AddCommonFileToVar(const wchar_t * file_path, const wchar_t * url, bool overwrite_existing = true); + private: Cur * cur; @@ -136,6 +139,8 @@ private: Item item_temp; std::wstring link_to_temp, name_temp; + std::wstring file_content, file_name; + Item file_content_item; // for FollowAllLinks std::vector temp_follow_dir_tab; diff --git a/db/Makefile.dep b/db/Makefile.dep index 1290b13..b35e6db 100755 --- a/db/Makefile.dep +++ b/db/Makefile.dep @@ -1,23 +1,23 @@ # DO NOT DELETE db.o: db.h dbbase.h dbconn.h dbtextstream.h ../core/textstream.h -db.o: ../core/misc.h ../core/item.h ../core/error.h dbitemquery.h -db.o: ../core/item.h dbitemcolumns.h ../core/user.h ../core/group.h -db.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -db.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -db.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h +db.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h +db.o: dbitemquery.h ../core/item.h dbitemcolumns.h ../core/user.h +db.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +db.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +db.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h db.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h db.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -db.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h -db.o: ../core/confparser.h ../core/log.h ../core/misc.h +db.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h +db.o: ../templates/locale.h ../core/confparser.h ../core/log.h ../core/misc.h dbbase.o: dbbase.h dbconn.h dbtextstream.h ../core/textstream.h -dbbase.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h -dbbase.o: ../core/misc.h ../../ezc/src/utf8.h +dbbase.o: ../core/misc.h ../core/item.h ../core/requesttypes.h +dbbase.o: ../core/error.h ../core/log.h ../core/misc.h ../../ezc/src/utf8.h dbconn.o: dbconn.h dbtextstream.h ../core/textstream.h ../core/misc.h -dbconn.o: ../core/item.h ../core/log.h ../core/error.h +dbconn.o: ../core/item.h ../core/requesttypes.h ../core/log.h ../core/error.h dbitemcolumns.o: dbitemcolumns.h ../core/item.h dbbase.h dbconn.h dbitemcolumns.o: dbtextstream.h ../core/textstream.h ../core/misc.h -dbitemcolumns.o: ../core/item.h ../core/error.h +dbitemcolumns.o: ../core/item.h ../core/requesttypes.h ../core/error.h dbitemquery.o: dbitemquery.h ../core/item.h dbtextstream.o: dbtextstream.h ../core/textstream.h ../core/misc.h -dbtextstream.o: ../core/item.h ../../ezc/src/utf8.h +dbtextstream.o: ../core/item.h ../core/requesttypes.h ../../ezc/src/utf8.h diff --git a/db/db.cpp b/db/db.cpp index dfe7737..cdc4a78 100755 --- a/db/db.cpp +++ b/db/db.cpp @@ -195,7 +195,7 @@ Error Db::AddItemIntoItem(Item & item) query.Clear(); query << R("insert into core.item (user_id, modification_user_id, group_id, privileges, " "date_creation, date_modification, type, parent_id, content_id, " - "link_to, link_redirect, subject, guest_name, template, url) values (") + "link_to, link_redirect, subject, guest_name, template, sort_index, url) values (") << item.user_id << item.modification_user_id << item.group_id @@ -209,7 +209,8 @@ Error Db::AddItemIntoItem(Item & item) << item.link_redirect << item.subject << item.guest_name - << item.html_template; + << item.html_template + << item.sort_index; url_without_id = AddItemCreateUrlSubject(item); @@ -250,13 +251,16 @@ Error Db::AddItemIntoContent(Item & item) { query.Clear(); query << R("insert into core.content (content, content_type, file_path, file_fs, " - "file_type, has_thumb, ref, modify_index) values (") + "file_type, has_thumb, hash, hash_type, file_size, ref, modify_index) values (") << item.content << static_cast(item.content_type) << item.file_path << item.file_fs << item.file_type << static_cast(item.has_thumb) + << item.hash + << item.hash_type + << item.file_size << first_ref << item.modify_index << R(");"); @@ -348,7 +352,7 @@ Error Db::EditItemInItem(Item & item, bool with_url) query.Clear(); query << R("update core.item set (user_id, modification_user_id, group_id, privileges, " "date_creation, date_modification, type, link_to, link_redirect, parent_id, subject, " - "guest_name, template"); + "guest_name, template, sort_index"); if( with_url ) query << R(", url"); @@ -366,7 +370,8 @@ Error Db::EditItemInItem(Item & item, bool with_url) << item.parent_id << item.subject << item.guest_name - << item.html_template; + << item.html_template + << item.sort_index; if( with_url ) { @@ -408,13 +413,16 @@ Error Db::EditItemInContent(Item & item) // we don't change 'ref' here query.Clear(); query << R("update core.content set (content, content_type, file_path, file_fs, " - "file_type, has_thumb, modify_index) = (") + "file_type, has_thumb, hash, hash_type, file_size, modify_index) = (") << item.content << static_cast(item.content_type) << item.file_path << item.file_fs << item.file_type << static_cast(item.has_thumb) + << item.hash + << item.hash_type + << item.file_size << item.modify_index << R(") where id=") << item.content_id @@ -611,9 +619,22 @@ return result; -PGresult * Db::GetItemsQuery(const DbItemQuery & iq, bool skip_other_sel) +Error Db::EditSortIndexItemById(long id, int sort_index) { query.Clear(); + query << R("update core.item set (sort_index) = (") + << sort_index + << R(") where id=") + << id + << R(";"); + + return DoCommand(query); +} + + + +PGresult * Db::GetItemsQuerySelect(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel) +{ query << R("select item.id, content_id"); if( !skip_other_sel ) @@ -629,15 +650,25 @@ PGresult * Db::GetItemsQuery(const DbItemQuery & iq, bool skip_other_sel) if( iq.sel_url ) query << R(", url"); if( iq.sel_type ) query << R(", type"); if( iq.sel_link ) query << R(", link_to, link_redirect"); - if( iq.sel_file ) query << R(", file_path, file_fs, file_type, has_thumb"); + if( iq.sel_file ) query << R(", file_path, file_fs, file_type, has_thumb, hash, hash_type, file_size"); if( iq.sel_html_template ) query << R(", template"); + if( iq.sel_sort_index ) query << R(", sort_index"); } query << R(" from core.item"); - +} + + +PGresult * Db::GetItemsQueryJoin(const DbItemQuery & iq, DbTextStream & query) +{ if( iq.sel_content || iq.sel_file || iq.where_file_type ) query << R(" left join core.content on item.content_id = content.id"); +} + + +PGresult * Db::GetItemsQueryWhere(const DbItemQuery & iq, DbTextStream & query) +{ if( iq.where_id || iq.where_parent_id || iq.where_type || iq.where_file_type ) { query << R(" where "); @@ -682,19 +713,53 @@ PGresult * Db::GetItemsQuery(const DbItemQuery & iq, bool skip_other_sel) if_and = add_and; } } +} - query << R(" order by item.date_creation"); - - if( iq.sort_asc ) - query << R(" asc"); - else - query << R(" desc"); +PGresult * Db::GetItemsQueryOrder(const DbItemQuery & iq, DbTextStream & query) +{ + if( iq.sel_sort_index || iq.sel_date ) + { + query << R(" order by"); + + if( iq.sel_sort_index ) + query << R(" sort_index"); + + if( iq.sel_date ) + { + if( iq.sel_sort_index ) + query << R(","); + + query << R(" item.date_creation"); + } + + if( iq.sort_asc ) + query << R(" asc"); + else + query << R(" desc"); + } +} + + +PGresult * Db::GetItemsQueryLimit(const DbItemQuery & iq, DbTextStream & query) +{ if( iq.limit != 0 ) query << R(" limit ") << iq.limit; if( iq.offset != 0 ) query << R(" offset ") << iq.offset; +} + + +PGresult * Db::GetItemsQuery(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel) +{ + query.Clear(); + + GetItemsQuerySelect(iq, query, skip_other_sel); + GetItemsQueryJoin(iq, query); + GetItemsQueryWhere(iq, query); + GetItemsQueryOrder(iq, query); + GetItemsQueryLimit(iq, query); query << R(";"); @@ -703,6 +768,13 @@ return AssertQuery(query); +PGresult * Db::GetItemsQuery(const DbItemQuery & iq, bool skip_other_sel) +{ + return GetItemsQuery(iq, query, skip_other_sel); +} + + + void Db::GetItems(std::vector & item_tab, const DbItemQuery & item_query) { @@ -1082,11 +1154,14 @@ Error Db::EditFileById(const Item & item, long id) throw Error(WINIX_ERR_NO_ITEM); query.Clear(); - query << R("update core.content set (file_path, file_fs, file_type, has_thumb) = (") + query << R("update core.content set (file_path, file_fs, file_type, has_thumb, hash, hash_type, file_size) = (") << item.file_path << item.file_fs << item.file_type << static_cast(item.has_thumb) + << item.hash + << item.hash_type + << item.file_size << R(") where id=") << content_id << R(";"); r = AssertQuery(query); diff --git a/db/db.h b/db/db.h index 116c0c8..d07cf4a 100755 --- a/db/db.h +++ b/db/db.h @@ -86,7 +86,7 @@ public: long GetDirId(long parent_id, const std::wstring & url); Error AddHardLink(Item & item); - + Error EditSortIndexItemById(long id, int sort_index); @@ -107,13 +107,21 @@ protected: Error EditItemGetIdsByUrl(Item & item); long GetContentId(long item_id); - PGresult * GetItemsQuery(const DbItemQuery & iq, bool skip_other_sel = false); Error DelItemDelItem(long item_id, int type); Error DelItemDelContent(long content_id); Error IncrementContentRef(long content_id); Error DecrementContentRef(long content_id); + + PGresult * GetItemsQuerySelect(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel); + PGresult * GetItemsQueryJoin(const DbItemQuery & iq, DbTextStream & query); + PGresult * GetItemsQueryWhere(const DbItemQuery & iq, DbTextStream & query); + PGresult * GetItemsQueryOrder(const DbItemQuery & iq, DbTextStream & query); + PGresult * GetItemsQueryLimit(const DbItemQuery & iq, DbTextStream & query); + PGresult * GetItemsQuery(const DbItemQuery & iq, DbTextStream & query, bool skip_other_sel = false); + PGresult * GetItemsQuery(const DbItemQuery & iq, bool skip_other_sel = false); + }; diff --git a/db/dbitemcolumns.cpp b/db/dbitemcolumns.cpp index 94af9b6..a39da8e 100755 --- a/db/dbitemcolumns.cpp +++ b/db/dbitemcolumns.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ @@ -37,8 +37,12 @@ void DbItemColumns::SetColumns(PGresult * r) file_fs = PQfnumber(r, "file_fs"); file_type = PQfnumber(r, "file_type"); has_thumb = PQfnumber(r, "has_thumb"); + hash = PQfnumber(r, "hash"); + hash_type = PQfnumber(r, "hash_type"); + file_size = PQfnumber(r, "file_size"); ref = PQfnumber(r, "ref"); modify_index = PQfnumber(r, "modify_index"); + sort_index = PQfnumber(r, "sort_index"); } @@ -60,6 +64,10 @@ void DbItemColumns::SetItem(PGresult * r, long row, Item & item) if( file_fs != -1 ) item.file_fs = DbBase::AssertValueInt(r, row, file_fs); if( file_type != -1 ) item.file_type = DbBase::AssertValueInt(r, row, file_type); if( has_thumb != -1 ) item.has_thumb = DbBase::AssertValueBool(r, row, has_thumb); + if( hash != -1 ) DbBase::AssertValueWide(r, row, hash, item.hash); + if( hash_type != -1 ) item.hash_type = DbBase::AssertValueInt(r, row, hash_type); + if( file_size != -1 ) item.file_size = DbBase::AssertValueLong(r, row, file_size); + if( ref != -1 ) item.ref = DbBase::AssertValueInt(r, row, ref); if( modify_index != -1 ) item.modify_index = DbBase::AssertValueInt(r, row, modify_index); @@ -70,6 +78,7 @@ void DbItemColumns::SetItem(PGresult * r, long row, Item & item) if( link_to != -1 ) DbBase::AssertValueWide(r, row, link_to, item.link_to); if( guest_name != -1 ) DbBase::AssertValueWide(r, row, guest_name, item.guest_name); if( html_template != -1 ) DbBase::AssertValueWide(r, row, html_template, item.html_template); + if( sort_index != -1 ) item.sort_index = DbBase::AssertValueInt(r, row, sort_index); } diff --git a/db/dbitemcolumns.h b/db/dbitemcolumns.h index 4486ad2..b1c55e8 100755 --- a/db/dbitemcolumns.h +++ b/db/dbitemcolumns.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2011, Tomasz Sowa * All rights reserved. * */ @@ -41,8 +41,12 @@ struct DbItemColumns int file_fs; int file_type; int has_thumb; + int hash; + int hash_type; + int file_size; int ref; int modify_index; + int sort_index; void SetColumns(PGresult * r); void SetItem(PGresult * r, long row, Item & item); diff --git a/db/dbitemquery.cpp b/db/dbitemquery.cpp index dbaaa37..2232178 100755 --- a/db/dbitemquery.cpp +++ b/db/dbitemquery.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2011, Tomasz Sowa * All rights reserved. * */ @@ -56,6 +56,7 @@ void DbItemQuery::SetAllSel(bool sel) sel_link = sel; sel_file = sel; sel_html_template = sel; + sel_sort_index = sel; } diff --git a/db/dbitemquery.h b/db/dbitemquery.h index a3bdca1..26287a1 100755 --- a/db/dbitemquery.h +++ b/db/dbitemquery.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2011, Tomasz Sowa * All rights reserved. * */ @@ -30,8 +30,9 @@ struct DbItemQuery bool sel_url; // url bool sel_type; // type (dir, file, none) bool sel_link; // link_to, link_redirect - bool sel_file; // file_path, file_fs, file_type, has_thumb + bool sel_file; // file_path, file_fs, file_type, has_thumb, hash, hash_type, file_size bool sel_html_template; // template + bool sel_sort_index; // sort_index bool where_id; // bool where_parent_id; // diff --git a/functions/Makefile.dep b/functions/Makefile.dep index dff9086..ab1b188 100755 --- a/functions/Makefile.dep +++ b/functions/Makefile.dep @@ -2,26 +2,26 @@ adduser.o: adduser.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h adduser.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -adduser.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -adduser.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -adduser.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -adduser.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -adduser.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -adduser.o: ../core/error.h ../core/config.h ../core/confparser.h -adduser.o: ../core/htmlfilter.h ../templates/htmltextstream.h -adduser.o: ../core/session.h ../core/user.h ../core/plugindata.h -adduser.o: ../core/rebus.h ../templates/locale.h ../core/confparser.h -adduser.o: ../core/request.h ../core/config.h ../core/system.h ../core/dirs.h -adduser.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h -adduser.o: ../templates/misc.h ../templates/localefilter.h -adduser.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -adduser.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -adduser.o: functionparser.h ../core/cur.h cat.h chmod.h privchanger.h chown.h -adduser.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h -adduser.o: logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h priv.h -adduser.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h -adduser.o: tinymce.h uname.h upload.h uptime.h who.h vim.h -adduser.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +adduser.o: ../core/misc.h ../core/item.h ../core/requesttypes.h +adduser.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h +adduser.o: ../core/user.h ../core/group.h ../core/dircontainer.h +adduser.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h +adduser.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +adduser.o: ../core/request.h ../core/error.h ../core/config.h +adduser.o: ../core/confparser.h ../core/htmlfilter.h +adduser.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +adduser.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h +adduser.o: ../core/confparser.h ../core/request.h ../core/config.h +adduser.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +adduser.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +adduser.o: ../templates/localefilter.h ../templates/locale.h +adduser.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +adduser.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +adduser.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h default.h +adduser.o: download.h emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h +adduser.o: nicedit.h node.h priv.h reload.h rm.h run.h specialdefault.h +adduser.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h +adduser.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h adduser.o: ../templates/htmltextstream.h ../notify/notifythread.h adduser.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h adduser.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h @@ -30,14 +30,14 @@ adduser.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h adduser.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h cat.o: cat.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h cat.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -cat.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -cat.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -cat.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -cat.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -cat.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h +cat.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h +cat.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +cat.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +cat.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +cat.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h cat.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h cat.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -cat.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h +cat.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h cat.o: ../core/confparser.h ../core/request.h ../core/config.h cat.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h cat.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h @@ -45,94 +45,92 @@ cat.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h cat.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h cat.o: functions.h functionparser.h ../core/cur.h adduser.h chmod.h cat.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -cat.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h -cat.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h -cat.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -cat.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h -cat.o: ../templates/htmltextstream.h ../notify/notifythread.h -cat.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -cat.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -cat.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h -cat.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -cat.o: ../core/basethread.h ../core/synchro.h +cat.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h +cat.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h +cat.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +cat.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +cat.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +cat.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +cat.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +cat.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +cat.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +cat.o: ../core/synchro.h chmod.o: chmod.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h chmod.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -chmod.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -chmod.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -chmod.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -chmod.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -chmod.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -chmod.o: ../core/error.h ../core/config.h ../core/confparser.h -chmod.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h -chmod.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -chmod.o: ../templates/locale.h ../core/confparser.h ../core/request.h -chmod.o: ../core/config.h ../core/system.h ../core/dirs.h -chmod.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h -chmod.o: ../templates/misc.h ../templates/localefilter.h -chmod.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -chmod.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -chmod.o: functionparser.h ../core/cur.h adduser.h cat.h chown.h privchanger.h -chmod.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h logout.h -chmod.o: ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h priv.h reload.h rm.h -chmod.o: run.h specialdefault.h stat.h subject.h template.h tinymce.h uname.h -chmod.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h -chmod.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -chmod.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -chmod.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -chmod.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -chmod.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -chmod.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -chmod.o: ../core/synchro.h +chmod.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h +chmod.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +chmod.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +chmod.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +chmod.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h +chmod.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +chmod.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +chmod.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h +chmod.o: ../core/confparser.h ../core/request.h ../core/config.h +chmod.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +chmod.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +chmod.o: ../templates/localefilter.h ../templates/locale.h +chmod.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +chmod.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +chmod.o: adduser.h cat.h chown.h privchanger.h ckeditor.h cp.h default.h +chmod.o: download.h emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h +chmod.o: nicedit.h node.h priv.h reload.h rm.h run.h specialdefault.h stat.h +chmod.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +chmod.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +chmod.o: ../templates/htmltextstream.h ../notify/notifythread.h +chmod.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +chmod.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +chmod.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +chmod.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +chmod.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h chown.o: chown.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h chown.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -chown.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -chown.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -chown.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -chown.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -chown.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -chown.o: ../core/error.h ../core/config.h ../core/confparser.h -chown.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h -chown.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -chown.o: ../templates/locale.h ../core/confparser.h ../core/request.h -chown.o: ../core/config.h ../core/system.h ../core/dirs.h -chown.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h -chown.o: ../templates/misc.h ../templates/localefilter.h -chown.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -chown.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -chown.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h -chown.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h logout.h -chown.o: ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h priv.h reload.h rm.h -chown.o: run.h specialdefault.h stat.h subject.h template.h tinymce.h uname.h -chown.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h -chown.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -chown.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -chown.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -chown.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -chown.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -chown.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -chown.o: ../core/synchro.h +chown.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h +chown.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +chown.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +chown.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +chown.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h +chown.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +chown.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +chown.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h +chown.o: ../core/confparser.h ../core/request.h ../core/config.h +chown.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +chown.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +chown.o: ../templates/localefilter.h ../templates/locale.h +chown.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +chown.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +chown.o: adduser.h cat.h chmod.h privchanger.h ckeditor.h cp.h default.h +chown.o: download.h emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h +chown.o: nicedit.h node.h priv.h reload.h rm.h run.h specialdefault.h stat.h +chown.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +chown.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +chown.o: ../templates/htmltextstream.h ../notify/notifythread.h +chown.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +chown.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +chown.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +chown.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +chown.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h ckeditor.o: ckeditor.h functionbase.h ../core/item.h ../db/db.h ckeditor.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ckeditor.o: ../core/textstream.h ../core/misc.h ../core/item.h -ckeditor.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h -ckeditor.o: ../core/user.h ../core/group.h ../core/dircontainer.h -ckeditor.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h -ckeditor.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h -ckeditor.o: ../core/request.h ../core/requesttypes.h ../core/error.h -ckeditor.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +ckeditor.o: ../core/requesttypes.h ../core/error.h ../db/dbitemquery.h +ckeditor.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h +ckeditor.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h +ckeditor.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h +ckeditor.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h +ckeditor.o: ../core/confparser.h ../core/htmlfilter.h ckeditor.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -ckeditor.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h -ckeditor.o: ../core/confparser.h ../core/request.h ../core/config.h -ckeditor.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h -ckeditor.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -ckeditor.o: ../templates/localefilter.h ../templates/locale.h -ckeditor.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h +ckeditor.o: ../core/plugindata.h ../core/rebus.h mount.h +ckeditor.o: ../templates/locale.h ../core/confparser.h ../core/request.h +ckeditor.o: ../core/config.h ../core/system.h ../core/dirs.h +ckeditor.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h +ckeditor.o: ../templates/misc.h ../templates/localefilter.h +ckeditor.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h ckeditor.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h ckeditor.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h ckeditor.o: privchanger.h chown.h cp.h default.h download.h emacs.h last.h -ckeditor.o: login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h -ckeditor.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h -ckeditor.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +ckeditor.o: login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h +ckeditor.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h +ckeditor.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ckeditor.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h ckeditor.o: ../templates/htmltextstream.h ../notify/notifythread.h ckeditor.o: ../core/basethread.h ../core/synchro.h @@ -143,14 +141,14 @@ ckeditor.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h ckeditor.o: ../core/synchro.h cp.o: cp.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h cp.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h -cp.o: ../core/item.h ../core/error.h ../db/dbitemquery.h -cp.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -cp.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -cp.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -cp.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h +cp.o: ../core/item.h ../core/requesttypes.h ../core/error.h +cp.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +cp.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +cp.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +cp.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h cp.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h cp.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -cp.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h +cp.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h cp.o: ../core/confparser.h ../core/request.h ../core/config.h cp.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h cp.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h @@ -158,7 +156,7 @@ cp.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h cp.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h cp.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h cp.o: privchanger.h chown.h ckeditor.h default.h download.h emacs.h last.h -cp.o: login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h priv.h +cp.o: login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h cp.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h cp.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h cp.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h @@ -170,26 +168,26 @@ cp.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h cp.o: ../core/synchro.h ../core/misc.h default.o: default.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h default.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -default.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -default.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -default.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -default.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -default.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -default.o: ../core/error.h ../core/config.h ../core/confparser.h -default.o: ../core/htmlfilter.h ../templates/htmltextstream.h -default.o: ../core/session.h ../core/user.h ../core/plugindata.h -default.o: ../core/rebus.h ../templates/locale.h ../core/confparser.h -default.o: ../core/request.h ../core/config.h ../core/system.h ../core/dirs.h -default.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h -default.o: ../templates/misc.h ../templates/localefilter.h -default.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -default.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -default.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h -default.o: privchanger.h chown.h ckeditor.h cp.h download.h emacs.h last.h -default.o: login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h -default.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h -default.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -default.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +default.o: ../core/misc.h ../core/item.h ../core/requesttypes.h +default.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h +default.o: ../core/user.h ../core/group.h ../core/dircontainer.h +default.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h +default.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +default.o: ../core/request.h ../core/error.h ../core/config.h +default.o: ../core/confparser.h ../core/htmlfilter.h +default.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +default.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h +default.o: ../core/confparser.h ../core/request.h ../core/config.h +default.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +default.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +default.o: ../templates/localefilter.h ../templates/locale.h +default.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +default.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +default.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h +default.o: download.h emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h +default.o: nicedit.h node.h priv.h reload.h rm.h run.h specialdefault.h +default.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h +default.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h default.o: ../templates/htmltextstream.h ../notify/notifythread.h default.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h default.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h @@ -199,25 +197,25 @@ default.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h download.o: download.h functionbase.h ../core/item.h ../db/db.h download.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h download.o: ../core/textstream.h ../core/misc.h ../core/item.h -download.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h -download.o: ../core/user.h ../core/group.h ../core/dircontainer.h -download.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h -download.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h -download.o: ../core/request.h ../core/requesttypes.h ../core/error.h -download.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +download.o: ../core/requesttypes.h ../core/error.h ../db/dbitemquery.h +download.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h +download.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h +download.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h +download.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h +download.o: ../core/confparser.h ../core/htmlfilter.h download.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -download.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h -download.o: ../core/confparser.h ../core/request.h ../core/config.h -download.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h -download.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -download.o: ../templates/localefilter.h ../templates/locale.h -download.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h +download.o: ../core/plugindata.h ../core/rebus.h mount.h +download.o: ../templates/locale.h ../core/confparser.h ../core/request.h +download.o: ../core/config.h ../core/system.h ../core/dirs.h +download.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h +download.o: ../templates/misc.h ../templates/localefilter.h +download.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h download.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h download.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h download.o: privchanger.h chown.h ckeditor.h cp.h default.h emacs.h last.h -download.o: login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h -download.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h -download.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +download.o: login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h +download.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h +download.o: tinymce.h uname.h upload.h uptime.h who.h vim.h download.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h download.o: ../templates/htmltextstream.h ../notify/notifythread.h download.o: ../core/basethread.h ../core/synchro.h @@ -228,47 +226,46 @@ download.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h download.o: ../core/synchro.h emacs.o: emacs.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h emacs.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -emacs.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -emacs.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -emacs.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -emacs.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -emacs.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -emacs.o: ../core/error.h ../core/config.h ../core/confparser.h -emacs.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h -emacs.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -emacs.o: ../templates/locale.h ../core/confparser.h ../core/request.h -emacs.o: ../core/config.h ../core/system.h ../core/dirs.h -emacs.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h -emacs.o: ../templates/misc.h ../templates/localefilter.h -emacs.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -emacs.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -emacs.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h -emacs.o: chown.h ckeditor.h cp.h default.h download.h last.h login.h logout.h -emacs.o: ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h priv.h reload.h rm.h -emacs.o: run.h specialdefault.h stat.h subject.h template.h tinymce.h uname.h -emacs.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h -emacs.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -emacs.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -emacs.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -emacs.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -emacs.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -emacs.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -emacs.o: ../core/synchro.h ../templates/templates.h -emacs.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h -emacs.o: ../core/httpsimpleparser.h ../core/log.h -emacs.o: ../templates/indexpatterns.h ../core/sessionmanager.h +emacs.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h +emacs.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +emacs.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +emacs.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +emacs.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h +emacs.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +emacs.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +emacs.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h +emacs.o: ../core/confparser.h ../core/request.h ../core/config.h +emacs.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +emacs.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +emacs.o: ../templates/localefilter.h ../templates/locale.h +emacs.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +emacs.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +emacs.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h +emacs.o: default.h download.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h +emacs.o: nicedit.h node.h priv.h reload.h rm.h run.h specialdefault.h stat.h +emacs.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +emacs.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +emacs.o: ../templates/htmltextstream.h ../notify/notifythread.h +emacs.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +emacs.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +emacs.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +emacs.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +emacs.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +emacs.o: ../templates/templates.h ../templates/patterncacher.h +emacs.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h +emacs.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h emacs.o: ../core/sessioncontainer.h ../core/system.h functionbase.o: functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h functionbase.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -functionbase.o: ../core/misc.h ../core/item.h ../core/error.h -functionbase.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h -functionbase.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h -functionbase.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h -functionbase.o: ../core/slog.h ../core/cur.h ../core/request.h -functionbase.o: ../core/requesttypes.h ../core/error.h ../core/config.h +functionbase.o: ../core/misc.h ../core/item.h ../core/requesttypes.h +functionbase.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h +functionbase.o: ../core/user.h ../core/group.h ../core/dircontainer.h +functionbase.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h +functionbase.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +functionbase.o: ../core/request.h ../core/error.h ../core/config.h functionbase.o: ../core/confparser.h ../core/htmlfilter.h functionbase.o: ../templates/htmltextstream.h ../core/session.h -functionbase.o: ../core/user.h ../core/plugindata.h ../core/rebus.h +functionbase.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h functionbase.o: ../templates/locale.h ../core/confparser.h ../core/request.h functionbase.o: ../core/config.h ../core/system.h ../core/dirs.h functionbase.o: ../core/dircontainer.h ../notify/notify.h @@ -278,10 +275,10 @@ functionbase.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h functionbase.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h functionbase.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h functionbase.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h -functionbase.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mount.h -functionbase.o: mv.h nicedit.h node.h priv.h reload.h rm.h run.h -functionbase.o: specialdefault.h stat.h subject.h template.h tinymce.h -functionbase.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +functionbase.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h +functionbase.o: nicedit.h node.h priv.h reload.h rm.h run.h specialdefault.h +functionbase.o: stat.h subject.h template.h tinymce.h uname.h upload.h +functionbase.o: uptime.h who.h vim.h ../core/htmlfilter.h functionbase.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h functionbase.o: ../notify/notifythread.h ../core/basethread.h functionbase.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h @@ -292,67 +289,67 @@ functionbase.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h functionbase.o: ../core/synchro.h functionparser.o: functionparser.h ../db/db.h ../db/dbbase.h ../db/dbconn.h functionparser.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h -functionparser.o: ../core/item.h ../core/error.h ../db/dbitemquery.h -functionparser.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h -functionparser.o: ../core/group.h ../core/dircontainer.h +functionparser.o: ../core/item.h ../core/requesttypes.h ../core/error.h +functionparser.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h +functionparser.o: ../core/user.h ../core/group.h ../core/dircontainer.h functionparser.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h functionparser.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h -functionparser.o: ../core/request.h ../core/requesttypes.h ../core/error.h -functionparser.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +functionparser.o: ../core/request.h ../core/error.h ../core/config.h +functionparser.o: ../core/confparser.h ../core/htmlfilter.h functionparser.o: ../templates/htmltextstream.h ../core/session.h -functionparser.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -functionparser.o: ../templates/locale.h ../core/confparser.h ../core/cur.h +functionparser.o: ../core/user.h ../core/plugindata.h ../core/rebus.h mount.h +functionparser.o: functionbase.h ../core/request.h ../core/config.h functionparser.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h functionparser.o: ../notify/notify.h ../notify/notifypool.h +functionparser.o: ../templates/locale.h ../core/confparser.h functionparser.o: ../templates/misc.h ../templates/localefilter.h functionparser.o: ../templates/locale.h ../../ezc/src/ezc.h functionparser.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -functionparser.o: ../../ezc/src/pattern.h functions.h functionbase.h -functionparser.o: ../core/request.h ../core/config.h ../core/synchro.h -functionparser.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h -functionparser.o: cp.h default.h download.h emacs.h last.h login.h logout.h -functionparser.o: ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h priv.h -functionparser.o: reload.h rm.h run.h specialdefault.h stat.h subject.h -functionparser.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -functionparser.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h -functionparser.o: ../templates/htmltextstream.h ../notify/notifythread.h -functionparser.o: ../core/basethread.h ../core/synchro.h -functionparser.o: ../notify/templatesnotify.h ../core/users.h -functionparser.o: ../core/ugcontainer.h ../core/lastcontainer.h -functionparser.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h -functionparser.o: ../core/users.h ../core/groups.h ../core/group.h -functionparser.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -functionparser.o: ../core/log.h +functionparser.o: ../../ezc/src/pattern.h functions.h adduser.h cat.h chmod.h +functionparser.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h +functionparser.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h +functionparser.o: nicedit.h node.h priv.h reload.h rm.h run.h +functionparser.o: specialdefault.h stat.h subject.h template.h tinymce.h +functionparser.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +functionparser.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +functionparser.o: ../notify/notifythread.h ../core/basethread.h +functionparser.o: ../core/synchro.h ../notify/templatesnotify.h +functionparser.o: ../core/users.h ../core/ugcontainer.h +functionparser.o: ../core/lastcontainer.h ../core/mounts.h +functionparser.o: ../core/mountparser.h ../core/crypt.h ../core/users.h +functionparser.o: ../core/groups.h ../core/group.h ../core/loadavg.h +functionparser.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +functionparser.o: ../core/cur.h ../core/log.h functions.o: functions.h functionbase.h ../core/item.h ../db/db.h functions.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h functions.o: ../core/textstream.h ../core/misc.h ../core/item.h -functions.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h -functions.o: ../core/user.h ../core/group.h ../core/dircontainer.h -functions.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h -functions.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h -functions.o: ../core/request.h ../core/requesttypes.h ../core/error.h -functions.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +functions.o: ../core/requesttypes.h ../core/error.h ../db/dbitemquery.h +functions.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h +functions.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h +functions.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h +functions.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h +functions.o: ../core/confparser.h ../core/htmlfilter.h functions.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -functions.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h -functions.o: ../core/confparser.h ../core/request.h ../core/config.h -functions.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h -functions.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -functions.o: ../templates/localefilter.h ../templates/locale.h -functions.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h +functions.o: ../core/plugindata.h ../core/rebus.h mount.h +functions.o: ../templates/locale.h ../core/confparser.h ../core/request.h +functions.o: ../core/config.h ../core/system.h ../core/dirs.h +functions.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h +functions.o: ../templates/misc.h ../templates/localefilter.h +functions.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h functions.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h functions.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h functions.o: ../notify/templatesnotify.h ../core/users.h functions.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h -functions.o: mount.h ../core/mountparser.h ../core/crypt.h run.h -functions.o: ../core/users.h ../core/groups.h ../core/group.h -functions.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -functions.o: ../core/synchro.h functionparser.h ../core/cur.h adduser.h cat.h -functions.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h -functions.o: download.h emacs.h last.h login.h logout.h ln.h ls.h mkdir.h -functions.o: mv.h nicedit.h node.h priv.h reload.h rm.h specialdefault.h -functions.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h -functions.o: who.h vim.h ../core/htmlfilter.h ../core/log.h ../core/misc.h +functions.o: ../core/mountparser.h ../core/crypt.h run.h ../core/users.h +functions.o: ../core/groups.h ../core/group.h ../core/loadavg.h +functions.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +functions.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h +functions.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h +functions.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h +functions.o: node.h priv.h reload.h rm.h specialdefault.h stat.h subject.h +functions.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +functions.o: ../core/htmlfilter.h ../core/log.h ../core/misc.h functions.o: ../core/plugin.h ../core/pluginmsg.h ../core/system.h functions.o: ../core/sessionmanager.h ../core/sessioncontainer.h functions.o: ../functions/functions.h ../templates/templates.h @@ -361,42 +358,41 @@ functions.o: ../core/httpsimpleparser.h ../core/log.h functions.o: ../templates/indexpatterns.h ../core/sessionmanager.h last.o: last.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h last.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -last.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -last.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -last.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -last.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -last.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -last.o: ../core/error.h ../core/config.h ../core/confparser.h -last.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h -last.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -last.o: ../templates/locale.h ../core/confparser.h ../core/request.h -last.o: ../core/config.h ../core/system.h ../core/dirs.h -last.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h -last.o: ../templates/misc.h ../templates/localefilter.h ../templates/locale.h -last.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +last.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h +last.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +last.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +last.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +last.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h +last.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +last.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +last.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h +last.o: ../core/confparser.h ../core/request.h ../core/config.h +last.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +last.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +last.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h +last.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h last.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h last.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h -last.o: default.h download.h emacs.h login.h logout.h ln.h ls.h mkdir.h -last.o: mount.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h -last.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h -last.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h -last.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -last.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -last.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -last.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -last.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -last.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -last.o: ../core/synchro.h +last.o: default.h download.h emacs.h login.h logout.h ln.h ls.h mkdir.h mv.h +last.o: nicedit.h node.h priv.h reload.h rm.h run.h specialdefault.h stat.h +last.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +last.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +last.o: ../templates/htmltextstream.h ../notify/notifythread.h +last.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +last.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +last.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +last.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +last.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h ln.o: ln.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h ln.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h -ln.o: ../core/item.h ../core/error.h ../db/dbitemquery.h -ln.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -ln.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -ln.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -ln.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h +ln.o: ../core/item.h ../core/requesttypes.h ../core/error.h +ln.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +ln.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +ln.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +ln.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h ln.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h ln.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -ln.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h +ln.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h ln.o: ../core/confparser.h ../core/request.h ../core/config.h ln.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ln.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h @@ -404,8 +400,8 @@ ln.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h ln.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h ln.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h ln.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -ln.o: last.h login.h logout.h ls.h mkdir.h mount.h mv.h nicedit.h node.h -ln.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h template.h +ln.o: last.h login.h logout.h ls.h mkdir.h mv.h nicedit.h node.h priv.h +ln.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h ln.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h ln.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h ln.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h @@ -416,54 +412,53 @@ ln.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h ln.o: ../core/synchro.h ../core/misc.h ../functions/functions.h login.o: login.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h login.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -login.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -login.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -login.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -login.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -login.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -login.o: ../core/error.h ../core/config.h ../core/confparser.h -login.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h -login.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -login.o: ../templates/locale.h ../core/confparser.h ../core/request.h -login.o: ../core/config.h ../core/system.h ../core/dirs.h -login.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h -login.o: ../templates/misc.h ../templates/localefilter.h -login.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -login.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -login.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h -login.o: chown.h ckeditor.h cp.h default.h download.h emacs.h last.h logout.h -login.o: ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h priv.h reload.h rm.h -login.o: run.h specialdefault.h stat.h subject.h template.h tinymce.h uname.h -login.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h -login.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -login.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -login.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -login.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -login.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -login.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -login.o: ../core/synchro.h +login.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h +login.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +login.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +login.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +login.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h +login.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +login.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +login.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h +login.o: ../core/confparser.h ../core/request.h ../core/config.h +login.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +login.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +login.o: ../templates/localefilter.h ../templates/locale.h +login.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +login.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +login.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h +login.o: default.h download.h emacs.h last.h logout.h ln.h ls.h mkdir.h mv.h +login.o: nicedit.h node.h priv.h reload.h rm.h run.h specialdefault.h stat.h +login.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +login.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +login.o: ../templates/htmltextstream.h ../notify/notifythread.h +login.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +login.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +login.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +login.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +login.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h logout.o: logout.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h logout.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -logout.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -logout.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -logout.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -logout.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -logout.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -logout.o: ../core/error.h ../core/config.h ../core/confparser.h -logout.o: ../core/htmlfilter.h ../templates/htmltextstream.h -logout.o: ../core/session.h ../core/user.h ../core/plugindata.h -logout.o: ../core/rebus.h ../templates/locale.h ../core/confparser.h -logout.o: ../core/request.h ../core/config.h ../core/system.h ../core/dirs.h -logout.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h -logout.o: ../templates/misc.h ../templates/localefilter.h -logout.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -logout.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -logout.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h -logout.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -logout.o: last.h login.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h -logout.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h -logout.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -logout.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +logout.o: ../core/misc.h ../core/item.h ../core/requesttypes.h +logout.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h +logout.o: ../core/user.h ../core/group.h ../core/dircontainer.h +logout.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h +logout.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +logout.o: ../core/request.h ../core/error.h ../core/config.h +logout.o: ../core/confparser.h ../core/htmlfilter.h +logout.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +logout.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h +logout.o: ../core/confparser.h ../core/request.h ../core/config.h +logout.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +logout.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +logout.o: ../templates/localefilter.h ../templates/locale.h +logout.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +logout.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +logout.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h +logout.o: default.h download.h emacs.h last.h login.h ln.h ls.h mkdir.h mv.h +logout.o: nicedit.h node.h priv.h reload.h rm.h run.h specialdefault.h stat.h +logout.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h +logout.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h logout.o: ../templates/htmltextstream.h ../notify/notifythread.h logout.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h logout.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h @@ -472,14 +467,14 @@ logout.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h logout.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h ls.o: ls.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h ls.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h -ls.o: ../core/item.h ../core/error.h ../db/dbitemquery.h -ls.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -ls.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -ls.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -ls.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h +ls.o: ../core/item.h ../core/requesttypes.h ../core/error.h +ls.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +ls.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +ls.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +ls.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h ls.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h ls.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -ls.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h +ls.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h ls.o: ../core/confparser.h ../core/request.h ../core/config.h ls.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ls.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h @@ -487,8 +482,8 @@ ls.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h ls.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h ls.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h ls.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -ls.o: last.h login.h logout.h ln.h mkdir.h mount.h mv.h nicedit.h node.h -ls.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h template.h +ls.o: last.h login.h logout.h ln.h mkdir.h mv.h nicedit.h node.h priv.h +ls.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h ls.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h ls.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h ls.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h @@ -499,53 +494,52 @@ ls.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h ls.o: ../core/synchro.h mkdir.o: mkdir.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h mkdir.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -mkdir.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -mkdir.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -mkdir.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -mkdir.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -mkdir.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -mkdir.o: ../core/error.h ../core/config.h ../core/confparser.h -mkdir.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h -mkdir.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -mkdir.o: ../templates/locale.h ../core/confparser.h ../core/request.h -mkdir.o: ../core/config.h ../core/system.h ../core/dirs.h -mkdir.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h -mkdir.o: ../templates/misc.h ../templates/localefilter.h -mkdir.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -mkdir.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -mkdir.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h -mkdir.o: chown.h ckeditor.h cp.h default.h download.h emacs.h last.h login.h -mkdir.o: logout.h ln.h ls.h mount.h mv.h nicedit.h node.h priv.h reload.h -mkdir.o: rm.h run.h specialdefault.h stat.h subject.h template.h tinymce.h -mkdir.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h -mkdir.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -mkdir.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -mkdir.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -mkdir.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -mkdir.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -mkdir.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -mkdir.o: ../core/synchro.h +mkdir.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h +mkdir.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +mkdir.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +mkdir.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +mkdir.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h +mkdir.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +mkdir.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +mkdir.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h +mkdir.o: ../core/confparser.h ../core/request.h ../core/config.h +mkdir.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +mkdir.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +mkdir.o: ../templates/localefilter.h ../templates/locale.h +mkdir.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +mkdir.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +mkdir.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h +mkdir.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h mv.h +mkdir.o: nicedit.h node.h priv.h reload.h rm.h run.h specialdefault.h stat.h +mkdir.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +mkdir.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +mkdir.o: ../templates/htmltextstream.h ../notify/notifythread.h +mkdir.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +mkdir.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +mkdir.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +mkdir.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +mkdir.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h mount.o: mount.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h mount.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -mount.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -mount.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -mount.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -mount.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -mount.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -mount.o: ../core/error.h ../core/config.h ../core/confparser.h -mount.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h -mount.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -mount.o: ../templates/locale.h ../core/confparser.h ../core/request.h -mount.o: ../core/config.h ../core/system.h ../core/dirs.h -mount.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h -mount.o: ../templates/misc.h ../templates/localefilter.h -mount.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -mount.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -mount.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h -mount.o: chown.h ckeditor.h cp.h default.h download.h emacs.h last.h login.h -mount.o: logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h reload.h -mount.o: rm.h run.h specialdefault.h stat.h subject.h template.h tinymce.h -mount.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +mount.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h +mount.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +mount.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +mount.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +mount.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h +mount.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +mount.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +mount.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h +mount.o: ../core/confparser.h ../core/request.h ../core/config.h +mount.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +mount.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +mount.o: ../templates/localefilter.h ../templates/locale.h +mount.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +mount.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +mount.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h +mount.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h +mount.o: mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h +mount.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +mount.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h mount.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h mount.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h mount.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h @@ -555,14 +549,14 @@ mount.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h mount.o: ../core/synchro.h mv.o: mv.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h mv.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h -mv.o: ../core/item.h ../core/error.h ../db/dbitemquery.h -mv.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -mv.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -mv.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -mv.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h +mv.o: ../core/item.h ../core/requesttypes.h ../core/error.h +mv.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +mv.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +mv.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +mv.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h mv.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h mv.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -mv.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h +mv.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h mv.o: ../core/confparser.h ../core/request.h ../core/config.h mv.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h mv.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h @@ -570,8 +564,8 @@ mv.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h mv.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h mv.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h mv.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -mv.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h nicedit.h node.h -mv.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h template.h +mv.o: last.h login.h logout.h ln.h ls.h mkdir.h nicedit.h node.h priv.h +mv.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h mv.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h mv.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h mv.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h @@ -582,26 +576,26 @@ mv.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h mv.o: ../core/synchro.h nicedit.o: nicedit.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h nicedit.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -nicedit.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -nicedit.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -nicedit.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -nicedit.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -nicedit.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -nicedit.o: ../core/error.h ../core/config.h ../core/confparser.h -nicedit.o: ../core/htmlfilter.h ../templates/htmltextstream.h -nicedit.o: ../core/session.h ../core/user.h ../core/plugindata.h -nicedit.o: ../core/rebus.h ../templates/locale.h ../core/confparser.h -nicedit.o: ../core/request.h ../core/config.h ../core/system.h ../core/dirs.h -nicedit.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h -nicedit.o: ../templates/misc.h ../templates/localefilter.h -nicedit.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -nicedit.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -nicedit.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h -nicedit.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -nicedit.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h node.h -nicedit.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h -nicedit.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -nicedit.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +nicedit.o: ../core/misc.h ../core/item.h ../core/requesttypes.h +nicedit.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h +nicedit.o: ../core/user.h ../core/group.h ../core/dircontainer.h +nicedit.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h +nicedit.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +nicedit.o: ../core/request.h ../core/error.h ../core/config.h +nicedit.o: ../core/confparser.h ../core/htmlfilter.h +nicedit.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +nicedit.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h +nicedit.o: ../core/confparser.h ../core/request.h ../core/config.h +nicedit.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +nicedit.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +nicedit.o: ../templates/localefilter.h ../templates/locale.h +nicedit.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +nicedit.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +nicedit.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h +nicedit.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h +nicedit.o: mkdir.h mv.h node.h priv.h reload.h rm.h run.h specialdefault.h +nicedit.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h +nicedit.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h nicedit.o: ../templates/htmltextstream.h ../notify/notifythread.h nicedit.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h nicedit.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h @@ -610,81 +604,80 @@ nicedit.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h nicedit.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h node.o: node.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h node.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -node.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -node.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -node.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -node.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -node.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -node.o: ../core/error.h ../core/config.h ../core/confparser.h -node.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h -node.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -node.o: ../templates/locale.h ../core/confparser.h ../core/request.h -node.o: ../core/config.h ../core/system.h ../core/dirs.h -node.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h -node.o: ../templates/misc.h ../templates/localefilter.h ../templates/locale.h -node.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +node.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h +node.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +node.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +node.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +node.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h +node.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +node.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +node.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h +node.o: ../core/confparser.h ../core/request.h ../core/config.h +node.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +node.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +node.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h +node.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h node.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h node.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h node.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h -node.o: mkdir.h mount.h mv.h nicedit.h priv.h reload.h rm.h run.h -node.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h -node.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h -node.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -node.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -node.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -node.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -node.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -node.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -node.o: ../core/synchro.h +node.o: mkdir.h mv.h nicedit.h priv.h reload.h rm.h run.h specialdefault.h +node.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h who.h +node.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h +node.o: ../templates/htmltextstream.h ../notify/notifythread.h +node.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +node.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +node.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +node.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +node.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h priv.o: priv.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h priv.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -priv.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -priv.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -priv.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -priv.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -priv.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -priv.o: ../core/error.h ../core/config.h ../core/confparser.h -priv.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h -priv.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -priv.o: ../templates/locale.h ../core/confparser.h ../core/request.h -priv.o: ../core/config.h ../core/system.h ../core/dirs.h -priv.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h -priv.o: ../templates/misc.h ../templates/localefilter.h ../templates/locale.h -priv.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +priv.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h +priv.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +priv.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +priv.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +priv.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h +priv.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +priv.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +priv.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h +priv.o: ../core/confparser.h ../core/request.h ../core/config.h +priv.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +priv.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +priv.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h +priv.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h priv.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h priv.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h priv.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h -priv.o: mkdir.h mount.h mv.h nicedit.h node.h reload.h rm.h run.h -priv.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h -priv.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h -priv.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -priv.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -priv.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -priv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -priv.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -priv.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -priv.o: ../core/synchro.h +priv.o: mkdir.h mv.h nicedit.h node.h reload.h rm.h run.h specialdefault.h +priv.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h who.h +priv.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h +priv.o: ../templates/htmltextstream.h ../notify/notifythread.h +priv.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +priv.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +priv.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +priv.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +priv.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h privchanger.o: privchanger.h ../core/request.h ../core/system.h privchanger.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h privchanger.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h -privchanger.o: ../core/textstream.h ../core/misc.h ../core/error.h -privchanger.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h -privchanger.o: ../core/user.h ../core/group.h ../core/dircontainer.h -privchanger.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h -privchanger.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h -privchanger.o: ../core/request.h ../core/requesttypes.h ../core/error.h +privchanger.o: ../core/textstream.h ../core/misc.h ../core/requesttypes.h +privchanger.o: ../core/error.h ../db/dbitemquery.h ../core/item.h +privchanger.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h +privchanger.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h +privchanger.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h +privchanger.o: ../core/cur.h ../core/request.h ../core/error.h privchanger.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h privchanger.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -privchanger.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h -privchanger.o: ../core/confparser.h ../notify/notify.h ../notify/notifypool.h -privchanger.o: ../templates/misc.h ../templates/localefilter.h -privchanger.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h +privchanger.o: ../core/plugindata.h ../core/rebus.h mount.h functionbase.h +privchanger.o: ../core/config.h ../core/synchro.h ../notify/notify.h +privchanger.o: ../notify/notifypool.h ../templates/locale.h +privchanger.o: ../core/confparser.h ../templates/misc.h +privchanger.o: ../templates/localefilter.h ../templates/locale.h +privchanger.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h privchanger.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -privchanger.o: functionbase.h ../core/config.h ../core/synchro.h privchanger.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h chown.h privchanger.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h -privchanger.o: logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h -privchanger.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h +privchanger.o: logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h +privchanger.o: reload.h rm.h run.h specialdefault.h stat.h subject.h privchanger.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h privchanger.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h privchanger.o: ../templates/htmltextstream.h ../notify/notifythread.h @@ -696,26 +689,26 @@ privchanger.o: ../core/groups.h ../core/group.h ../core/loadavg.h privchanger.o: ../core/thumb.h ../core/basethread.h reload.o: reload.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h reload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -reload.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -reload.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -reload.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -reload.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -reload.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -reload.o: ../core/error.h ../core/config.h ../core/confparser.h -reload.o: ../core/htmlfilter.h ../templates/htmltextstream.h -reload.o: ../core/session.h ../core/user.h ../core/plugindata.h -reload.o: ../core/rebus.h ../templates/locale.h ../core/confparser.h -reload.o: ../core/request.h ../core/config.h ../core/system.h ../core/dirs.h -reload.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h -reload.o: ../templates/misc.h ../templates/localefilter.h -reload.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -reload.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -reload.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h -reload.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -reload.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h -reload.o: node.h priv.h rm.h run.h specialdefault.h stat.h subject.h -reload.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -reload.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +reload.o: ../core/misc.h ../core/item.h ../core/requesttypes.h +reload.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h +reload.o: ../core/user.h ../core/group.h ../core/dircontainer.h +reload.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h +reload.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +reload.o: ../core/request.h ../core/error.h ../core/config.h +reload.o: ../core/confparser.h ../core/htmlfilter.h +reload.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +reload.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h +reload.o: ../core/confparser.h ../core/request.h ../core/config.h +reload.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +reload.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +reload.o: ../templates/localefilter.h ../templates/locale.h +reload.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +reload.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +reload.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h +reload.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h +reload.o: mkdir.h mv.h nicedit.h node.h priv.h rm.h run.h specialdefault.h +reload.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h +reload.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h reload.o: ../templates/htmltextstream.h ../notify/notifythread.h reload.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h reload.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h @@ -728,14 +721,14 @@ reload.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h reload.o: ../core/sessioncontainer.h ../core/system.h rm.o: rm.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h rm.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h -rm.o: ../core/item.h ../core/error.h ../db/dbitemquery.h -rm.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -rm.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -rm.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -rm.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h +rm.o: ../core/item.h ../core/requesttypes.h ../core/error.h +rm.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +rm.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +rm.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +rm.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h rm.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h rm.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -rm.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h +rm.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h rm.o: ../core/confparser.h ../core/request.h ../core/config.h rm.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h rm.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h @@ -743,9 +736,9 @@ rm.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h rm.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h rm.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h rm.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -rm.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h -rm.o: priv.h reload.h run.h specialdefault.h stat.h subject.h template.h -rm.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +rm.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h +rm.o: reload.h run.h specialdefault.h stat.h subject.h template.h tinymce.h +rm.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h rm.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h rm.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h rm.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h @@ -760,14 +753,14 @@ rm.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h rm.o: ../core/sessionmanager.h ../core/misc.h run.o: run.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h run.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -run.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -run.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -run.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -run.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -run.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h +run.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h +run.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +run.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +run.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +run.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h run.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h run.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -run.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h +run.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h run.o: ../core/confparser.h ../core/request.h ../core/config.h run.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h run.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h @@ -775,40 +768,40 @@ run.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h run.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h run.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h run.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -run.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h -run.o: node.h priv.h reload.h rm.h specialdefault.h stat.h subject.h -run.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -run.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h -run.o: ../templates/htmltextstream.h ../notify/notifythread.h -run.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -run.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -run.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h -run.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -run.o: ../core/basethread.h ../core/synchro.h +run.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h +run.o: reload.h rm.h specialdefault.h stat.h subject.h template.h tinymce.h +run.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +run.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +run.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +run.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +run.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +run.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +run.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +run.o: ../core/synchro.h specialdefault.o: specialdefault.h functionbase.h ../core/item.h ../db/db.h specialdefault.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h specialdefault.o: ../core/textstream.h ../core/misc.h ../core/item.h -specialdefault.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h -specialdefault.o: ../core/user.h ../core/group.h ../core/dircontainer.h -specialdefault.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h -specialdefault.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h -specialdefault.o: ../core/request.h ../core/requesttypes.h ../core/error.h -specialdefault.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h -specialdefault.o: ../templates/htmltextstream.h ../core/session.h -specialdefault.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -specialdefault.o: ../templates/locale.h ../core/confparser.h -specialdefault.o: ../core/request.h ../core/config.h ../core/system.h -specialdefault.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h -specialdefault.o: ../notify/notifypool.h ../templates/misc.h -specialdefault.o: ../templates/localefilter.h ../templates/locale.h -specialdefault.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h -specialdefault.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -specialdefault.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h -specialdefault.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h -specialdefault.o: download.h emacs.h last.h login.h logout.h ln.h ls.h -specialdefault.o: mkdir.h mount.h mv.h nicedit.h node.h priv.h reload.h rm.h -specialdefault.o: run.h stat.h subject.h template.h tinymce.h uname.h -specialdefault.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +specialdefault.o: ../core/requesttypes.h ../core/error.h ../db/dbitemquery.h +specialdefault.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h +specialdefault.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h +specialdefault.o: ../core/textstream.h ../core/logmanipulators.h +specialdefault.o: ../core/slog.h ../core/cur.h ../core/request.h +specialdefault.o: ../core/error.h ../core/config.h ../core/confparser.h +specialdefault.o: ../core/htmlfilter.h ../templates/htmltextstream.h +specialdefault.o: ../core/session.h ../core/user.h ../core/plugindata.h +specialdefault.o: ../core/rebus.h mount.h ../templates/locale.h +specialdefault.o: ../core/confparser.h ../core/request.h ../core/config.h +specialdefault.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +specialdefault.o: ../notify/notify.h ../notify/notifypool.h +specialdefault.o: ../templates/misc.h ../templates/localefilter.h +specialdefault.o: ../templates/locale.h ../../ezc/src/ezc.h +specialdefault.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h +specialdefault.o: ../../ezc/src/pattern.h functions.h functionparser.h +specialdefault.o: ../core/cur.h adduser.h cat.h chmod.h privchanger.h chown.h +specialdefault.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h +specialdefault.o: logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h +specialdefault.o: reload.h rm.h run.h stat.h subject.h template.h tinymce.h +specialdefault.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h specialdefault.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h specialdefault.o: ../notify/notifythread.h ../core/basethread.h specialdefault.o: ../core/synchro.h ../notify/templatesnotify.h @@ -819,23 +812,23 @@ specialdefault.o: ../core/groups.h ../core/group.h ../core/loadavg.h specialdefault.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h stat.o: stat.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h stat.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -stat.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -stat.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -stat.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -stat.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -stat.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -stat.o: ../core/error.h ../core/config.h ../core/confparser.h -stat.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h -stat.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -stat.o: ../templates/locale.h ../core/confparser.h ../core/request.h -stat.o: ../core/config.h ../core/system.h ../core/dirs.h -stat.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h -stat.o: ../templates/misc.h ../templates/localefilter.h ../templates/locale.h -stat.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +stat.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h +stat.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +stat.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +stat.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +stat.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h +stat.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +stat.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +stat.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h +stat.o: ../core/confparser.h ../core/request.h ../core/config.h +stat.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +stat.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +stat.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h +stat.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h stat.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h stat.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h stat.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h -stat.o: mkdir.h mount.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h +stat.o: mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h stat.o: specialdefault.h subject.h template.h tinymce.h uname.h upload.h stat.o: uptime.h who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h stat.o: ../templates/htmltextstream.h ../notify/notifythread.h @@ -846,54 +839,55 @@ stat.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h stat.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h subject.o: subject.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h subject.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -subject.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -subject.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -subject.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -subject.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -subject.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -subject.o: ../core/error.h ../core/config.h ../core/confparser.h -subject.o: ../core/htmlfilter.h ../templates/htmltextstream.h -subject.o: ../core/session.h ../core/user.h ../core/plugindata.h -subject.o: ../core/rebus.h ../templates/locale.h ../core/confparser.h -subject.o: ../core/request.h ../core/config.h ../core/system.h ../core/dirs.h -subject.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h -subject.o: ../templates/misc.h ../templates/localefilter.h -subject.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -subject.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -subject.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h -subject.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -subject.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h -subject.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h -subject.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -subject.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h -subject.o: ../templates/htmltextstream.h ../notify/notifythread.h -subject.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -subject.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -subject.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h -subject.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -subject.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +subject.o: ../core/misc.h ../core/item.h ../core/requesttypes.h +subject.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h +subject.o: ../core/user.h ../core/group.h ../core/dircontainer.h +subject.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h +subject.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +subject.o: ../core/request.h ../core/error.h ../core/config.h +subject.o: ../core/confparser.h ../core/htmlfilter.h +subject.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +subject.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h +subject.o: ../core/confparser.h ../core/request.h ../core/config.h +subject.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +subject.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +subject.o: ../templates/localefilter.h ../templates/locale.h +subject.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +subject.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +subject.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h +subject.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h +subject.o: mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h +subject.o: specialdefault.h stat.h template.h tinymce.h uname.h upload.h +subject.o: uptime.h who.h vim.h ../core/htmlfilter.h +subject.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +subject.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +subject.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +subject.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +subject.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +subject.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +subject.o: ../core/synchro.h template.o: template.h functionbase.h ../core/item.h ../db/db.h template.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h template.o: ../core/textstream.h ../core/misc.h ../core/item.h -template.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h -template.o: ../core/user.h ../core/group.h ../core/dircontainer.h -template.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h -template.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h -template.o: ../core/request.h ../core/requesttypes.h ../core/error.h -template.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +template.o: ../core/requesttypes.h ../core/error.h ../db/dbitemquery.h +template.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h +template.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h +template.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h +template.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h +template.o: ../core/confparser.h ../core/htmlfilter.h template.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -template.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h -template.o: ../core/confparser.h ../core/request.h ../core/config.h -template.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h -template.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -template.o: ../templates/localefilter.h ../templates/locale.h -template.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h +template.o: ../core/plugindata.h ../core/rebus.h mount.h +template.o: ../templates/locale.h ../core/confparser.h ../core/request.h +template.o: ../core/config.h ../core/system.h ../core/dirs.h +template.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h +template.o: ../templates/misc.h ../templates/localefilter.h +template.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h template.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h template.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h template.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h -template.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h -template.o: nicedit.h node.h priv.h reload.h rm.h run.h specialdefault.h -template.o: stat.h subject.h tinymce.h uname.h upload.h uptime.h who.h vim.h +template.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h +template.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h +template.o: subject.h tinymce.h uname.h upload.h uptime.h who.h vim.h template.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h template.o: ../templates/htmltextstream.h ../notify/notifythread.h template.o: ../core/basethread.h ../core/synchro.h @@ -904,127 +898,132 @@ template.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h template.o: ../core/synchro.h ../core/misc.h tinymce.o: tinymce.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h tinymce.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -tinymce.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -tinymce.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -tinymce.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -tinymce.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -tinymce.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -tinymce.o: ../core/error.h ../core/config.h ../core/confparser.h -tinymce.o: ../core/htmlfilter.h ../templates/htmltextstream.h -tinymce.o: ../core/session.h ../core/user.h ../core/plugindata.h -tinymce.o: ../core/rebus.h ../templates/locale.h ../core/confparser.h -tinymce.o: ../core/request.h ../core/config.h ../core/system.h ../core/dirs.h -tinymce.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h -tinymce.o: ../templates/misc.h ../templates/localefilter.h -tinymce.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -tinymce.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -tinymce.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h -tinymce.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -tinymce.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h -tinymce.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h -tinymce.o: subject.h template.h uname.h upload.h uptime.h who.h vim.h -tinymce.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h -tinymce.o: ../templates/htmltextstream.h ../notify/notifythread.h -tinymce.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -tinymce.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -tinymce.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h -tinymce.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -tinymce.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +tinymce.o: ../core/misc.h ../core/item.h ../core/requesttypes.h +tinymce.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h +tinymce.o: ../core/user.h ../core/group.h ../core/dircontainer.h +tinymce.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h +tinymce.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +tinymce.o: ../core/request.h ../core/error.h ../core/config.h +tinymce.o: ../core/confparser.h ../core/htmlfilter.h +tinymce.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +tinymce.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h +tinymce.o: ../core/confparser.h ../core/request.h ../core/config.h +tinymce.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +tinymce.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +tinymce.o: ../templates/localefilter.h ../templates/locale.h +tinymce.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +tinymce.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +tinymce.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h +tinymce.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h +tinymce.o: mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h +tinymce.o: specialdefault.h stat.h subject.h template.h uname.h upload.h +tinymce.o: uptime.h who.h vim.h ../core/htmlfilter.h +tinymce.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +tinymce.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +tinymce.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +tinymce.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +tinymce.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +tinymce.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +tinymce.o: ../core/synchro.h uname.o: uname.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h uname.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -uname.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -uname.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -uname.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -uname.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -uname.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -uname.o: ../core/error.h ../core/config.h ../core/confparser.h -uname.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h -uname.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -uname.o: ../templates/locale.h ../core/confparser.h ../core/request.h -uname.o: ../core/config.h ../core/system.h ../core/dirs.h -uname.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h -uname.o: ../templates/misc.h ../templates/localefilter.h -uname.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -uname.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -uname.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h privchanger.h -uname.o: chown.h ckeditor.h cp.h default.h download.h emacs.h last.h login.h -uname.o: logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h node.h priv.h -uname.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h -uname.o: tinymce.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h -uname.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -uname.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -uname.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -uname.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -uname.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h -uname.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -uname.o: ../core/synchro.h +uname.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h +uname.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +uname.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +uname.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +uname.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h +uname.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +uname.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +uname.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h +uname.o: ../core/confparser.h ../core/request.h ../core/config.h +uname.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +uname.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +uname.o: ../templates/localefilter.h ../templates/locale.h +uname.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +uname.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +uname.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h +uname.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h +uname.o: mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h +uname.o: specialdefault.h stat.h subject.h template.h tinymce.h upload.h +uname.o: uptime.h who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h +uname.o: ../templates/htmltextstream.h ../notify/notifythread.h +uname.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +uname.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +uname.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +uname.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +uname.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h upload.o: upload.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h upload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -upload.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -upload.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -upload.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -upload.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -upload.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -upload.o: ../core/error.h ../core/config.h ../core/confparser.h -upload.o: ../core/htmlfilter.h ../templates/htmltextstream.h -upload.o: ../core/session.h ../core/user.h ../core/plugindata.h -upload.o: ../core/rebus.h ../templates/locale.h ../core/confparser.h -upload.o: ../core/request.h ../core/config.h ../core/system.h ../core/dirs.h -upload.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h -upload.o: ../templates/misc.h ../templates/localefilter.h -upload.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -upload.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -upload.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h -upload.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -upload.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h -upload.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h -upload.o: template.h tinymce.h uname.h uptime.h who.h vim.h -upload.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h -upload.o: ../templates/htmltextstream.h ../notify/notifythread.h -upload.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -upload.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -upload.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h -upload.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -upload.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h -upload.o: ../core/misc.h ../functions/functions.h +upload.o: ../core/misc.h ../core/item.h ../core/requesttypes.h +upload.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h +upload.o: ../core/user.h ../core/group.h ../core/dircontainer.h +upload.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h +upload.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +upload.o: ../core/request.h ../core/error.h ../core/config.h +upload.o: ../core/confparser.h ../core/htmlfilter.h +upload.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +upload.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h +upload.o: ../core/confparser.h ../core/request.h ../core/config.h +upload.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +upload.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +upload.o: ../templates/localefilter.h ../templates/locale.h +upload.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +upload.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +upload.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h +upload.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h +upload.o: mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h +upload.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +upload.o: uptime.h who.h vim.h ../core/htmlfilter.h +upload.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +upload.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +upload.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +upload.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +upload.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +upload.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +upload.o: ../core/synchro.h ../core/misc.h ../functions/functions.h +upload.o: ../templates/templates.h ../templates/patterncacher.h +upload.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h +upload.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h +upload.o: ../core/sessioncontainer.h ../core/system.h uptime.o: uptime.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h uptime.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -uptime.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -uptime.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -uptime.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -uptime.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -uptime.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -uptime.o: ../core/error.h ../core/config.h ../core/confparser.h -uptime.o: ../core/htmlfilter.h ../templates/htmltextstream.h -uptime.o: ../core/session.h ../core/user.h ../core/plugindata.h -uptime.o: ../core/rebus.h ../templates/locale.h ../core/confparser.h -uptime.o: ../core/request.h ../core/config.h ../core/system.h ../core/dirs.h -uptime.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h -uptime.o: ../templates/misc.h ../templates/localefilter.h -uptime.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -uptime.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -uptime.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h -uptime.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -uptime.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h -uptime.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h -uptime.o: template.h tinymce.h uname.h upload.h who.h vim.h -uptime.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h -uptime.o: ../templates/htmltextstream.h ../notify/notifythread.h -uptime.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -uptime.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -uptime.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h -uptime.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -uptime.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +uptime.o: ../core/misc.h ../core/item.h ../core/requesttypes.h +uptime.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h +uptime.o: ../core/user.h ../core/group.h ../core/dircontainer.h +uptime.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h +uptime.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +uptime.o: ../core/request.h ../core/error.h ../core/config.h +uptime.o: ../core/confparser.h ../core/htmlfilter.h +uptime.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +uptime.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h +uptime.o: ../core/confparser.h ../core/request.h ../core/config.h +uptime.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +uptime.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +uptime.o: ../templates/localefilter.h ../templates/locale.h +uptime.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +uptime.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +uptime.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h +uptime.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h +uptime.o: mkdir.h mv.h nicedit.h node.h priv.h reload.h rm.h run.h +uptime.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +uptime.o: upload.h who.h vim.h ../core/htmlfilter.h +uptime.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +uptime.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +uptime.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +uptime.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +uptime.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +uptime.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +uptime.o: ../core/synchro.h vim.o: vim.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h vim.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -vim.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -vim.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -vim.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -vim.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -vim.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h +vim.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h +vim.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +vim.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +vim.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +vim.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h vim.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h vim.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -vim.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h +vim.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h vim.o: ../core/confparser.h ../core/request.h ../core/config.h vim.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h vim.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h @@ -1032,26 +1031,26 @@ vim.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h vim.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h vim.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h vim.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -vim.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h -vim.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h -vim.o: template.h tinymce.h uname.h upload.h uptime.h who.h -vim.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h -vim.o: ../templates/htmltextstream.h ../notify/notifythread.h -vim.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -vim.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -vim.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h -vim.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -vim.o: ../core/basethread.h ../core/synchro.h +vim.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h +vim.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h +vim.o: tinymce.h uname.h upload.h uptime.h who.h ../core/htmlfilter.h +vim.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +vim.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +vim.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +vim.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +vim.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +vim.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +vim.o: ../core/synchro.h who.o: who.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h who.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h -who.o: ../core/misc.h ../core/item.h ../core/error.h ../db/dbitemquery.h -who.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -who.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -who.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -who.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h +who.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h +who.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h +who.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +who.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +who.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/error.h who.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h who.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -who.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h +who.o: ../core/plugindata.h ../core/rebus.h mount.h ../templates/locale.h who.o: ../core/confparser.h ../core/request.h ../core/config.h who.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h who.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h @@ -1059,13 +1058,13 @@ who.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h who.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h who.o: functions.h functionparser.h ../core/cur.h adduser.h cat.h chmod.h who.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -who.o: last.h login.h logout.h ln.h ls.h mkdir.h mount.h mv.h nicedit.h -who.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h -who.o: template.h tinymce.h uname.h upload.h uptime.h vim.h -who.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h -who.o: ../templates/htmltextstream.h ../notify/notifythread.h -who.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -who.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -who.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h -who.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -who.o: ../core/basethread.h ../core/synchro.h +who.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h node.h priv.h +who.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h +who.o: tinymce.h uname.h upload.h uptime.h vim.h ../core/htmlfilter.h +who.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +who.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +who.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +who.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +who.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h +who.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +who.o: ../core/synchro.h diff --git a/functions/ckeditor.cpp b/functions/ckeditor.cpp index 20e6429..6da089c 100755 --- a/functions/ckeditor.cpp +++ b/functions/ckeditor.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ @@ -20,6 +20,11 @@ Ckeditor::Ckeditor() fun.url = L"ckeditor"; } +void Ckeditor::Init() +{ + system->AddCommonFileToVar(L"winix/ckeditor_full.js", L"ckeditor_full.js"); + system->AddCommonFileToVar(L"winix/ckeditor_winix.js", L"ckeditor_winix.js"); +} bool Ckeditor::HasAccess() { @@ -27,6 +32,16 @@ bool Ckeditor::HasAccess() } +void Ckeditor::MakeGet() +{ + cur->session->last_css.clear(); + int parcss = system->mounts.MountParCss(); + + if( cur->mount->param[parcss].defined ) + cur->session->last_css = cur->mount->param[parcss].arg; +} + + void Ckeditor::MakePost() { functions->fun_emacs.MakePost(); diff --git a/functions/ckeditor.h b/functions/ckeditor.h index fdea839..b9c33d0 100755 --- a/functions/ckeditor.h +++ b/functions/ckeditor.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2011, Tomasz Sowa * All rights reserved. * */ @@ -23,7 +23,9 @@ class Ckeditor : public FunctionBase public: Ckeditor(); + void Init(); bool HasAccess(); + void MakeGet(); void MakePost(); }; diff --git a/functions/rm.cpp b/functions/rm.cpp index 961cfb4..4015105 100755 --- a/functions/rm.cpp +++ b/functions/rm.cpp @@ -64,12 +64,17 @@ return true; bool Rm::HasAccess() { - if( !cur->request->is_item ) - return HasAccess(*cur->request->dir_tab.back()); - else - return HasAccess(cur->request->item); +bool res; -return true; + if( !cur->request->is_item ) + res = HasAccess(*cur->request->dir_tab.back()); + else + res = HasAccess(cur->request->item); + + if( !res && cur->request->IsParam(L"jquery_upload") ) + CreateJSON(res); + +return res; } @@ -219,9 +224,6 @@ void Rm::RemoveDir(const Item & dir) void Rm::RemoveFile() { RemoveFileOrSymlink(cur->request->item); - - if( cur->request->status == WINIX_ERR_OK ) - system->RedirectToLastDir(); } @@ -250,9 +252,6 @@ void Rm::RemoveDirContent() } RemoveDirContent(*cur->request->dir_tab.back()); - - if( cur->request->status == WINIX_ERR_OK ) - system->RedirectToLastDir(); } @@ -268,9 +267,6 @@ void Rm::RemoveDir() RemoveDir(*cur->request->dir_tab.back()); cur->request->dir_tab.erase(--cur->request->dir_tab.end()); - - if( cur->request->status == WINIX_ERR_OK ) - system->RedirectToLastDir(); } @@ -284,6 +280,18 @@ void Rm::Clear() +void Rm::CreateJSON(bool status) +{ + if( status ) + cur->request->page << "true\n"; + else + cur->request->page << "false\n"; + + cur->request->page_generated = true; + cur->request->use_html_filter = false; +} + + void Rm::MakePost() { Prepare(); @@ -301,6 +309,13 @@ void Rm::MakePost() } Clear(); + + if( cur->request->IsParam(L"jquery_upload") ) + CreateJSON(true); + else + if( cur->request->status == WINIX_ERR_OK ) + system->RedirectToLastDir(); + } diff --git a/functions/rm.h b/functions/rm.h index b8bf67b..cc995f8 100755 --- a/functions/rm.h +++ b/functions/rm.h @@ -60,6 +60,7 @@ private: void RemoveDirContent(); void RemoveDir(); void RemoveFile(); + void CreateJSON(bool status); }; diff --git a/functions/tinymce.cpp b/functions/tinymce.cpp index 208543f..963a7e0 100755 --- a/functions/tinymce.cpp +++ b/functions/tinymce.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ @@ -21,12 +21,28 @@ Tinymce::Tinymce() } +void Tinymce::Init() +{ + system->AddCommonFileToVar(L"winix/tinymce.js", L"tinymce.js"); +} + + bool Tinymce::HasAccess() { return functions->fun_emacs.HasAccess(); } +void Tinymce::MakeGet() +{ + cur->session->last_css.clear(); + int parcss = system->mounts.MountParCss(); + + if( cur->mount->param[parcss].defined ) + cur->session->last_css = cur->mount->param[parcss].arg; +} + + void Tinymce::MakePost() { diff --git a/functions/tinymce.h b/functions/tinymce.h index e6dc307..c104d6a 100755 --- a/functions/tinymce.h +++ b/functions/tinymce.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2011, Tomasz Sowa * All rights reserved. * */ @@ -22,7 +22,9 @@ class Tinymce : public FunctionBase public: Tinymce(); + void Init(); bool HasAccess(); + void MakeGet(); void MakePost(); }; diff --git a/functions/upload.cpp b/functions/upload.cpp index 704120d..9d93d37 100755 --- a/functions/upload.cpp +++ b/functions/upload.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,7 @@ #include "upload.h" #include "core/misc.h" #include "functions/functions.h" +#include "templates/templates.h" #include "utf8.h" @@ -28,7 +29,6 @@ Upload::Upload() - bool Upload::HasAccess(const Item & item) { // you can use 'upload' only in a directory @@ -97,7 +97,7 @@ void Upload::CreateThumb(Item & item) int mode = config->thumb_mode; int index; - // reading width and height from then mount point (if exists) + // reading width and height from the mount point (if exists) index = system->mounts.MountParThumbSize(); if( m.param[index].defined && m.param[index].arg.size() == 2 ) @@ -112,7 +112,7 @@ void Upload::CreateThumb(Item & item) if( cy > 2000 ) cy = 2000; - // reading thumb mode from then mount point (if exists) + // reading thumb mode from the mount point (if exists) index = system->mounts.MountParThumbMode(); if( m.param[index].defined && m.param[index].arg.size() == 1 ) @@ -138,6 +138,9 @@ void Upload::UploadFile(Item & item, const std::wstring & tmp_filename) if( item.file_type == WINIX_ITEM_FILETYPE_IMAGE && config->create_thumb ) CreateThumb(item); + + if( is_jquery_upload ) + cur->request->item_tab.push_back(item); } else { @@ -189,12 +192,17 @@ void Upload::UploadMulti() cur->request->item.subject = file_name; cur->request->item.url = file_name; cur->request->item.file_type = SelectFileType(file_name); + cur->request->item.file_size = i->second.file_size; functions->PrepareUrl(cur->request->item); UploadFile(cur->request->item, i->second.tmp_filename); + i->second.tmp_filename.clear(); } - system->RedirectToLastDir(); + if( is_jquery_upload ) + CreateJSON(); + else + system->RedirectToLastDir(); } @@ -209,8 +217,11 @@ void Upload::UploadSingle() functions->SetUser(cur->request->item); cur->request->item.privileges = 0644; // !! tymczasowo - const wchar_t * file_name = cur->request->post_file_tab.begin()->second.filename.c_str(); + PostFile & post_file = cur->request->post_file_tab.begin()->second; + + const wchar_t * file_name = post_file.filename.c_str(); cur->request->item.file_type = SelectFileType(file_name); + cur->request->item.file_size = post_file.file_size; if( !has_subject ) cur->request->item.subject = file_name; @@ -221,17 +232,24 @@ void Upload::UploadSingle() functions->PrepareUrl(cur->request->item); } - UploadFile(cur->request->item, cur->request->post_file_tab.begin()->second.tmp_filename); + UploadFile(cur->request->item, post_file.tmp_filename); + post_file.tmp_filename.clear(); + if( is_jquery_upload ) + CreateJSON(); + else if( cur->request->status == WINIX_ERR_OK ) system->RedirectTo(cur->request->item, L"/cat"); } -// !! dodac usuwanie plikow statycznych przez rm + void Upload::MakePost() { + cur->request->item_tab.clear(); + is_jquery_upload = cur->request->IsParam(L"jquery_upload"); + if( cur->request->post_file_tab.empty() ) { cur->request->status = WINIX_ERR_PERMISSION_DENIED; @@ -249,6 +267,39 @@ void Upload::MakePost() +void Upload::CreateJSON() +{ + // !! locale beda w zaleznosci od uzytkownika + size_t loc = TemplatesFunctions::locale.GetLang(); + size_t idu = static_cast(id); + TemplatesFunctions::Patterns & patfun = TemplatesFunctions::patterns_fun; + + if( loc < patfun.size() && idu < patfun[loc].size() ) + { + templates->Generate(patfun[loc][idu]); + cur->request->page_generated = true; + cur->request->use_html_filter = false; + } + + // !! usunac + //log << log1 << cur->request->page.Str() << logend; +} + + +void Upload::MakeGet() +{ + if( cur->request->IsParam(L"jquery_upload") ) + { + query.Clear(); + query.WhereParentId(cur->request->dir_tab.back()->id); + query.WhereType(Item::file); + query.WhereFileType(WINIX_ITEM_FILETYPE_NONE, false); + + db->GetItems(cur->request->item_tab, query); + + CreateJSON(); + } +} } // namespace diff --git a/functions/upload.h b/functions/upload.h index 0ac1c1a..c595e3d 100755 --- a/functions/upload.h +++ b/functions/upload.h @@ -25,12 +25,15 @@ public: Upload(); bool HasAccess(); void MakePost(); + void MakeGet(); void UploadFile(Item & item, const std::wstring & tmp_filename); private: std::wstring path; std::string patha, path_thumba; + DbItemQuery query; + bool is_jquery_upload; bool HasAccess(const Item & item); bool UploadSaveStaticFile(const Item & item, const std::wstring & tmp_filename); @@ -38,6 +41,7 @@ private: void UploadMulti(); void UploadSingle(); void CreateThumb(Item & item); + void CreateJSON(); }; diff --git a/functions/vim.cpp b/functions/vim.cpp index 1e82708..13ef5f8 100755 --- a/functions/vim.cpp +++ b/functions/vim.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2011, Tomasz Sowa * All rights reserved. * */ @@ -15,41 +15,6 @@ namespace Fun { -// WYMeditor doesn't work on different domains by default, -// solution: http://forum.wymeditor.org/forum/viewtopic.php?f=2&t=731&p=2507#p2504 -// we add one file to winix: /var/wymiframe.html -// in the future this will be removed - - -static const char vim_wymiframe[] = -"\n" -"\n" -"\n" -"\n" -"WYMeditor iframe\n" -"\n" -"\n" -"\n" -"\n" -"\n"; - - Vim::Vim() { fun.url = L"vim"; @@ -58,29 +23,11 @@ Vim::Vim() void Vim::Init() { - Item * var = system->dirs.CreateVarDir(); + // WYMeditor doesn't work on different domains by default, + // solution: http://forum.wymeditor.org/forum/viewtopic.php?f=2&t=731&p=2507#p2504 + // we add one file to winix: /var/wymiframe.html - if( var ) - { - Item temp; - - if( db->GetItem(var->id, L"wymiframe.html", temp) == WINIX_ERR_NO_ITEM ) - { - Item v; - - v.parent_id = var->id; - v.user_id = -1; - v.group_id = -1; - v.privileges = 0755; - v.subject = L"wymiframe.html"; - v.url = L"wymiframe.html"; - v.type = Item::file; - v.content_type = Item::ct_raw; - AssignString(vim_wymiframe, v.content); - - system->AddFile(v, false); - } - } + system->AddCommonFileToVar(L"winix/wymiframe.html", L"wymiframe.html"); } diff --git a/html/fun_cat.html b/html/fun_cat.html index f097739..905edf0 100755 --- a/html/fun_cat.html +++ b/html/fun_cat.html @@ -2,16 +2,34 @@ [if mount_page_arg_is "info"][include "item_info.html"][end] [if-one item_filetype_is_image] - [if-no item_has_thumb]

{creating_thumb}

[end] - [item_subject] + + [item_subject] + + [# we use pre.nowinixbreak to tell the html_filter not to put a blank space into those urles] + +
+ 
+	{cat_image_url}: [item_link]

+	{cat_image_thumb_url}: [item_link]/-/thumb
+
+
+ [item_print_content] + [else] + [if-no item_filetype_is_none] {download}: [item_subject] +
+ 
+		{cat_file_url}: [item_link]

+
+
[item_print_content] [else] [item_print_content] [end] + [end] diff --git a/html/fun_ckeditor.html b/html/fun_ckeditor.html index e7f964b..705d529 100755 --- a/html/fun_ckeditor.html +++ b/html/fun_ckeditor.html @@ -31,9 +31,9 @@ [if winix_function_param_is "full"] - + [else] - + [end] diff --git a/html/fun_upload.html b/html/fun_upload.html index d03a4c6..066dade 100755 --- a/html/fun_upload.html +++ b/html/fun_upload.html @@ -1,15 +1,49 @@ + [if winix_function_param_is "ckeditor_upload"] -[else] +[end] + + +[if winix_function_param_is "jquery_upload"] +\[ + [for item_tab] + \{ + "name":"[item_tab_url]", + "size":[item_tab_file_size], + "url":"[item_tab_link]", + [if item_tab_filetype_is_image]"thumbnail_url":"[if item_tab_has_thumb][item_tab_link]/-/thumb[else][item_tab_link][end]",[end] + "delete_url":"[item_tab_link]/rm/jquery_upload", + "delete_type":"POST" + \} + [if item_tab_has_next],[end] + + [end] +\] +[end] + + +[if-any-no winix_function_param_is "ckeditor_upload" winix_function_param_is "jquery_upload"]

{upload_header}

- [include "error.html"] -
+ +
+
{upload_form_legend} +
+ + + + +
+ +[if false] [if winix_function_param_is "multi"]

{upload_form_file_multi}

@@ -33,7 +67,7 @@ [include "fun_emacs_post.html"] [end] - +[end] [if-no user_logged]

{nick}:

@@ -42,8 +76,77 @@ [end] - + [if false][end]
+
+
+
+
+ + + + +
[end] diff --git a/html/index_head_functions_add.html b/html/index_head_functions_add.html index 1beb99e..58f462b 100755 --- a/html/index_head_functions_add.html +++ b/html/index_head_functions_add.html @@ -8,7 +8,7 @@ [if winix_function_is "tinymce"] - + [end] @@ -32,10 +32,6 @@ [end] -[if winix_has_plugin "stats"] - [include "stats_info.html"] -[end] - [if winix_function_is "ticket"] [# !! dodac lightboxa tylko jesli tickety zawieraja obrazki ] @@ -79,3 +75,34 @@ [end] [end] + + +[if winix_function_is "upload"] + + + + + + + + + + + [# other themes] + [if false] + + [end] + + + +[end] + + + + + +[if winix_has_plugin "stats"] + [include "stats_info.html"] +[end] + + diff --git a/locale/en b/locale/en index e915076..127f8f6 100755 --- a/locale/en +++ b/locale/en @@ -35,7 +35,11 @@ access_denied = Permission denied access_denied_msg = We are sory but you don't have access to the page. download = download -creating_thumb = Creating a thumbnail in progress... + +cat_image_url = Image url +cat_image_thumb_url = Thumbnail url +cat_file_url = File url + create_thread_header = Create thread form_thread_legend = Thread form @@ -178,12 +182,32 @@ template_form_legend = Template form template_form_info = Select a new template template_form_from_mount_point = from the mount point -upload_header = Upload a file +upload_header = Files manager upload_form_file = Browse for a file upload_form_file_multi = Browse for files upload_form_legend = Upload form upload_content = File description upload_submit = Upload +upload_add_files = Add files... +upload_start_upload = Start upload +upload_cancel_upload = Cancel upload +upload_delete_files = Delete all files +upload_error = Error +upload_file_too_big = File is too big +upload_file_too_small = File is too small +upload_filetype_not_allowed = Filetype not allowed +upload_max_files_exceeded = Max number of files exceeded +upload_start = Start +upload_cancel = Cancel +upload_bytes_exceed_file_size = Uploaded bytes exceed file size +upload_empty_result = Empty file upload result +upload_partial = File was only partially uploaded +upload_no_file = No File was uploaded +upload_missing_tmp_folder = Missing a temporary folder +upload_disc_failded = Failed to write file to disk +upload_extenstion_stop = File upload stopped by extension +upload_delete = Delete + who_header = Sessions who_tab_index = Ind. @@ -203,7 +227,7 @@ admin_nicedit_edit = Edit page (nicedit) admin_tinymce_add = Add page (tinymce) admin_tinymce_edit = Edit page (tinymce) admin_rm = Remove page (rm) -admin_upload = Upload an image or file (upload) +admin_upload = File manager (upload) login_header = Login diff --git a/locale/pl b/locale/pl index 0ce9187..c28894d 100755 --- a/locale/pl +++ b/locale/pl @@ -34,7 +34,11 @@ access_denied = Brak dostępu access_denied_msg = Przykro nam ale nie masz dostępu do tej części serwisu. download = Ściągnij plik -creating_thumb = Przygotowywanie miniatury trwa... + +cat_image_url = Adres obrazka +cat_image_thumb_url = Adres miniatury +cat_file_url = Adres pliku + create_thread_header = Załóż wątek form_thread_legend = Wypełnij wszystkie pozycje formularza @@ -190,12 +194,31 @@ template_form_info = Wybierz nowy szablon template_form_from_mount_point = z punktu montowania -upload_header = Prześlij plik +upload_header = Menedżer plików upload_form_file = Wybierz plik upload_form_file_multi = Wybierz pliki upload_form_legend = Formularz do wysłania pliku upload_content = Opis pliku upload_submit = Wyślij +upload_add_files = Dodaj pliki... +upload_start_upload = Rozpocznij wysyłanie +upload_cancel_upload = Przerwij wysyłanie +upload_delete_files = Skasuj wszystkie pliki +upload_error = Błąd +upload_file_too_big = Plik jest zbyt duży +upload_file_too_small = Plik jest zbyt mały +upload_filetype_not_allowed = Nieobsługiwany rodzaj pliku +upload_max_files_exceeded = Przekroczono dopuszczalną ilość plików +upload_start = Wyślij +upload_cancel = Przerwij +upload_bytes_exceed_file_size = Wysłana ilość bajtów przekracza rozmiar pliku +upload_empty_result = Otrzymano pusty wynik +upload_partial = Plik został jedynie częściowo przesłany +upload_no_file = Żaden plik nie został wysłany +upload_missing_tmp_folder = Brakuje katalogu tymczasowego +upload_disc_failded = Błąd zapisu pliku na dysk +upload_extenstion_stop = Wysyłanie pliku zatrzymane przez jakiś plugin +upload_delete = Usuń who_header = Lista sesji @@ -216,7 +239,7 @@ admin_nicedit_edit = Edytuj stronę (nicedit) admin_tinymce_add = Dodaj stronę (tinymce) admin_tinymce_edit = Edytuj stronę (tinymce) admin_rm = Usuń stronę (rm) -admin_upload = Wyślij zdjęcie lub plik (upload) +admin_upload = Menedżer plików (upload) login_header = Logowanie diff --git a/main/Makefile.dep b/main/Makefile.dep index 63e4fa7..1c6b116 100755 --- a/main/Makefile.dep +++ b/main/Makefile.dep @@ -1,11 +1,11 @@ # DO NOT DELETE main.o: ../core/log.h ../core/textstream.h ../core/misc.h ../core/item.h -main.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h -main.o: ../core/request.h ../core/requesttypes.h ../core/error.h -main.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +main.o: ../core/requesttypes.h ../core/logmanipulators.h ../core/slog.h +main.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h +main.o: ../core/confparser.h ../core/htmlfilter.h main.o: ../templates/htmltextstream.h ../core/textstream.h ../core/session.h -main.o: ../core/user.h ../core/plugindata.h ../core/rebus.h +main.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h main.o: ../templates/locale.h ../core/confparser.h ../core/slog.h main.o: ../core/app.h ../core/system.h ../core/dirs.h ../core/dircontainer.h main.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h @@ -20,9 +20,9 @@ main.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h main.o: ../templates/htmltextstream.h ../notify/notifythread.h main.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h main.o: ../core/config.h ../core/users.h ../core/ugcontainer.h -main.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -main.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -main.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +main.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +main.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +main.o: ../core/group.h ../core/loadavg.h ../core/thumb.h main.o: ../core/basethread.h ../core/sessionmanager.h main.o: ../core/sessioncontainer.h ../functions/functions.h main.o: ../functions/functionbase.h ../core/request.h ../core/system.h diff --git a/notify/Makefile.dep b/notify/Makefile.dep index ca84962..42d9771 100755 --- a/notify/Makefile.dep +++ b/notify/Makefile.dep @@ -7,14 +7,14 @@ notify.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h notify.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h notify.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h notify.o: ../templates/htmltextstream.h ../core/textstream.h ../core/misc.h -notify.o: ../core/user.h notifythread.h ../core/basethread.h -notify.o: ../core/synchro.h templatesnotify.h ../core/config.h -notify.o: ../core/confparser.h ../core/htmlfilter.h ../core/users.h -notify.o: ../core/user.h ../core/ugcontainer.h ../core/log.h +notify.o: ../core/requesttypes.h ../core/user.h notifythread.h +notify.o: ../core/basethread.h ../core/synchro.h templatesnotify.h +notify.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +notify.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h notify.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -notify.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -notify.o: ../core/error.h ../core/config.h ../templates/htmltextstream.h -notify.o: ../core/session.h ../core/plugindata.h ../core/rebus.h +notify.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h +notify.o: ../templates/htmltextstream.h ../core/session.h +notify.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h notify.o: ../core/lastcontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h notify.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h notify.o: ../core/item.h ../db/dbitemcolumns.h ../core/group.h @@ -23,9 +23,9 @@ notify.o: ../templates/templates.h ../templates/patterncacher.h notify.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h notify.o: ../core/log.h ../templates/indexpatterns.h ../core/cur.h notify.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h -notify.o: ../notify/notify.h ../core/mounts.h ../core/mount.h -notify.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -notify.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +notify.o: ../notify/notify.h ../core/mounts.h ../core/mountparser.h +notify.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +notify.o: ../core/group.h ../core/loadavg.h ../core/thumb.h notify.o: ../core/basethread.h ../core/sessionmanager.h notify.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h notify.o: ../core/request.h ../core/dirs.h ../core/synchro.h ../core/plugin.h @@ -49,17 +49,17 @@ notifythread.o: templatesnotify.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h notifythread.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h notifythread.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h notifythread.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -notifythread.o: ../core/textstream.h ../core/misc.h notifypool.h -notifythread.o: ../templates/locale.h ../core/confparser.h +notifythread.o: ../core/textstream.h ../core/misc.h ../core/requesttypes.h +notifythread.o: notifypool.h ../templates/locale.h ../core/confparser.h notifythread.o: ../templates/misc.h ../templates/localefilter.h notifythread.o: ../templates/locale.h ../templates/htmltextstream.h notifythread.o: ../core/user.h ../core/config.h ../core/confparser.h notifythread.o: ../core/htmlfilter.h ../core/users.h ../core/user.h notifythread.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h notifythread.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h -notifythread.o: ../core/request.h ../core/requesttypes.h ../core/error.h -notifythread.o: ../core/config.h ../templates/htmltextstream.h -notifythread.o: ../core/session.h ../core/plugindata.h ../core/rebus.h +notifythread.o: ../core/request.h ../core/error.h ../core/config.h +notifythread.o: ../templates/htmltextstream.h ../core/session.h +notifythread.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h notifythread.o: ../core/lastcontainer.h ../db/db.h ../db/dbbase.h notifythread.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h notifythread.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h @@ -68,15 +68,15 @@ templatesnotify.o: templatesnotify.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h templatesnotify.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h templatesnotify.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h templatesnotify.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -templatesnotify.o: ../core/textstream.h ../core/misc.h notifypool.h -templatesnotify.o: ../templates/locale.h ../core/confparser.h +templatesnotify.o: ../core/textstream.h ../core/misc.h ../core/requesttypes.h +templatesnotify.o: notifypool.h ../templates/locale.h ../core/confparser.h templatesnotify.o: ../core/plugin.h ../core/pluginmsg.h ../core/log.h templatesnotify.o: ../core/textstream.h ../core/logmanipulators.h templatesnotify.o: ../core/slog.h ../core/cur.h ../core/request.h -templatesnotify.o: ../core/requesttypes.h ../core/error.h ../core/config.h +templatesnotify.o: ../core/error.h ../core/config.h templatesnotify.o: ../templates/htmltextstream.h ../core/session.h templatesnotify.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -templatesnotify.o: ../core/system.h ../core/sessionmanager.h +templatesnotify.o: ../core/mount.h ../core/system.h ../core/sessionmanager.h templatesnotify.o: ../core/synchro.h ../functions/functions.h templatesnotify.o: ../functions/functionbase.h ../core/item.h ../db/db.h templatesnotify.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h @@ -85,12 +85,12 @@ templatesnotify.o: ../core/user.h ../core/group.h ../core/dircontainer.h templatesnotify.o: ../core/ugcontainer.h ../core/request.h ../core/config.h templatesnotify.o: ../core/confparser.h ../core/htmlfilter.h ../core/system.h templatesnotify.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h -templatesnotify.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -templatesnotify.o: ../core/crypt.h ../core/run.h ../core/users.h -templatesnotify.o: ../core/groups.h ../core/group.h ../core/ugcontainer.h -templatesnotify.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -templatesnotify.o: ../core/synchro.h ../functions/functionparser.h -templatesnotify.o: ../core/cur.h ../functions/adduser.h ../functions/cat.h +templatesnotify.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +templatesnotify.o: ../core/run.h ../core/users.h ../core/groups.h +templatesnotify.o: ../core/group.h ../core/ugcontainer.h ../core/loadavg.h +templatesnotify.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +templatesnotify.o: ../functions/functionparser.h ../core/cur.h +templatesnotify.o: ../functions/adduser.h ../functions/cat.h templatesnotify.o: ../functions/chmod.h ../functions/privchanger.h templatesnotify.o: ../functions/chown.h ../functions/ckeditor.h templatesnotify.o: ../functions/cp.h ../functions/default.h diff --git a/plugins/gallery/Makefile.dep b/plugins/gallery/Makefile.dep index d7da287..36cedc6 100755 --- a/plugins/gallery/Makefile.dep +++ b/plugins/gallery/Makefile.dep @@ -3,16 +3,16 @@ gallery.o: gallery.h ../../functions/functionbase.h ../../core/item.h gallery.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h gallery.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h -gallery.o: ../../core/item.h ../../core/error.h ../../db/dbitemquery.h -gallery.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h -gallery.o: ../../core/dircontainer.h ../../core/ugcontainer.h -gallery.o: ../../core/log.h ../../core/textstream.h +gallery.o: ../../core/item.h ../../core/requesttypes.h ../../core/error.h +gallery.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h ../../core/user.h +gallery.o: ../../core/group.h ../../core/dircontainer.h +gallery.o: ../../core/ugcontainer.h ../../core/log.h ../../core/textstream.h gallery.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h -gallery.o: ../../core/request.h ../../core/requesttypes.h ../../core/error.h -gallery.o: ../../core/config.h ../../core/confparser.h -gallery.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h -gallery.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h -gallery.o: ../../core/rebus.h ../../templates/locale.h +gallery.o: ../../core/request.h ../../core/error.h ../../core/config.h +gallery.o: ../../core/confparser.h ../../core/htmlfilter.h +gallery.o: ../../templates/htmltextstream.h ../../core/session.h +gallery.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h +gallery.o: ../../core/mount.h ../../templates/locale.h gallery.o: ../../core/confparser.h ../../core/request.h ../../core/config.h gallery.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h gallery.o: ../../notify/notify.h ../../notify/notifypool.h @@ -25,46 +25,44 @@ gallery.o: ../../templates/htmltextstream.h ../../notify/notifythread.h gallery.o: ../../core/basethread.h ../../core/synchro.h gallery.o: ../../notify/templatesnotify.h ../../core/users.h gallery.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -gallery.o: ../../core/mounts.h ../../core/mount.h ../../core/mountparser.h -gallery.o: ../../core/crypt.h ../../core/run.h ../../core/users.h -gallery.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h -gallery.o: ../../core/thumb.h ../../core/basethread.h ../../core/synchro.h -gallery.o: galleryinfo.h +gallery.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h +gallery.o: ../../core/run.h ../../core/users.h ../../core/groups.h +gallery.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h +gallery.o: ../../core/basethread.h ../../core/synchro.h galleryinfo.h galleryinfo.o: galleryinfo.h ../../core/item.h init.o: gallery.h ../../functions/functionbase.h ../../core/item.h init.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h init.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h -init.o: ../../core/item.h ../../core/error.h ../../db/dbitemquery.h -init.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h -init.o: ../../core/dircontainer.h ../../core/ugcontainer.h ../../core/log.h -init.o: ../../core/textstream.h ../../core/logmanipulators.h +init.o: ../../core/item.h ../../core/requesttypes.h ../../core/error.h +init.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h ../../core/user.h +init.o: ../../core/group.h ../../core/dircontainer.h ../../core/ugcontainer.h +init.o: ../../core/log.h ../../core/textstream.h ../../core/logmanipulators.h init.o: ../../core/slog.h ../../core/cur.h ../../core/request.h -init.o: ../../core/requesttypes.h ../../core/error.h ../../core/config.h -init.o: ../../core/confparser.h ../../core/htmlfilter.h -init.o: ../../templates/htmltextstream.h ../../core/session.h -init.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h -init.o: ../../templates/locale.h ../../core/confparser.h ../../core/request.h -init.o: ../../core/config.h ../../core/system.h ../../core/dirs.h -init.o: ../../core/dircontainer.h ../../notify/notify.h -init.o: ../../notify/notifypool.h ../../templates/misc.h -init.o: ../../templates/localefilter.h ../../templates/locale.h -init.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h -init.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h -init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -init.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h -init.o: ../../notify/notifythread.h ../../core/basethread.h -init.o: ../../core/synchro.h ../../notify/templatesnotify.h -init.o: ../../core/users.h ../../core/ugcontainer.h -init.o: ../../core/lastcontainer.h ../../core/mounts.h ../../core/mount.h -init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h -init.o: ../../core/users.h ../../core/groups.h ../../core/group.h -init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -init.o: ../../core/synchro.h galleryinfo.h ../../core/log.h -init.o: ../../core/plugin.h ../../core/pluginmsg.h ../../core/system.h -init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h -init.o: ../../functions/functions.h ../../functions/functionbase.h -init.o: ../../functions/functionparser.h ../../core/cur.h -init.o: ../../functions/adduser.h ../../functions/cat.h +init.o: ../../core/error.h ../../core/config.h ../../core/confparser.h +init.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h +init.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h +init.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h +init.o: ../../core/confparser.h ../../core/request.h ../../core/config.h +init.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h +init.o: ../../notify/notify.h ../../notify/notifypool.h +init.o: ../../templates/misc.h ../../templates/localefilter.h +init.o: ../../templates/locale.h ../../../ezc/src/ezc.h +init.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h +init.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h +init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h +init.o: ../../templates/htmltextstream.h ../../notify/notifythread.h +init.o: ../../core/basethread.h ../../core/synchro.h +init.o: ../../notify/templatesnotify.h ../../core/users.h +init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h +init.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h +init.o: ../../core/run.h ../../core/users.h ../../core/groups.h +init.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h +init.o: ../../core/basethread.h ../../core/synchro.h galleryinfo.h +init.o: ../../core/log.h ../../core/plugin.h ../../core/pluginmsg.h +init.o: ../../core/system.h ../../core/sessionmanager.h +init.o: ../../core/sessioncontainer.h ../../functions/functions.h +init.o: ../../functions/functionbase.h ../../functions/functionparser.h +init.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h init.o: ../../functions/chmod.h ../../functions/privchanger.h init.o: ../../functions/chown.h ../../functions/ckeditor.h init.o: ../../functions/cp.h ../../functions/default.h @@ -86,19 +84,19 @@ init.o: ../../core/sessionmanager.h templates.o: gallery.h ../../functions/functionbase.h ../../core/item.h templates.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h templates.o: ../../db/dbtextstream.h ../../core/textstream.h -templates.o: ../../core/misc.h ../../core/item.h ../../core/error.h -templates.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h -templates.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h -templates.o: ../../core/ugcontainer.h ../../core/log.h -templates.o: ../../core/textstream.h ../../core/logmanipulators.h -templates.o: ../../core/slog.h ../../core/cur.h ../../core/request.h -templates.o: ../../core/requesttypes.h ../../core/error.h ../../core/config.h +templates.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h +templates.o: ../../core/error.h ../../db/dbitemquery.h +templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h +templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h +templates.o: ../../core/log.h ../../core/textstream.h +templates.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h +templates.o: ../../core/request.h ../../core/error.h ../../core/config.h templates.o: ../../core/confparser.h ../../core/htmlfilter.h templates.o: ../../templates/htmltextstream.h ../../core/session.h templates.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h -templates.o: ../../templates/locale.h ../../core/confparser.h -templates.o: ../../core/request.h ../../core/config.h ../../core/system.h -templates.o: ../../core/dirs.h ../../core/dircontainer.h +templates.o: ../../core/mount.h ../../templates/locale.h +templates.o: ../../core/confparser.h ../../core/request.h ../../core/config.h +templates.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h templates.o: ../../notify/notify.h ../../notify/notifypool.h templates.o: ../../templates/misc.h ../../templates/localefilter.h templates.o: ../../templates/locale.h ../../../ezc/src/ezc.h @@ -109,16 +107,15 @@ templates.o: ../../templates/htmltextstream.h ../../notify/notifythread.h templates.o: ../../core/basethread.h ../../core/synchro.h templates.o: ../../notify/templatesnotify.h ../../core/users.h templates.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -templates.o: ../../core/mounts.h ../../core/mount.h ../../core/mountparser.h -templates.o: ../../core/crypt.h ../../core/run.h ../../core/users.h -templates.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h -templates.o: ../../core/thumb.h ../../core/basethread.h ../../core/synchro.h -templates.o: galleryinfo.h ../../core/misc.h ../../core/plugin.h -templates.o: ../../core/pluginmsg.h ../../core/system.h -templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h -templates.o: ../../functions/functions.h ../../functions/functionbase.h -templates.o: ../../functions/functionparser.h ../../core/cur.h -templates.o: ../../functions/adduser.h ../../functions/cat.h +templates.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h +templates.o: ../../core/run.h ../../core/users.h ../../core/groups.h +templates.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h +templates.o: ../../core/basethread.h ../../core/synchro.h galleryinfo.h +templates.o: ../../core/misc.h ../../core/plugin.h ../../core/pluginmsg.h +templates.o: ../../core/system.h ../../core/sessionmanager.h +templates.o: ../../core/sessioncontainer.h ../../functions/functions.h +templates.o: ../../functions/functionbase.h ../../functions/functionparser.h +templates.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h templates.o: ../../functions/chmod.h ../../functions/privchanger.h templates.o: ../../functions/chown.h ../../functions/ckeditor.h templates.o: ../../functions/cp.h ../../functions/default.h diff --git a/plugins/groupitem/Makefile.dep b/plugins/groupitem/Makefile.dep index a6b1744..6a5c253 100755 --- a/plugins/groupitem/Makefile.dep +++ b/plugins/groupitem/Makefile.dep @@ -1,12 +1,13 @@ # DO NOT DELETE init.o: ../../core/log.h ../../core/textstream.h ../../core/misc.h -init.o: ../../core/item.h ../../core/logmanipulators.h ../../core/slog.h -init.o: ../../core/cur.h ../../core/request.h ../../core/requesttypes.h -init.o: ../../core/error.h ../../core/config.h ../../core/confparser.h -init.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h -init.o: ../../core/textstream.h ../../core/session.h ../../core/user.h -init.o: ../../core/plugindata.h ../../core/rebus.h ../../templates/locale.h +init.o: ../../core/item.h ../../core/requesttypes.h +init.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h +init.o: ../../core/request.h ../../core/error.h ../../core/config.h +init.o: ../../core/confparser.h ../../core/htmlfilter.h +init.o: ../../templates/htmltextstream.h ../../core/textstream.h +init.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h +init.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h init.o: ../../core/confparser.h ../../core/plugin.h ../../core/pluginmsg.h init.o: ../../core/log.h ../../core/system.h ../../core/dirs.h init.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h @@ -23,7 +24,7 @@ init.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h init.o: ../../notify/notifythread.h ../../core/basethread.h init.o: ../../core/synchro.h ../../notify/templatesnotify.h init.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h -init.o: ../../core/lastcontainer.h ../../core/mounts.h ../../core/mount.h +init.o: ../../core/lastcontainer.h ../../core/mounts.h init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h init.o: ../../core/users.h ../../core/groups.h ../../core/group.h init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h @@ -55,8 +56,8 @@ templates.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h templates.o: ../../../ezc/src/pattern.h ../../core/item.h templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h templates.o: ../../../ezc/src/stringconv.h ../../core/misc.h -templates.o: ../../templates/patterncacher.h ../../core/item.h -templates.o: ../../templates/ckeditorgetparser.h +templates.o: ../../core/requesttypes.h ../../templates/patterncacher.h +templates.o: ../../core/item.h ../../templates/ckeditorgetparser.h templates.o: ../../core/httpsimpleparser.h ../../core/log.h templates.o: ../../templates/indexpatterns.h ../../templates/localefilter.h templates.o: ../../templates/locale.h ../../core/config.h @@ -70,8 +71,7 @@ templates.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h templates.o: ../../core/ugcontainer.h ../../core/log.h ../../core/plugin.h templates.o: ../../core/pluginmsg.h ../../core/plugindata.h templates.o: ../../core/config.h ../../core/confparser.h -templates.o: ../../core/htmlfilter.h ../../core/request.h -templates.o: ../../core/requesttypes.h ../../core/error.h +templates.o: ../../core/htmlfilter.h ../../core/request.h ../../core/error.h templates.o: ../../core/textstream.h ../../templates/htmltextstream.h templates.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h templates.o: ../../notify/notify.h ../../notify/notifypool.h @@ -81,7 +81,7 @@ templates.o: ../../core/basethread.h ../../core/synchro.h templates.o: ../../notify/templatesnotify.h ../../core/users.h templates.o: ../../core/user.h ../../core/ugcontainer.h templates.o: ../../core/lastcontainer.h ../../core/cur.h ../../core/session.h -templates.o: ../../core/rebus.h ../../core/mounts.h ../../core/mount.h +templates.o: ../../core/rebus.h ../../core/mount.h ../../core/mounts.h templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h diff --git a/plugins/stats/Makefile.dep b/plugins/stats/Makefile.dep index bb6793e..a6d677c 100755 --- a/plugins/stats/Makefile.dep +++ b/plugins/stats/Makefile.dep @@ -2,12 +2,13 @@ bot.o: bot.h init.o: ../../core/log.h ../../core/textstream.h ../../core/misc.h -init.o: ../../core/item.h ../../core/logmanipulators.h ../../core/slog.h -init.o: ../../core/cur.h ../../core/request.h ../../core/requesttypes.h -init.o: ../../core/error.h ../../core/config.h ../../core/confparser.h -init.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h -init.o: ../../core/textstream.h ../../core/session.h ../../core/user.h -init.o: ../../core/plugindata.h ../../core/rebus.h ../../templates/locale.h +init.o: ../../core/item.h ../../core/requesttypes.h +init.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h +init.o: ../../core/request.h ../../core/error.h ../../core/config.h +init.o: ../../core/confparser.h ../../core/htmlfilter.h +init.o: ../../templates/htmltextstream.h ../../core/textstream.h +init.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h +init.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h init.o: ../../core/confparser.h ../../core/request.h ../../core/config.h init.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h init.o: ../../db/dbtextstream.h ../../core/error.h ../../db/dbitemquery.h @@ -25,7 +26,7 @@ init.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h init.o: ../../notify/notifythread.h ../../core/basethread.h init.o: ../../core/synchro.h ../../notify/templatesnotify.h init.o: ../../core/users.h ../../core/ugcontainer.h -init.o: ../../core/lastcontainer.h ../../core/mounts.h ../../core/mount.h +init.o: ../../core/lastcontainer.h ../../core/mounts.h init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h init.o: ../../core/users.h ../../core/groups.h ../../core/group.h init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h @@ -53,14 +54,14 @@ init.o: ../../templates/ckeditorgetparser.h ../../core/httpsimpleparser.h init.o: ../../core/log.h ../../templates/indexpatterns.h init.o: ../../core/sessionmanager.h statssession.h ../../core/plugindata.h stats.o: stats.h ../../core/config.h ../../core/log.h ../../core/textstream.h -stats.o: ../../core/misc.h ../../core/item.h ../../core/logmanipulators.h -stats.o: ../../core/slog.h ../../core/cur.h ../../core/request.h -stats.o: ../../core/requesttypes.h ../../core/error.h ../../core/config.h +stats.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h +stats.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h +stats.o: ../../core/request.h ../../core/error.h ../../core/config.h stats.o: ../../core/confparser.h ../../core/htmlfilter.h stats.o: ../../templates/htmltextstream.h ../../core/textstream.h stats.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h -stats.o: ../../core/rebus.h ../../templates/locale.h ../../core/confparser.h -stats.o: ../../../ezc/src/utf8.h +stats.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h +stats.o: ../../core/confparser.h ../../../ezc/src/utf8.h templates.o: templates.h ../../core/plugin.h ../../core/pluginmsg.h templates.o: ../../core/log.h ../../core/plugindata.h ../../core/config.h templates.o: ../../core/confparser.h ../../core/htmlfilter.h @@ -85,7 +86,7 @@ templates.o: ../../core/basethread.h ../../core/synchro.h templates.o: ../../notify/templatesnotify.h ../../core/config.h templates.o: ../../core/users.h ../../core/user.h ../../core/ugcontainer.h templates.o: ../../core/lastcontainer.h ../../core/cur.h ../../core/session.h -templates.o: ../../core/rebus.h ../../core/mounts.h ../../core/mount.h +templates.o: ../../core/rebus.h ../../core/mount.h ../../core/mounts.h templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h diff --git a/plugins/thread/Makefile.dep b/plugins/thread/Makefile.dep index ab7f8ff..4b108f7 100755 --- a/plugins/thread/Makefile.dep +++ b/plugins/thread/Makefile.dep @@ -4,17 +4,17 @@ createthread.o: createthread.h ../../functions/functionbase.h createthread.o: ../../core/item.h ../../db/db.h ../../db/dbbase.h createthread.o: ../../db/dbconn.h ../../db/dbtextstream.h createthread.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h -createthread.o: ../../core/error.h ../../db/dbitemquery.h -createthread.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h +createthread.o: ../../core/requesttypes.h ../../core/error.h +createthread.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h +createthread.o: ../../core/user.h ../../core/group.h createthread.o: ../../core/dircontainer.h ../../core/ugcontainer.h createthread.o: ../../core/log.h ../../core/textstream.h createthread.o: ../../core/logmanipulators.h ../../core/slog.h -createthread.o: ../../core/cur.h ../../core/request.h -createthread.o: ../../core/requesttypes.h ../../core/error.h +createthread.o: ../../core/cur.h ../../core/request.h ../../core/error.h createthread.o: ../../core/config.h ../../core/confparser.h createthread.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h createthread.o: ../../core/session.h ../../core/user.h -createthread.o: ../../core/plugindata.h ../../core/rebus.h +createthread.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h createthread.o: ../../templates/locale.h ../../core/confparser.h createthread.o: ../../core/request.h ../../core/config.h ../../core/system.h createthread.o: ../../core/dirs.h ../../core/dircontainer.h @@ -28,12 +28,12 @@ createthread.o: ../../templates/htmltextstream.h ../../notify/notifythread.h createthread.o: ../../core/basethread.h ../../core/synchro.h createthread.o: ../../notify/templatesnotify.h ../../core/users.h createthread.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -createthread.o: ../../core/mounts.h ../../core/mount.h -createthread.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h -createthread.o: ../../core/users.h ../../core/groups.h ../../core/group.h -createthread.o: ../../core/loadavg.h ../../core/thumb.h -createthread.o: ../../core/basethread.h ../../core/synchro.h tdb.h thread.h -createthread.o: ../../db/dbbase.h threadinfo.h ../../functions/functions.h +createthread.o: ../../core/mounts.h ../../core/mountparser.h +createthread.o: ../../core/crypt.h ../../core/run.h ../../core/users.h +createthread.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h +createthread.o: ../../core/thumb.h ../../core/basethread.h +createthread.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h +createthread.o: threadinfo.h ../../functions/functions.h createthread.o: ../../functions/functionbase.h createthread.o: ../../functions/functionparser.h ../../core/cur.h createthread.o: ../../functions/adduser.h ../../functions/cat.h @@ -53,22 +53,22 @@ createthread.o: ../../functions/tinymce.h ../../functions/uname.h createthread.o: ../../functions/upload.h ../../functions/uptime.h createthread.o: ../../functions/who.h ../../functions/vim.h createthread.o: ../../core/htmlfilter.h -funthread.o: ../../core/misc.h ../../core/item.h funthread.h -funthread.o: ../../functions/functionbase.h ../../core/item.h ../../db/db.h -funthread.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h -funthread.o: ../../core/textstream.h ../../core/misc.h ../../core/error.h -funthread.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h -funthread.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h -funthread.o: ../../core/ugcontainer.h ../../core/log.h -funthread.o: ../../core/textstream.h ../../core/logmanipulators.h -funthread.o: ../../core/slog.h ../../core/cur.h ../../core/request.h -funthread.o: ../../core/requesttypes.h ../../core/error.h ../../core/config.h +funthread.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h +funthread.o: funthread.h ../../functions/functionbase.h ../../core/item.h +funthread.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h +funthread.o: ../../db/dbtextstream.h ../../core/textstream.h +funthread.o: ../../core/misc.h ../../core/error.h ../../db/dbitemquery.h +funthread.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h +funthread.o: ../../core/dircontainer.h ../../core/ugcontainer.h +funthread.o: ../../core/log.h ../../core/textstream.h +funthread.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h +funthread.o: ../../core/request.h ../../core/error.h ../../core/config.h funthread.o: ../../core/confparser.h ../../core/htmlfilter.h funthread.o: ../../templates/htmltextstream.h ../../core/session.h funthread.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h -funthread.o: ../../templates/locale.h ../../core/confparser.h -funthread.o: ../../core/request.h ../../core/config.h ../../core/system.h -funthread.o: ../../core/dirs.h ../../core/dircontainer.h +funthread.o: ../../core/mount.h ../../templates/locale.h +funthread.o: ../../core/confparser.h ../../core/request.h ../../core/config.h +funthread.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h funthread.o: ../../notify/notify.h ../../notify/notifypool.h funthread.o: ../../templates/misc.h ../../templates/localefilter.h funthread.o: ../../templates/locale.h ../../../ezc/src/ezc.h @@ -79,42 +79,42 @@ funthread.o: ../../templates/htmltextstream.h ../../notify/notifythread.h funthread.o: ../../core/basethread.h ../../core/synchro.h funthread.o: ../../notify/templatesnotify.h ../../core/users.h funthread.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -funthread.o: ../../core/mounts.h ../../core/mount.h ../../core/mountparser.h -funthread.o: ../../core/crypt.h ../../core/run.h ../../core/users.h -funthread.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h -funthread.o: ../../core/thumb.h ../../core/basethread.h ../../core/synchro.h -funthread.o: tdb.h thread.h ../../db/dbbase.h threadinfo.h +funthread.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h +funthread.o: ../../core/run.h ../../core/users.h ../../core/groups.h +funthread.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h +funthread.o: ../../core/basethread.h ../../core/synchro.h tdb.h thread.h +funthread.o: ../../db/dbbase.h threadinfo.h init.o: tdb.h thread.h ../../db/dbbase.h ../../core/error.h reply.h init.o: ../../functions/functionbase.h ../../core/item.h ../../db/db.h init.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h init.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h -init.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h ../../core/user.h -init.o: ../../core/group.h ../../core/dircontainer.h ../../core/ugcontainer.h -init.o: ../../core/log.h ../../core/textstream.h ../../core/logmanipulators.h +init.o: ../../core/requesttypes.h ../../db/dbitemquery.h +init.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h +init.o: ../../core/dircontainer.h ../../core/ugcontainer.h ../../core/log.h +init.o: ../../core/textstream.h ../../core/logmanipulators.h init.o: ../../core/slog.h ../../core/cur.h ../../core/request.h -init.o: ../../core/requesttypes.h ../../core/error.h ../../core/config.h -init.o: ../../core/confparser.h ../../core/htmlfilter.h -init.o: ../../templates/htmltextstream.h ../../core/session.h -init.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h -init.o: ../../templates/locale.h ../../core/confparser.h ../../core/request.h -init.o: ../../core/config.h ../../core/system.h ../../core/dirs.h -init.o: ../../core/dircontainer.h ../../notify/notify.h -init.o: ../../notify/notifypool.h ../../templates/misc.h -init.o: ../../templates/localefilter.h ../../templates/locale.h -init.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h -init.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h -init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -init.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h -init.o: ../../notify/notifythread.h ../../core/basethread.h -init.o: ../../core/synchro.h ../../notify/templatesnotify.h -init.o: ../../core/users.h ../../core/ugcontainer.h -init.o: ../../core/lastcontainer.h ../../core/mounts.h ../../core/mount.h -init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h -init.o: ../../core/users.h ../../core/groups.h ../../core/group.h -init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -init.o: ../../core/synchro.h threadinfo.h funthread.h createthread.h -init.o: showthreads.h ../../core/log.h ../../core/plugin.h pluginmsg.h -init.o: ../../core/system.h ../../core/sessionmanager.h +init.o: ../../core/error.h ../../core/config.h ../../core/confparser.h +init.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h +init.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h +init.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h +init.o: ../../core/confparser.h ../../core/request.h ../../core/config.h +init.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h +init.o: ../../notify/notify.h ../../notify/notifypool.h +init.o: ../../templates/misc.h ../../templates/localefilter.h +init.o: ../../templates/locale.h ../../../ezc/src/ezc.h +init.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h +init.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h +init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h +init.o: ../../templates/htmltextstream.h ../../notify/notifythread.h +init.o: ../../core/basethread.h ../../core/synchro.h +init.o: ../../notify/templatesnotify.h ../../core/users.h +init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h +init.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h +init.o: ../../core/run.h ../../core/users.h ../../core/groups.h +init.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h +init.o: ../../core/basethread.h ../../core/synchro.h threadinfo.h funthread.h +init.o: createthread.h showthreads.h ../../core/log.h ../../core/plugin.h +init.o: pluginmsg.h ../../core/system.h ../../core/sessionmanager.h init.o: ../../core/sessioncontainer.h ../../functions/functions.h init.o: ../../functions/functionbase.h ../../functions/functionparser.h init.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h @@ -139,16 +139,16 @@ init.o: ../../core/sessionmanager.h templates.h reply.o: reply.h ../../functions/functionbase.h ../../core/item.h reply.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h reply.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h -reply.o: ../../core/item.h ../../core/error.h ../../db/dbitemquery.h -reply.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h -reply.o: ../../core/dircontainer.h ../../core/ugcontainer.h ../../core/log.h -reply.o: ../../core/textstream.h ../../core/logmanipulators.h -reply.o: ../../core/slog.h ../../core/cur.h ../../core/request.h -reply.o: ../../core/requesttypes.h ../../core/error.h ../../core/config.h +reply.o: ../../core/item.h ../../core/requesttypes.h ../../core/error.h +reply.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h ../../core/user.h +reply.o: ../../core/group.h ../../core/dircontainer.h +reply.o: ../../core/ugcontainer.h ../../core/log.h ../../core/textstream.h +reply.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h +reply.o: ../../core/request.h ../../core/error.h ../../core/config.h reply.o: ../../core/confparser.h ../../core/htmlfilter.h reply.o: ../../templates/htmltextstream.h ../../core/session.h reply.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h -reply.o: ../../templates/locale.h ../../core/confparser.h +reply.o: ../../core/mount.h ../../templates/locale.h ../../core/confparser.h reply.o: ../../core/request.h ../../core/config.h ../../core/system.h reply.o: ../../core/dirs.h ../../core/dircontainer.h ../../notify/notify.h reply.o: ../../notify/notifypool.h ../../templates/misc.h @@ -160,7 +160,7 @@ reply.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h reply.o: ../../notify/notifythread.h ../../core/basethread.h reply.o: ../../core/synchro.h ../../notify/templatesnotify.h reply.o: ../../core/users.h ../../core/ugcontainer.h -reply.o: ../../core/lastcontainer.h ../../core/mounts.h ../../core/mount.h +reply.o: ../../core/lastcontainer.h ../../core/mounts.h reply.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h reply.o: ../../core/users.h ../../core/groups.h ../../core/group.h reply.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h @@ -191,17 +191,17 @@ reply.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h showthreads.o: showthreads.h ../../functions/functionbase.h ../../core/item.h showthreads.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h showthreads.o: ../../db/dbtextstream.h ../../core/textstream.h -showthreads.o: ../../core/misc.h ../../core/item.h ../../core/error.h -showthreads.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h -showthreads.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h -showthreads.o: ../../core/ugcontainer.h ../../core/log.h -showthreads.o: ../../core/textstream.h ../../core/logmanipulators.h -showthreads.o: ../../core/slog.h ../../core/cur.h ../../core/request.h -showthreads.o: ../../core/requesttypes.h ../../core/error.h +showthreads.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h +showthreads.o: ../../core/error.h ../../db/dbitemquery.h +showthreads.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h +showthreads.o: ../../core/dircontainer.h ../../core/ugcontainer.h +showthreads.o: ../../core/log.h ../../core/textstream.h +showthreads.o: ../../core/logmanipulators.h ../../core/slog.h +showthreads.o: ../../core/cur.h ../../core/request.h ../../core/error.h showthreads.o: ../../core/config.h ../../core/confparser.h showthreads.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h showthreads.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h -showthreads.o: ../../core/rebus.h ../../templates/locale.h +showthreads.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h showthreads.o: ../../core/confparser.h ../../core/request.h showthreads.o: ../../core/config.h ../../core/system.h ../../core/dirs.h showthreads.o: ../../core/dircontainer.h ../../notify/notify.h @@ -215,9 +215,9 @@ showthreads.o: ../../notify/notifythread.h ../../core/basethread.h showthreads.o: ../../core/synchro.h ../../notify/templatesnotify.h showthreads.o: ../../core/users.h ../../core/ugcontainer.h showthreads.o: ../../core/lastcontainer.h ../../core/mounts.h -showthreads.o: ../../core/mount.h ../../core/mountparser.h ../../core/crypt.h -showthreads.o: ../../core/run.h ../../core/users.h ../../core/groups.h -showthreads.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h +showthreads.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h +showthreads.o: ../../core/users.h ../../core/groups.h ../../core/group.h +showthreads.o: ../../core/loadavg.h ../../core/thumb.h showthreads.o: ../../core/basethread.h ../../core/synchro.h tdb.h thread.h showthreads.o: ../../db/dbbase.h threadinfo.h tdb.o: tdb.h thread.h ../../db/dbbase.h ../../core/error.h ../../core/log.h @@ -225,16 +225,16 @@ templates.o: threadinfo.h ../../core/item.h ../../core/system.h templates.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h templates.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h templates.o: ../../db/dbtextstream.h ../../core/textstream.h -templates.o: ../../core/misc.h ../../core/error.h ../../db/dbitemquery.h -templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h -templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h -templates.o: ../../core/log.h ../../core/textstream.h -templates.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h -templates.o: ../../core/request.h ../../core/requesttypes.h +templates.o: ../../core/misc.h ../../core/requesttypes.h ../../core/error.h +templates.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h +templates.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h +templates.o: ../../core/ugcontainer.h ../../core/log.h +templates.o: ../../core/textstream.h ../../core/logmanipulators.h +templates.o: ../../core/slog.h ../../core/cur.h ../../core/request.h templates.o: ../../core/error.h ../../core/config.h ../../core/confparser.h templates.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h templates.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h -templates.o: ../../core/rebus.h ../../templates/locale.h +templates.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h templates.o: ../../core/confparser.h ../../notify/notify.h templates.o: ../../notify/notifypool.h ../../templates/misc.h templates.o: ../../templates/localefilter.h ../../templates/locale.h @@ -246,10 +246,10 @@ templates.o: ../../notify/notifythread.h ../../core/basethread.h templates.o: ../../core/synchro.h ../../notify/templatesnotify.h templates.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h templates.o: ../../core/lastcontainer.h ../../core/mounts.h -templates.o: ../../core/mount.h ../../core/mountparser.h ../../core/crypt.h -templates.o: ../../core/run.h ../../core/users.h ../../core/groups.h -templates.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h -templates.o: ../../core/basethread.h thread.h tdb.h ../../db/dbbase.h reply.h +templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h +templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h +templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h +templates.o: thread.h tdb.h ../../db/dbbase.h reply.h templates.o: ../../functions/functionbase.h ../../core/request.h templates.o: ../../core/synchro.h funthread.h createthread.h showthreads.h templates.o: ../../core/misc.h ../../core/plugin.h pluginmsg.h @@ -281,16 +281,16 @@ threadinfo.o: threadinfo.h ../../core/item.h ../../core/system.h threadinfo.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h threadinfo.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h threadinfo.o: ../../db/dbtextstream.h ../../core/textstream.h -threadinfo.o: ../../core/misc.h ../../core/error.h ../../db/dbitemquery.h -threadinfo.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h -threadinfo.o: ../../core/dircontainer.h ../../core/ugcontainer.h -threadinfo.o: ../../core/log.h ../../core/textstream.h -threadinfo.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h -threadinfo.o: ../../core/request.h ../../core/requesttypes.h +threadinfo.o: ../../core/misc.h ../../core/requesttypes.h ../../core/error.h +threadinfo.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h +threadinfo.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h +threadinfo.o: ../../core/ugcontainer.h ../../core/log.h +threadinfo.o: ../../core/textstream.h ../../core/logmanipulators.h +threadinfo.o: ../../core/slog.h ../../core/cur.h ../../core/request.h threadinfo.o: ../../core/error.h ../../core/config.h ../../core/confparser.h threadinfo.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h threadinfo.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h -threadinfo.o: ../../core/rebus.h ../../templates/locale.h +threadinfo.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h threadinfo.o: ../../core/confparser.h ../../notify/notify.h threadinfo.o: ../../notify/notifypool.h ../../templates/misc.h threadinfo.o: ../../templates/localefilter.h ../../templates/locale.h @@ -302,7 +302,7 @@ threadinfo.o: ../../notify/notifythread.h ../../core/basethread.h threadinfo.o: ../../core/synchro.h ../../notify/templatesnotify.h threadinfo.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h threadinfo.o: ../../core/lastcontainer.h ../../core/mounts.h -threadinfo.o: ../../core/mount.h ../../core/mountparser.h ../../core/crypt.h -threadinfo.o: ../../core/run.h ../../core/users.h ../../core/groups.h -threadinfo.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h -threadinfo.o: ../../core/basethread.h thread.h tdb.h ../../db/dbbase.h +threadinfo.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h +threadinfo.o: ../../core/users.h ../../core/groups.h ../../core/group.h +threadinfo.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h +threadinfo.o: thread.h tdb.h ../../db/dbbase.h diff --git a/plugins/ticket/Makefile.dep b/plugins/ticket/Makefile.dep index 5d6a9bd..c3e78d5 100755 --- a/plugins/ticket/Makefile.dep +++ b/plugins/ticket/Makefile.dep @@ -3,19 +3,18 @@ createticket.o: createticket.h tdb.h ticket.h ../../db/dbbase.h createticket.o: ../../db/dbconn.h ../../db/dbtextstream.h createticket.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h -createticket.o: ../../core/error.h ../../functions/functionbase.h -createticket.o: ../../core/item.h ../../db/db.h ../../db/dbbase.h -createticket.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h -createticket.o: ../../core/user.h ../../core/group.h +createticket.o: ../../core/requesttypes.h ../../core/error.h +createticket.o: ../../functions/functionbase.h ../../core/item.h +createticket.o: ../../db/db.h ../../db/dbbase.h ../../db/dbitemquery.h +createticket.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h createticket.o: ../../core/dircontainer.h ../../core/ugcontainer.h createticket.o: ../../core/log.h ../../core/textstream.h createticket.o: ../../core/logmanipulators.h ../../core/slog.h -createticket.o: ../../core/cur.h ../../core/request.h -createticket.o: ../../core/requesttypes.h ../../core/error.h +createticket.o: ../../core/cur.h ../../core/request.h ../../core/error.h createticket.o: ../../core/config.h ../../core/confparser.h createticket.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h createticket.o: ../../core/session.h ../../core/user.h -createticket.o: ../../core/plugindata.h ../../core/rebus.h +createticket.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h createticket.o: ../../templates/locale.h ../../core/confparser.h createticket.o: ../../core/request.h ../../core/config.h ../../core/system.h createticket.o: ../../core/dirs.h ../../core/dircontainer.h @@ -29,13 +28,12 @@ createticket.o: ../../templates/htmltextstream.h ../../notify/notifythread.h createticket.o: ../../core/basethread.h ../../core/synchro.h createticket.o: ../../notify/templatesnotify.h ../../core/users.h createticket.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -createticket.o: ../../core/mounts.h ../../core/mount.h -createticket.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h -createticket.o: ../../core/users.h ../../core/groups.h ../../core/group.h -createticket.o: ../../core/loadavg.h ../../core/thumb.h -createticket.o: ../../core/basethread.h ../../core/synchro.h ticketinfo.h -createticket.o: ticketparser.h ticketconf.h ../../functions/functions.h -createticket.o: ../../functions/functionbase.h +createticket.o: ../../core/mounts.h ../../core/mountparser.h +createticket.o: ../../core/crypt.h ../../core/run.h ../../core/users.h +createticket.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h +createticket.o: ../../core/thumb.h ../../core/basethread.h +createticket.o: ../../core/synchro.h ticketinfo.h ticketparser.h ticketconf.h +createticket.o: ../../functions/functions.h ../../functions/functionbase.h createticket.o: ../../functions/functionparser.h ../../core/cur.h createticket.o: ../../functions/adduser.h ../../functions/cat.h createticket.o: ../../functions/chmod.h ../../functions/privchanger.h @@ -57,19 +55,19 @@ createticket.o: ../../core/htmlfilter.h sessiondata.h ../../core/plugindata.h createticket.o: ../../functions/rm.h editticket.o: editticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h editticket.o: ../../db/dbtextstream.h ../../core/textstream.h -editticket.o: ../../core/misc.h ../../core/item.h ../../core/error.h -editticket.o: ticketinfo.h ticketparser.h ticketconf.h ../../core/item.h -editticket.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h -editticket.o: ../../db/db.h ../../db/dbbase.h ../../db/dbitemquery.h -editticket.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h -editticket.o: ../../core/dircontainer.h ../../core/ugcontainer.h -editticket.o: ../../core/log.h ../../core/textstream.h -editticket.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h -editticket.o: ../../core/request.h ../../core/requesttypes.h +editticket.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h +editticket.o: ../../core/error.h ticketinfo.h ticketparser.h ticketconf.h +editticket.o: ../../core/item.h ../../core/system.h ../../core/dirs.h +editticket.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h +editticket.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h +editticket.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h +editticket.o: ../../core/ugcontainer.h ../../core/log.h +editticket.o: ../../core/textstream.h ../../core/logmanipulators.h +editticket.o: ../../core/slog.h ../../core/cur.h ../../core/request.h editticket.o: ../../core/error.h ../../core/config.h ../../core/confparser.h editticket.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h editticket.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h -editticket.o: ../../core/rebus.h ../../templates/locale.h +editticket.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h editticket.o: ../../core/confparser.h ../../notify/notify.h editticket.o: ../../notify/notifypool.h ../../templates/misc.h editticket.o: ../../templates/localefilter.h ../../templates/locale.h @@ -81,46 +79,45 @@ editticket.o: ../../notify/notifythread.h ../../core/basethread.h editticket.o: ../../core/synchro.h ../../notify/templatesnotify.h editticket.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h editticket.o: ../../core/lastcontainer.h ../../core/mounts.h -editticket.o: ../../core/mount.h ../../core/mountparser.h ../../core/crypt.h -editticket.o: ../../core/run.h ../../core/users.h ../../core/groups.h -editticket.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h -editticket.o: ../../core/basethread.h ../../functions/functions.h -editticket.o: ../../functions/functionbase.h ../../functions/functionparser.h -editticket.o: ../../core/cur.h ../../functions/adduser.h -editticket.o: ../../functions/cat.h ../../functions/chmod.h -editticket.o: ../../functions/privchanger.h ../../core/request.h -editticket.o: ../../functions/chown.h ../../functions/ckeditor.h -editticket.o: ../../functions/cp.h ../../functions/default.h -editticket.o: ../../functions/download.h ../../functions/emacs.h -editticket.o: ../../functions/last.h ../../functions/login.h -editticket.o: ../../functions/logout.h ../../functions/ln.h -editticket.o: ../../functions/ls.h ../../functions/mkdir.h -editticket.o: ../../functions/mv.h ../../functions/nicedit.h -editticket.o: ../../functions/node.h ../../functions/priv.h -editticket.o: ../../functions/reload.h ../../functions/rm.h -editticket.o: ../../functions/specialdefault.h ../../functions/stat.h -editticket.o: ../../functions/subject.h ../../functions/template.h -editticket.o: ../../functions/tinymce.h ../../functions/uname.h -editticket.o: ../../functions/upload.h ../../functions/uptime.h -editticket.o: ../../functions/who.h ../../functions/vim.h -editticket.o: ../../core/htmlfilter.h ../../functions/functionbase.h -editticket.o: ../../core/synchro.h sessiondata.h ../../core/plugindata.h -editticket.o: ../../functions/rm.h +editticket.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h +editticket.o: ../../core/users.h ../../core/groups.h ../../core/group.h +editticket.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h +editticket.o: ../../functions/functions.h ../../functions/functionbase.h +editticket.o: ../../functions/functionparser.h ../../core/cur.h +editticket.o: ../../functions/adduser.h ../../functions/cat.h +editticket.o: ../../functions/chmod.h ../../functions/privchanger.h +editticket.o: ../../core/request.h ../../functions/chown.h +editticket.o: ../../functions/ckeditor.h ../../functions/cp.h +editticket.o: ../../functions/default.h ../../functions/download.h +editticket.o: ../../functions/emacs.h ../../functions/last.h +editticket.o: ../../functions/login.h ../../functions/logout.h +editticket.o: ../../functions/ln.h ../../functions/ls.h +editticket.o: ../../functions/mkdir.h ../../functions/mv.h +editticket.o: ../../functions/nicedit.h ../../functions/node.h +editticket.o: ../../functions/priv.h ../../functions/reload.h +editticket.o: ../../functions/rm.h ../../functions/specialdefault.h +editticket.o: ../../functions/stat.h ../../functions/subject.h +editticket.o: ../../functions/template.h ../../functions/tinymce.h +editticket.o: ../../functions/uname.h ../../functions/upload.h +editticket.o: ../../functions/uptime.h ../../functions/who.h +editticket.o: ../../functions/vim.h ../../core/htmlfilter.h +editticket.o: ../../functions/functionbase.h ../../core/synchro.h +editticket.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h funticket.o: funticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h funticket.o: ../../db/dbtextstream.h ../../core/textstream.h -funticket.o: ../../core/misc.h ../../core/item.h ../../core/error.h -funticket.o: ticketinfo.h ticketparser.h ticketconf.h ../../core/item.h -funticket.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h -funticket.o: ../../db/db.h ../../db/dbbase.h ../../db/dbitemquery.h -funticket.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h -funticket.o: ../../core/dircontainer.h ../../core/ugcontainer.h -funticket.o: ../../core/log.h ../../core/textstream.h -funticket.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h -funticket.o: ../../core/request.h ../../core/requesttypes.h +funticket.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h +funticket.o: ../../core/error.h ticketinfo.h ticketparser.h ticketconf.h +funticket.o: ../../core/item.h ../../core/system.h ../../core/dirs.h +funticket.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h +funticket.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h +funticket.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h +funticket.o: ../../core/ugcontainer.h ../../core/log.h +funticket.o: ../../core/textstream.h ../../core/logmanipulators.h +funticket.o: ../../core/slog.h ../../core/cur.h ../../core/request.h funticket.o: ../../core/error.h ../../core/config.h ../../core/confparser.h funticket.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h funticket.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h -funticket.o: ../../core/rebus.h ../../templates/locale.h +funticket.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h funticket.o: ../../core/confparser.h ../../notify/notify.h funticket.o: ../../notify/notifypool.h ../../templates/misc.h funticket.o: ../../templates/localefilter.h ../../templates/locale.h @@ -132,12 +129,12 @@ funticket.o: ../../notify/notifythread.h ../../core/basethread.h funticket.o: ../../core/synchro.h ../../notify/templatesnotify.h funticket.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h funticket.o: ../../core/lastcontainer.h ../../core/mounts.h -funticket.o: ../../core/mount.h ../../core/mountparser.h ../../core/crypt.h -funticket.o: ../../core/run.h ../../core/users.h ../../core/groups.h -funticket.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h -funticket.o: ../../core/basethread.h ../../functions/functions.h -funticket.o: ../../functions/functionbase.h ../../functions/functionparser.h -funticket.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h +funticket.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h +funticket.o: ../../core/users.h ../../core/groups.h ../../core/group.h +funticket.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h +funticket.o: ../../functions/functions.h ../../functions/functionbase.h +funticket.o: ../../functions/functionparser.h ../../core/cur.h +funticket.o: ../../functions/adduser.h ../../functions/cat.h funticket.o: ../../functions/chmod.h ../../functions/privchanger.h funticket.o: ../../core/request.h ../../functions/chown.h funticket.o: ../../functions/ckeditor.h ../../functions/cp.h @@ -164,32 +161,32 @@ funticket.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h funticket.o: ../../plugins/thread/pluginmsg.h init.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h init.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h -init.o: ../../core/item.h ../../core/error.h funticket.h ticketinfo.h -init.o: ticketparser.h ticketconf.h ../../core/item.h ../../core/system.h -init.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h -init.o: ../../db/dbbase.h ../../db/dbitemquery.h ../../db/dbitemcolumns.h -init.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h -init.o: ../../core/ugcontainer.h ../../core/log.h ../../core/textstream.h -init.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h -init.o: ../../core/request.h ../../core/requesttypes.h ../../core/error.h -init.o: ../../core/config.h ../../core/confparser.h ../../core/htmlfilter.h -init.o: ../../templates/htmltextstream.h ../../core/session.h -init.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h -init.o: ../../templates/locale.h ../../core/confparser.h -init.o: ../../notify/notify.h ../../notify/notifypool.h -init.o: ../../templates/misc.h ../../templates/localefilter.h -init.o: ../../templates/locale.h ../../../ezc/src/ezc.h -init.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h -init.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h -init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h -init.o: ../../templates/htmltextstream.h ../../notify/notifythread.h -init.o: ../../core/basethread.h ../../core/synchro.h -init.o: ../../notify/templatesnotify.h ../../core/config.h ../../core/users.h -init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -init.o: ../../core/mounts.h ../../core/mount.h ../../core/mountparser.h -init.o: ../../core/crypt.h ../../core/run.h ../../core/users.h -init.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h -init.o: ../../core/thumb.h ../../core/basethread.h +init.o: ../../core/item.h ../../core/requesttypes.h ../../core/error.h +init.o: funticket.h ticketinfo.h ticketparser.h ticketconf.h +init.o: ../../core/item.h ../../core/system.h ../../core/dirs.h +init.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h +init.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h ../../core/user.h +init.o: ../../core/group.h ../../core/dircontainer.h ../../core/ugcontainer.h +init.o: ../../core/log.h ../../core/textstream.h ../../core/logmanipulators.h +init.o: ../../core/slog.h ../../core/cur.h ../../core/request.h +init.o: ../../core/error.h ../../core/config.h ../../core/confparser.h +init.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h +init.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h +init.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h +init.o: ../../core/confparser.h ../../notify/notify.h +init.o: ../../notify/notifypool.h ../../templates/misc.h +init.o: ../../templates/localefilter.h ../../templates/locale.h +init.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h +init.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h +init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h +init.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h +init.o: ../../notify/notifythread.h ../../core/basethread.h +init.o: ../../core/synchro.h ../../notify/templatesnotify.h +init.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h +init.o: ../../core/lastcontainer.h ../../core/mounts.h +init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h +init.o: ../../core/users.h ../../core/groups.h ../../core/group.h +init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h init.o: ../../functions/functions.h ../../functions/functionbase.h init.o: ../../functions/functionparser.h ../../core/cur.h init.o: ../../functions/adduser.h ../../functions/cat.h @@ -222,19 +219,19 @@ sessiondata.o: ../../functions/rm.h showtickets.o: showtickets.h tdb.h ticket.h ../../db/dbbase.h showtickets.o: ../../db/dbconn.h ../../db/dbtextstream.h showtickets.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h -showtickets.o: ../../core/error.h ticketinfo.h ticketparser.h ticketconf.h -showtickets.o: ../../core/item.h ../../core/system.h ../../core/dirs.h +showtickets.o: ../../core/requesttypes.h ../../core/error.h ticketinfo.h +showtickets.o: ticketparser.h ticketconf.h ../../core/item.h +showtickets.o: ../../core/system.h ../../core/dirs.h showtickets.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h showtickets.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h showtickets.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h showtickets.o: ../../core/ugcontainer.h ../../core/log.h showtickets.o: ../../core/textstream.h ../../core/logmanipulators.h showtickets.o: ../../core/slog.h ../../core/cur.h ../../core/request.h -showtickets.o: ../../core/requesttypes.h ../../core/error.h -showtickets.o: ../../core/config.h ../../core/confparser.h +showtickets.o: ../../core/error.h ../../core/config.h ../../core/confparser.h showtickets.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h showtickets.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h -showtickets.o: ../../core/rebus.h ../../templates/locale.h +showtickets.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h showtickets.o: ../../core/confparser.h ../../notify/notify.h showtickets.o: ../../notify/notifypool.h ../../templates/misc.h showtickets.o: ../../templates/localefilter.h ../../templates/locale.h @@ -246,12 +243,11 @@ showtickets.o: ../../notify/notifythread.h ../../core/basethread.h showtickets.o: ../../core/synchro.h ../../notify/templatesnotify.h showtickets.o: ../../core/config.h ../../core/users.h showtickets.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -showtickets.o: ../../core/mounts.h ../../core/mount.h -showtickets.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h -showtickets.o: ../../core/users.h ../../core/groups.h ../../core/group.h -showtickets.o: ../../core/loadavg.h ../../core/thumb.h -showtickets.o: ../../core/basethread.h ../../functions/functions.h -showtickets.o: ../../functions/functionbase.h +showtickets.o: ../../core/mounts.h ../../core/mountparser.h +showtickets.o: ../../core/crypt.h ../../core/run.h ../../core/users.h +showtickets.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h +showtickets.o: ../../core/thumb.h ../../core/basethread.h +showtickets.o: ../../functions/functions.h ../../functions/functionbase.h showtickets.o: ../../functions/functionparser.h ../../core/cur.h showtickets.o: ../../functions/adduser.h ../../functions/cat.h showtickets.o: ../../functions/chmod.h ../../functions/privchanger.h @@ -280,7 +276,8 @@ showtickets.o: ../../core/httpsimpleparser.h ../../core/log.h showtickets.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h tdb.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h tdb.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h -tdb.o: ../../core/item.h ../../core/error.h ../../core/log.h +tdb.o: ../../core/item.h ../../core/requesttypes.h ../../core/error.h +tdb.o: ../../core/log.h templates.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h templates.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h templates.o: ../../core/item.h ../../../ezc/src/functions.h @@ -297,7 +294,7 @@ templates.o: ../../core/requesttypes.h ../../core/error.h ../../core/config.h templates.o: ../../core/confparser.h ../../core/htmlfilter.h templates.o: ../../templates/htmltextstream.h ../../core/textstream.h templates.o: ../../core/misc.h ../../core/session.h ../../core/user.h -templates.o: ../../core/plugindata.h ../../core/rebus.h +templates.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h templates.o: ../../templates/locale.h ../../core/confparser.h templates.o: ../../notify/notify.h ../../notify/notifypool.h templates.o: ../../templates/misc.h ../../templates/localefilter.h @@ -306,12 +303,12 @@ templates.o: ../../notify/notifythread.h ../../core/basethread.h templates.o: ../../core/synchro.h ../../notify/templatesnotify.h templates.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h templates.o: ../../core/lastcontainer.h ../../core/mounts.h -templates.o: ../../core/mount.h ../../core/mountparser.h ../../core/crypt.h -templates.o: ../../core/run.h ../../core/users.h ../../core/groups.h -templates.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h -templates.o: ../../core/basethread.h ../../functions/functions.h -templates.o: ../../functions/functionbase.h ../../functions/functionparser.h -templates.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h +templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h +templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h +templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h +templates.o: ../../functions/functions.h ../../functions/functionbase.h +templates.o: ../../functions/functionparser.h ../../core/cur.h +templates.o: ../../functions/adduser.h ../../functions/cat.h templates.o: ../../functions/chmod.h ../../functions/privchanger.h templates.o: ../../core/request.h ../../functions/chown.h templates.o: ../../functions/ckeditor.h ../../functions/cp.h @@ -353,43 +350,42 @@ ticketinfo.o: ../../core/error.h ../../core/config.h ../../core/confparser.h ticketinfo.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h ticketinfo.o: ../../core/textstream.h ../../core/misc.h ../../core/session.h ticketinfo.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h -ticketinfo.o: ../../templates/locale.h ../../core/confparser.h -ticketinfo.o: ../../notify/notify.h ../../notify/notifypool.h -ticketinfo.o: ../../templates/misc.h ../../templates/localefilter.h -ticketinfo.o: ../../templates/locale.h ../../../ezc/src/ezc.h -ticketinfo.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h -ticketinfo.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h -ticketinfo.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h -ticketinfo.o: ../../templates/htmltextstream.h ../../notify/notifythread.h -ticketinfo.o: ../../core/basethread.h ../../core/synchro.h -ticketinfo.o: ../../notify/templatesnotify.h ../../core/config.h -ticketinfo.o: ../../core/users.h ../../core/ugcontainer.h +ticketinfo.o: ../../core/mount.h ../../templates/locale.h +ticketinfo.o: ../../core/confparser.h ../../notify/notify.h +ticketinfo.o: ../../notify/notifypool.h ../../templates/misc.h +ticketinfo.o: ../../templates/localefilter.h ../../templates/locale.h +ticketinfo.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h +ticketinfo.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h +ticketinfo.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h +ticketinfo.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h +ticketinfo.o: ../../notify/notifythread.h ../../core/basethread.h +ticketinfo.o: ../../core/synchro.h ../../notify/templatesnotify.h +ticketinfo.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h ticketinfo.o: ../../core/lastcontainer.h ../../core/mounts.h -ticketinfo.o: ../../core/mount.h ../../core/mountparser.h ../../core/crypt.h -ticketinfo.o: ../../core/run.h ../../core/users.h ../../core/groups.h -ticketinfo.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h -ticketinfo.o: ../../core/basethread.h ../../functions/functions.h -ticketinfo.o: ../../functions/functionbase.h ../../functions/functionparser.h -ticketinfo.o: ../../core/cur.h ../../functions/adduser.h -ticketinfo.o: ../../functions/cat.h ../../functions/chmod.h -ticketinfo.o: ../../functions/privchanger.h ../../core/request.h -ticketinfo.o: ../../functions/chown.h ../../functions/ckeditor.h -ticketinfo.o: ../../functions/cp.h ../../functions/default.h -ticketinfo.o: ../../functions/download.h ../../functions/emacs.h -ticketinfo.o: ../../functions/last.h ../../functions/login.h -ticketinfo.o: ../../functions/logout.h ../../functions/ln.h -ticketinfo.o: ../../functions/ls.h ../../functions/mkdir.h -ticketinfo.o: ../../functions/mv.h ../../functions/nicedit.h -ticketinfo.o: ../../functions/node.h ../../functions/priv.h -ticketinfo.o: ../../functions/reload.h ../../functions/rm.h -ticketinfo.o: ../../functions/specialdefault.h ../../functions/stat.h -ticketinfo.o: ../../functions/subject.h ../../functions/template.h -ticketinfo.o: ../../functions/tinymce.h ../../functions/uname.h -ticketinfo.o: ../../functions/upload.h ../../functions/uptime.h -ticketinfo.o: ../../functions/who.h ../../functions/vim.h -ticketinfo.o: ../../core/htmlfilter.h tdb.h ../../db/dbbase.h -ticketinfo.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h -ticketinfo.o: ../../core/log.h ../../core/misc.h sessiondata.h -ticketinfo.o: ../../core/plugindata.h ../../functions/rm.h +ticketinfo.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h +ticketinfo.o: ../../core/users.h ../../core/groups.h ../../core/group.h +ticketinfo.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h +ticketinfo.o: ../../functions/functions.h ../../functions/functionbase.h +ticketinfo.o: ../../functions/functionparser.h ../../core/cur.h +ticketinfo.o: ../../functions/adduser.h ../../functions/cat.h +ticketinfo.o: ../../functions/chmod.h ../../functions/privchanger.h +ticketinfo.o: ../../core/request.h ../../functions/chown.h +ticketinfo.o: ../../functions/ckeditor.h ../../functions/cp.h +ticketinfo.o: ../../functions/default.h ../../functions/download.h +ticketinfo.o: ../../functions/emacs.h ../../functions/last.h +ticketinfo.o: ../../functions/login.h ../../functions/logout.h +ticketinfo.o: ../../functions/ln.h ../../functions/ls.h +ticketinfo.o: ../../functions/mkdir.h ../../functions/mv.h +ticketinfo.o: ../../functions/nicedit.h ../../functions/node.h +ticketinfo.o: ../../functions/priv.h ../../functions/reload.h +ticketinfo.o: ../../functions/rm.h ../../functions/specialdefault.h +ticketinfo.o: ../../functions/stat.h ../../functions/subject.h +ticketinfo.o: ../../functions/template.h ../../functions/tinymce.h +ticketinfo.o: ../../functions/uname.h ../../functions/upload.h +ticketinfo.o: ../../functions/uptime.h ../../functions/who.h +ticketinfo.o: ../../functions/vim.h ../../core/htmlfilter.h tdb.h +ticketinfo.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h +ticketinfo.o: ../../core/error.h ../../core/log.h ../../core/misc.h +ticketinfo.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h ticketparser.o: ticketparser.h ticketconf.h ../../core/log.h ticketparser.o: ../../core/misc.h diff --git a/static/layout1/winix.css b/static/layout1/winix.css index c47832e..b1b8589 100755 --- a/static/layout1/winix.css +++ b/static/layout1/winix.css @@ -441,6 +441,7 @@ width: 250px; vertical-align: middle; } + #additem label { vertical-align: top; margin: 0.3em 0 0.3em 0; @@ -726,6 +727,10 @@ img.catimage { max-width: 600px; } +pre.nowinixbreak { +display: inline; +white-space: normal; +} diff --git a/templates/Makefile.dep b/templates/Makefile.dep index fdbcce0..83e4389 100755 --- a/templates/Makefile.dep +++ b/templates/Makefile.dep @@ -12,19 +12,19 @@ adduser.o: ../core/cur.h ../core/request.h ../core/requesttypes.h adduser.o: ../core/error.h ../core/config.h ../core/confparser.h adduser.o: ../core/htmlfilter.h ../templates/htmltextstream.h adduser.o: ../core/session.h ../core/user.h ../core/plugindata.h -adduser.o: ../core/rebus.h ../templates/locale.h indexpatterns.h -adduser.o: ../core/config.h ../core/cur.h ../core/system.h ../core/dirs.h -adduser.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h -adduser.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h -adduser.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h -adduser.o: ../core/ugcontainer.h ../core/log.h ../notify/notify.h -adduser.o: ../notify/notifypool.h ../templates/misc.h +adduser.o: ../core/rebus.h ../core/mount.h ../templates/locale.h +adduser.o: indexpatterns.h ../core/config.h ../core/cur.h ../core/system.h +adduser.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h +adduser.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h +adduser.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h +adduser.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h +adduser.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h adduser.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h adduser.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -adduser.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -adduser.o: ../core/mountparser.h ../core/crypt.h ../core/run.h -adduser.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -adduser.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h +adduser.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +adduser.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +adduser.o: ../core/group.h ../core/loadavg.h ../core/thumb.h +adduser.o: ../core/basethread.h ../core/sessionmanager.h adduser.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h adduser.o: ../core/request.h dir.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h @@ -38,33 +38,33 @@ dir.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h dir.o: ../core/request.h ../core/requesttypes.h ../core/error.h dir.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h dir.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -dir.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h -dir.o: indexpatterns.h ../core/config.h ../core/cur.h ../core/system.h -dir.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h -dir.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h +dir.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h +dir.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h +dir.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h +dir.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h dir.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h dir.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h dir.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h dir.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h dir.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -dir.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -dir.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -dir.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -dir.o: ../core/basethread.h ../core/sessionmanager.h -dir.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -dir.o: ../core/misc.h ../functions/functions.h ../functions/functionbase.h -dir.o: ../core/request.h ../core/synchro.h ../functions/functionparser.h -dir.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h -dir.o: ../functions/privchanger.h ../functions/chown.h -dir.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h -dir.o: ../functions/download.h ../functions/emacs.h ../functions/last.h -dir.o: ../functions/login.h ../functions/logout.h ../functions/ln.h -dir.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h -dir.o: ../functions/nicedit.h ../functions/node.h ../functions/priv.h -dir.o: ../functions/reload.h ../functions/rm.h ../functions/specialdefault.h -dir.o: ../functions/stat.h ../functions/subject.h ../functions/template.h -dir.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h -dir.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h +dir.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +dir.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +dir.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h +dir.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h +dir.o: ../core/htmlfilter.h ../core/misc.h ../functions/functions.h +dir.o: ../functions/functionbase.h ../core/request.h ../core/synchro.h +dir.o: ../functions/functionparser.h ../functions/adduser.h +dir.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h +dir.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h +dir.o: ../functions/default.h ../functions/download.h ../functions/emacs.h +dir.o: ../functions/last.h ../functions/login.h ../functions/logout.h +dir.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h +dir.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h +dir.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h +dir.o: ../functions/specialdefault.h ../functions/stat.h +dir.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h +dir.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h +dir.o: ../functions/who.h ../functions/vim.h doc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h doc.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h doc.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h @@ -76,21 +76,20 @@ doc.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h doc.o: ../core/request.h ../core/requesttypes.h ../core/error.h doc.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h doc.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -doc.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h -doc.o: indexpatterns.h ../core/config.h ../core/cur.h ../core/system.h -doc.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h -doc.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h +doc.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h +doc.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h +doc.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h +doc.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h doc.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h doc.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h doc.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h doc.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h doc.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -doc.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -doc.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -doc.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -doc.o: ../core/basethread.h ../core/sessionmanager.h -doc.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -doc.o: ../core/request.h ../core/misc.h +doc.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +doc.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +doc.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h +doc.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h +doc.o: ../core/htmlfilter.h ../core/request.h ../core/misc.h filters.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h filters.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h filters.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h @@ -103,19 +102,19 @@ filters.o: ../core/cur.h ../core/request.h ../core/requesttypes.h filters.o: ../core/error.h ../core/config.h ../core/confparser.h filters.o: ../core/htmlfilter.h ../templates/htmltextstream.h filters.o: ../core/session.h ../core/user.h ../core/plugindata.h -filters.o: ../core/rebus.h ../templates/locale.h indexpatterns.h -filters.o: ../core/config.h ../core/cur.h ../core/system.h ../core/dirs.h -filters.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h -filters.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h -filters.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h -filters.o: ../core/ugcontainer.h ../core/log.h ../notify/notify.h -filters.o: ../notify/notifypool.h ../templates/misc.h +filters.o: ../core/rebus.h ../core/mount.h ../templates/locale.h +filters.o: indexpatterns.h ../core/config.h ../core/cur.h ../core/system.h +filters.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h +filters.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h +filters.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h +filters.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h +filters.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h filters.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h filters.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -filters.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -filters.o: ../core/mountparser.h ../core/crypt.h ../core/run.h -filters.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -filters.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h +filters.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +filters.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +filters.o: ../core/group.h ../core/loadavg.h ../core/thumb.h +filters.o: ../core/basethread.h ../core/sessionmanager.h filters.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h filters.o: ../core/misc.h htmltextstream.o: htmltextstream.h ../core/textstream.h misc.h localefilter.h @@ -136,7 +135,7 @@ indexpatterns.o: ../core/request.h ../core/requesttypes.h ../core/error.h indexpatterns.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h indexpatterns.o: ../templates/htmltextstream.h ../core/session.h indexpatterns.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -indexpatterns.o: ../templates/locale.h +indexpatterns.o: ../core/mount.h ../templates/locale.h item.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h item.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h item.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h @@ -148,7 +147,7 @@ item.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h item.o: ../core/cur.h ../core/request.h ../core/requesttypes.h item.o: ../core/error.h ../core/config.h ../core/confparser.h item.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h -item.o: ../core/user.h ../core/plugindata.h ../core/rebus.h +item.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h item.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h item.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h item.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h @@ -157,9 +156,9 @@ item.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h item.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h item.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h item.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -item.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -item.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -item.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +item.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +item.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +item.o: ../core/group.h ../core/loadavg.h ../core/thumb.h item.o: ../core/basethread.h ../core/sessionmanager.h item.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h item.o: ../core/request.h ../core/misc.h ../core/bbcodeparser.h @@ -174,7 +173,7 @@ last.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h last.o: ../core/cur.h ../core/request.h ../core/requesttypes.h last.o: ../core/error.h ../core/config.h ../core/confparser.h last.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h -last.o: ../core/user.h ../core/plugindata.h ../core/rebus.h +last.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h last.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h last.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h last.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h @@ -183,9 +182,9 @@ last.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h last.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h last.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h last.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -last.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -last.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -last.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +last.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +last.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +last.o: ../core/group.h ../core/loadavg.h ../core/thumb.h last.o: ../core/basethread.h ../core/sessionmanager.h last.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h last.o: ../core/lastcontainer.h ../core/request.h ../core/misc.h @@ -195,14 +194,14 @@ locale.o: ../core/request.h ../core/requesttypes.h ../../ezc/src/item.h locale.o: ../../ezc/src/funinfo.h ../core/error.h ../core/config.h locale.o: ../core/confparser.h ../core/htmlfilter.h locale.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -locale.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h -locale.o: ../../ezc/src/utf8.h +locale.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h +locale.o: ../templates/locale.h ../../ezc/src/utf8.h localefilter.o: localefilter.h locale.h ../core/confparser.h localefilter.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h localefilter.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h localefilter.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h localefilter.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h -localefilter.o: ../core/misc.h +localefilter.o: ../core/misc.h ../core/requesttypes.h ls.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h ls.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h ls.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h @@ -214,18 +213,18 @@ ls.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h ls.o: ../core/request.h ../core/requesttypes.h ../core/error.h ls.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h ls.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -ls.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h -ls.o: indexpatterns.h ../core/config.h ../core/cur.h ../core/system.h -ls.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h -ls.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h -ls.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h -ls.o: ../core/ugcontainer.h ../core/log.h ../notify/notify.h -ls.o: ../notify/notifypool.h ../templates/misc.h ../notify/notifythread.h -ls.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -ls.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -ls.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h ../core/crypt.h -ls.o: ../core/run.h ../core/users.h ../core/groups.h ../core/group.h -ls.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +ls.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h +ls.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h +ls.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h +ls.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h +ls.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h +ls.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h +ls.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +ls.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +ls.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +ls.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +ls.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +ls.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h ls.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h ls.o: ../core/htmlfilter.h ../core/request.h misc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h @@ -239,7 +238,7 @@ misc.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h misc.o: ../core/cur.h ../core/request.h ../core/requesttypes.h misc.o: ../core/error.h ../core/config.h ../core/confparser.h misc.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h -misc.o: ../core/user.h ../core/plugindata.h ../core/rebus.h +misc.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h misc.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h misc.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h misc.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h @@ -248,9 +247,9 @@ misc.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h misc.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h misc.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h misc.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -misc.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -misc.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -misc.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +misc.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +misc.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +misc.o: ../core/group.h ../core/loadavg.h ../core/thumb.h misc.o: ../core/basethread.h ../core/sessionmanager.h misc.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h misc.o: ../core/misc.h ../core/request.h @@ -265,7 +264,7 @@ mount.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h mount.o: ../core/cur.h ../core/request.h ../core/requesttypes.h mount.o: ../core/error.h ../core/config.h ../core/confparser.h mount.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h -mount.o: ../core/user.h ../core/plugindata.h ../core/rebus.h +mount.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h mount.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h mount.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h mount.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h @@ -274,12 +273,12 @@ mount.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h mount.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h mount.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h mount.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -mount.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -mount.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -mount.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +mount.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +mount.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +mount.o: ../core/group.h ../core/loadavg.h ../core/thumb.h mount.o: ../core/basethread.h ../core/sessionmanager.h mount.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -mount.o: ../core/misc.h +mount.o: ../core/misc.h ../core/mounts.h patterncacher.o: patterncacher.h ../core/item.h misc.h localefilter.h patterncacher.o: locale.h ../core/confparser.h ../../ezc/src/ezc.h patterncacher.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h @@ -293,7 +292,7 @@ patterncacher.o: ../core/requesttypes.h ../core/error.h ../core/config.h patterncacher.o: ../core/confparser.h ../core/htmlfilter.h patterncacher.o: ../templates/htmltextstream.h ../core/session.h patterncacher.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -patterncacher.o: ../templates/locale.h +patterncacher.o: ../core/mount.h ../templates/locale.h priv.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h priv.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h priv.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h @@ -305,7 +304,7 @@ priv.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h priv.o: ../core/cur.h ../core/request.h ../core/requesttypes.h priv.o: ../core/error.h ../core/config.h ../core/confparser.h priv.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h -priv.o: ../core/user.h ../core/plugindata.h ../core/rebus.h +priv.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h priv.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h priv.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h priv.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h @@ -314,9 +313,9 @@ priv.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h priv.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h priv.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h priv.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -priv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -priv.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -priv.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +priv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +priv.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +priv.o: ../core/group.h ../core/loadavg.h ../core/thumb.h priv.o: ../core/basethread.h ../core/sessionmanager.h priv.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h priv.o: ../core/request.h ../core/misc.h ../functions/functions.h @@ -344,7 +343,7 @@ rebus.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h rebus.o: ../core/cur.h ../core/request.h ../core/requesttypes.h rebus.o: ../core/error.h ../core/config.h ../core/confparser.h rebus.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h -rebus.o: ../core/user.h ../core/plugindata.h ../core/rebus.h +rebus.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h rebus.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h rebus.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h rebus.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h @@ -353,16 +352,16 @@ rebus.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h rebus.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h rebus.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h rebus.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -rebus.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -rebus.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -rebus.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +rebus.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +rebus.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +rebus.o: ../core/group.h ../core/loadavg.h ../core/thumb.h rebus.o: ../core/basethread.h ../core/sessionmanager.h rebus.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h slog.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/requesttypes.h slog.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h ../core/error.h slog.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h slog.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h -slog.o: ../core/user.h ../core/plugindata.h ../core/rebus.h +slog.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h slog.o: ../core/logmanipulators.h ../templates/locale.h templates.h slog.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h slog.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h @@ -378,9 +377,9 @@ slog.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h slog.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h slog.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h slog.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -slog.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -slog.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -slog.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +slog.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +slog.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +slog.o: ../core/group.h ../core/loadavg.h ../core/thumb.h slog.o: ../core/basethread.h ../core/sessionmanager.h slog.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h stat.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h @@ -394,7 +393,7 @@ stat.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h stat.o: ../core/cur.h ../core/request.h ../core/requesttypes.h stat.o: ../core/error.h ../core/config.h ../core/confparser.h stat.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h -stat.o: ../core/user.h ../core/plugindata.h ../core/rebus.h +stat.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h stat.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h stat.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h stat.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h @@ -403,9 +402,9 @@ stat.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h stat.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h stat.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h stat.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -stat.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -stat.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -stat.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +stat.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +stat.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +stat.o: ../core/group.h ../core/loadavg.h ../core/thumb.h stat.o: ../core/basethread.h ../core/sessionmanager.h stat.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h stat.o: ../core/request.h ../core/misc.h @@ -420,21 +419,20 @@ sys.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h sys.o: ../core/request.h ../core/requesttypes.h ../core/error.h sys.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h sys.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -sys.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h -sys.o: indexpatterns.h ../core/config.h ../core/cur.h ../core/system.h -sys.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h -sys.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h +sys.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h +sys.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h +sys.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h +sys.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h sys.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h sys.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h sys.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h sys.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h sys.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -sys.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -sys.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -sys.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -sys.o: ../core/basethread.h ../core/sessionmanager.h -sys.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -sys.o: ../core/request.h ../core/version.h +sys.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +sys.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +sys.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h +sys.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h +sys.o: ../core/htmlfilter.h ../core/request.h ../core/version.h template.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h template.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h template.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h @@ -447,21 +445,22 @@ template.o: ../core/slog.h ../core/cur.h ../core/request.h template.o: ../core/requesttypes.h ../core/error.h ../core/config.h template.o: ../core/confparser.h ../core/htmlfilter.h template.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -template.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h -template.o: indexpatterns.h ../core/config.h ../core/cur.h ../core/system.h -template.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h -template.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h -template.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h -template.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -template.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +template.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h +template.o: ../templates/locale.h indexpatterns.h ../core/config.h +template.o: ../core/cur.h ../core/system.h ../core/dirs.h +template.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +template.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h +template.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h +template.o: ../core/ugcontainer.h ../core/log.h ../notify/notify.h +template.o: ../notify/notifypool.h ../templates/misc.h template.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h template.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -template.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -template.o: ../core/mountparser.h ../core/crypt.h ../core/run.h -template.o: ../core/users.h ../core/groups.h ../core/group.h -template.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -template.o: ../core/sessionmanager.h ../core/sessioncontainer.h -template.o: ../core/system.h ../core/htmlfilter.h ../core/misc.h +template.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +template.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +template.o: ../core/group.h ../core/loadavg.h ../core/thumb.h +template.o: ../core/basethread.h ../core/sessionmanager.h +template.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h +template.o: ../core/misc.h templates.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h templates.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h templates.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h @@ -474,18 +473,19 @@ templates.o: ../core/slog.h ../core/cur.h ../core/request.h templates.o: ../core/requesttypes.h ../core/error.h ../core/config.h templates.o: ../core/confparser.h ../core/htmlfilter.h templates.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -templates.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h -templates.o: indexpatterns.h ../core/config.h ../core/cur.h ../core/system.h -templates.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h -templates.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h -templates.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h -templates.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -templates.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +templates.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h +templates.o: ../templates/locale.h indexpatterns.h ../core/config.h +templates.o: ../core/cur.h ../core/system.h ../core/dirs.h +templates.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +templates.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h +templates.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h +templates.o: ../core/ugcontainer.h ../core/log.h ../notify/notify.h +templates.o: ../notify/notifypool.h ../templates/misc.h templates.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h templates.o: ../notify/templatesnotify.h ../core/users.h templates.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h -templates.o: ../core/mount.h ../core/mountparser.h ../core/crypt.h -templates.o: ../core/run.h ../core/users.h ../core/groups.h ../core/group.h +templates.o: ../core/mountparser.h ../core/crypt.h ../core/run.h +templates.o: ../core/users.h ../core/groups.h ../core/group.h templates.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h templates.o: ../core/sessionmanager.h ../core/sessioncontainer.h templates.o: ../core/system.h ../core/htmlfilter.h ../core/misc.h @@ -518,16 +518,16 @@ upload.o: ../core/cur.h ../core/request.h ../core/requesttypes.h upload.o: ../core/error.h ../core/config.h ../core/confparser.h upload.o: ../core/htmlfilter.h ../templates/htmltextstream.h upload.o: ../core/session.h ../core/user.h ../core/plugindata.h -upload.o: ../core/rebus.h ../templates/locale.h indexpatterns.h -upload.o: ../core/config.h ../core/cur.h ../core/system.h ../core/dirs.h -upload.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h -upload.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h -upload.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h -upload.o: ../core/ugcontainer.h ../core/log.h ../notify/notify.h -upload.o: ../notify/notifypool.h ../templates/misc.h ../notify/notifythread.h -upload.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -upload.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -upload.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h +upload.o: ../core/rebus.h ../core/mount.h ../templates/locale.h +upload.o: indexpatterns.h ../core/config.h ../core/cur.h ../core/system.h +upload.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h +upload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h +upload.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h +upload.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h +upload.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +upload.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +upload.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +upload.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h upload.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h upload.o: ../core/group.h ../core/loadavg.h ../core/thumb.h upload.o: ../core/basethread.h ../core/sessionmanager.h @@ -545,16 +545,16 @@ uptime.o: ../core/cur.h ../core/request.h ../core/requesttypes.h uptime.o: ../core/error.h ../core/config.h ../core/confparser.h uptime.o: ../core/htmlfilter.h ../templates/htmltextstream.h uptime.o: ../core/session.h ../core/user.h ../core/plugindata.h -uptime.o: ../core/rebus.h ../templates/locale.h indexpatterns.h -uptime.o: ../core/config.h ../core/cur.h ../core/system.h ../core/dirs.h -uptime.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h -uptime.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h -uptime.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h -uptime.o: ../core/ugcontainer.h ../core/log.h ../notify/notify.h -uptime.o: ../notify/notifypool.h ../templates/misc.h ../notify/notifythread.h -uptime.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -uptime.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -uptime.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h +uptime.o: ../core/rebus.h ../core/mount.h ../templates/locale.h +uptime.o: indexpatterns.h ../core/config.h ../core/cur.h ../core/system.h +uptime.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h +uptime.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h +uptime.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h +uptime.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h +uptime.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h +uptime.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +uptime.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +uptime.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h uptime.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h uptime.o: ../core/group.h ../core/loadavg.h ../core/thumb.h uptime.o: ../core/basethread.h ../core/sessionmanager.h @@ -570,7 +570,7 @@ user.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h user.o: ../core/cur.h ../core/request.h ../core/requesttypes.h user.o: ../core/error.h ../core/config.h ../core/confparser.h user.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h -user.o: ../core/user.h ../core/plugindata.h ../core/rebus.h +user.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h user.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h user.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h user.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h @@ -579,9 +579,9 @@ user.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h user.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h user.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h user.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -user.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -user.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -user.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +user.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +user.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +user.o: ../core/group.h ../core/loadavg.h ../core/thumb.h user.o: ../core/basethread.h ../core/sessionmanager.h user.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h user.o: ../core/request.h ../core/misc.h @@ -596,21 +596,20 @@ who.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h who.o: ../core/request.h ../core/requesttypes.h ../core/error.h who.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h who.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -who.o: ../core/plugindata.h ../core/rebus.h ../templates/locale.h -who.o: indexpatterns.h ../core/config.h ../core/cur.h ../core/system.h -who.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h -who.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h +who.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h +who.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h +who.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h +who.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h who.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h who.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h who.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h who.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h who.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -who.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -who.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -who.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -who.o: ../core/basethread.h ../core/sessionmanager.h -who.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -who.o: ../core/request.h ../core/misc.h +who.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +who.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +who.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h +who.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h +who.o: ../core/htmlfilter.h ../core/request.h ../core/misc.h winix.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h winix.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h winix.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h @@ -622,7 +621,7 @@ winix.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h winix.o: ../core/cur.h ../core/request.h ../core/requesttypes.h winix.o: ../core/error.h ../core/config.h ../core/confparser.h winix.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h -winix.o: ../core/user.h ../core/plugindata.h ../core/rebus.h +winix.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h winix.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h winix.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h winix.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h @@ -631,9 +630,9 @@ winix.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h winix.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h winix.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h winix.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -winix.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -winix.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h -winix.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +winix.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h +winix.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h +winix.o: ../core/group.h ../core/loadavg.h ../core/thumb.h winix.o: ../core/basethread.h ../core/sessionmanager.h winix.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h winix.o: ../core/request.h ../core/plugin.h ../core/pluginmsg.h diff --git a/templates/doc.cpp b/templates/doc.cpp index efb3f48..c8ab9c8 100755 --- a/templates/doc.cpp +++ b/templates/doc.cpp @@ -2,14 +2,14 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ #include "templates.h" -#include "../core/request.h" -#include "../core/misc.h" +#include "core/request.h" +#include "core/misc.h" @@ -78,6 +78,65 @@ void doc_current_url(Info & i) + + +static size_t doc_css_index = 0; + + +/* + cur->session->last_css is set by some javascript wysiwyg editors (ckeditor, tinymce) +*/ +void doc_css_tab(Info & i) +{ + doc_css_index = i.iter; + i.res = doc_css_index < cur->session->last_css.size(); +} + + +void doc_css_tab_file(Info & i) +{ + if( doc_css_index < cur->session->last_css.size() ) + i.out << cur->session->last_css[doc_css_index]; +} + + +void doc_css_tab_file_is_global(Info & i) +{ + if( doc_css_index < cur->session->last_css.size() ) + i.res = IsSubString(L"http://", cur->session->last_css[doc_css_index].c_str()) || + IsSubString(L"https://", cur->session->last_css[doc_css_index].c_str()); +} + + +void doc_css_tab_has_next(Info & i) +{ + i.res = (doc_css_index + 1 < cur->session->last_css.size()); +} + + +void doc_css_is_empty(Info & i) +{ + i.res = cur->session->last_css.empty(); +} + + +void doc_css_is_one(Info & i) +{ + i.res = cur->session->last_css.size() == 1; +} + + +void doc_css_more_than_one(Info & i) +{ + i.res = cur->session->last_css.size() > 1; +} + + + + + + + } // namespace TemplatesFunctions diff --git a/templates/item.cpp b/templates/item.cpp index 3092c47..43325b1 100755 --- a/templates/item.cpp +++ b/templates/item.cpp @@ -354,6 +354,10 @@ void item_is_link_redirect(Info & i) i.res = cur->request->item.link_redirect == 1; } +void item_file_size(Info & i) +{ + i.res = cur->request->item.file_size; +} @@ -454,6 +458,19 @@ void item_tab_link(Info & i) } +void item_tab_filetype_is_none(Info & i) +{ + if( item_index < cur->request->item_tab.size() ) + i.res = cur->request->item_tab[item_index].file_type == WINIX_ITEM_FILETYPE_NONE; +} + + +void item_tab_filetype_is_image(Info & i) +{ + if( item_index < cur->request->item_tab.size() ) + i.res = cur->request->item_tab[item_index].file_type == WINIX_ITEM_FILETYPE_IMAGE; +} + void item_tab_can_read(Info & i) @@ -667,6 +684,18 @@ void item_tab_is_link_redirect(Info & i) } +void item_tab_file_size(Info & i) +{ + if( item_index < cur->request->item_tab.size() ) + i.out << cur->request->item_tab[item_index].file_size; +} + + +void item_tab_has_next(Info & i) +{ + i.res = item_index + 1 < cur->request->item_tab.size(); +} + } // namespace TemplatesFunctions diff --git a/templates/mount.cpp b/templates/mount.cpp index f326bb8..6749a7d 100755 --- a/templates/mount.cpp +++ b/templates/mount.cpp @@ -54,6 +54,86 @@ void mount_first_html_template(Info & i) +static size_t mount_css_index = 0; + +void mount_css_tab(Info & i) +{ + int parcss = system->mounts.MountParCss(); + + + if( !cur->mount->param[parcss].defined ) + return; + + mount_css_index = i.iter; + i.res = mount_css_index < cur->mount->param[parcss].arg.size(); +} + + +void mount_css_tab_file(Info & i) +{ + int parcss = system->mounts.MountParCss(); + + if( mount_css_index < cur->mount->param[parcss].arg.size() ) + i.out << cur->mount->param[parcss].arg[mount_css_index]; +} + + +void mount_css_tab_file_is_global(Info & i) +{ + int parcss = system->mounts.MountParCss(); + + if( mount_css_index < cur->mount->param[parcss].arg.size() ) + i.res = IsSubString(L"http://", cur->mount->param[parcss].arg[mount_css_index].c_str()) || + IsSubString(L"https://", cur->mount->param[parcss].arg[mount_css_index].c_str()); +} + + + +void mount_css_tab_has_next(Info & i) +{ + int parcss = system->mounts.MountParCss(); + + if( !cur->mount->param[parcss].defined ) + return; + + i.res = (mount_css_index + 1 < cur->mount->param[parcss].arg.size()); +} + + +size_t mount_css_size() +{ + int parcss = system->mounts.MountParCss(); + + if( !cur->mount->param[parcss].defined ) + return 0; + +return cur->mount->param[parcss].arg.size(); +} + + + +void mount_css_is_empty(Info & i) +{ + i.res = mount_css_size() == 0; +} + + +void mount_css_is_one(Info & i) +{ + i.res = mount_css_size() == 1; +} + + +void mount_css_more_than_one(Info & i) +{ + i.res = mount_css_size() > 1; +} + + + + + + static bool mount_tab_inited = false; static Mounts::MountTab::const_iterator mount_iter; static std::wstring dir_str; diff --git a/templates/templates.cpp b/templates/templates.cpp index 99b52ab..98485fd 100755 --- a/templates/templates.cpp +++ b/templates/templates.cpp @@ -192,6 +192,7 @@ void Templates::CreateFunctions() ezc_functions.Insert("fil_tosmall", fil_tosmall); ezc_functions.Insert("fil_firstup", fil_firstup); + /* doc */ @@ -200,6 +201,14 @@ void Templates::CreateFunctions() ezc_functions.Insert("doc_base_url_static", doc_base_url_static); ezc_functions.Insert("doc_base_url_common", doc_base_url_common); ezc_functions.Insert("doc_current_url", doc_current_url); + ezc_functions.Insert("doc_css_tab", doc_css_tab); + ezc_functions.Insert("doc_css_tab_file", doc_css_tab_file); + ezc_functions.Insert("doc_css_tab_file_is_global", doc_css_tab_file_is_global); + ezc_functions.Insert("doc_css_tab_has_next", doc_css_tab_has_next); + ezc_functions.Insert("doc_css_is_empty", doc_css_is_empty); + ezc_functions.Insert("doc_css_is_one", doc_css_is_one); + ezc_functions.Insert("doc_css_more_than_one", doc_css_more_than_one); + /* @@ -245,6 +254,7 @@ void Templates::CreateFunctions() ezc_functions.Insert("item_is_link_to", item_is_link_to); ezc_functions.Insert("item_link_to", item_link_to); ezc_functions.Insert("item_is_link_redirect", item_is_link_redirect); + ezc_functions.Insert("item_file_size", item_file_size); ezc_functions.Insert("item_tab", item_tab); ezc_functions.Insert("item_tab_id", item_tab_id); @@ -257,6 +267,8 @@ void Templates::CreateFunctions() ezc_functions.Insert("item_tab_dir", item_tab_dir); ezc_functions.Insert("item_tab_url", item_tab_url); ezc_functions.Insert("item_tab_link", item_tab_link); + ezc_functions.Insert("item_tab_filetype_is_none", item_tab_filetype_is_none); + ezc_functions.Insert("item_tab_filetype_is_image", item_tab_filetype_is_image); ezc_functions.Insert("item_tab_can_read", item_tab_can_read); ezc_functions.Insert("item_tab_can_write", item_tab_can_write); ezc_functions.Insert("item_tab_user", item_tab_user); @@ -278,6 +290,8 @@ void Templates::CreateFunctions() ezc_functions.Insert("item_tab_is_link_to", item_tab_is_link_to); ezc_functions.Insert("item_tab_link_to", item_tab_link_to); ezc_functions.Insert("item_tab_is_link_redirect", item_tab_is_link_redirect); + ezc_functions.Insert("item_tab_file_size", item_tab_file_size); + ezc_functions.Insert("item_tab_has_next", item_tab_has_next); /* @@ -297,6 +311,13 @@ void Templates::CreateFunctions() ezc_functions.Insert("mount_page_arg_is", mount_page_arg_is); ezc_functions.Insert("mount_has_html_template", mount_has_html_template); ezc_functions.Insert("mount_first_html_template", mount_first_html_template); + ezc_functions.Insert("mount_css_tab", mount_css_tab); + ezc_functions.Insert("mount_css_tab_file", mount_css_tab_file); + ezc_functions.Insert("mount_css_tab_file_is_global", mount_css_tab_file_is_global); + ezc_functions.Insert("mount_css_tab_has_next", mount_css_tab_has_next); + ezc_functions.Insert("mount_css_is_empty", mount_css_is_empty); + ezc_functions.Insert("mount_css_is_one", mount_css_is_one); + ezc_functions.Insert("mount_css_more_than_one", mount_css_more_than_one); ezc_functions.Insert("mount_cur_type", mount_cur_type); ezc_functions.Insert("mount_cur_dir", mount_cur_dir); ezc_functions.Insert("mount_cur_fs", mount_cur_fs); @@ -713,6 +734,15 @@ using namespace TemplatesFunctions; } +void Templates::Generate(Ezc::Pattern & pattern) +{ +using namespace TemplatesFunctions; + + generator.Generate(cur->request->page, pattern); +} + + + void Templates::SetConfig(Config * pconfig) { TemplatesFunctions::config = pconfig; diff --git a/templates/templates.h b/templates/templates.h index e27bd50..af5065b 100755 --- a/templates/templates.h +++ b/templates/templates.h @@ -122,6 +122,13 @@ namespace TemplatesFunctions void doc_base_url_static(Info & i); void doc_base_url_common(Info & i); void doc_current_url(Info & i); + void doc_css_tab(Info & i); + void doc_css_tab_file(Info & i); + void doc_css_tab_file_is_global(Info & i); + void doc_css_tab_has_next(Info & i); + void doc_css_is_empty(Info & i); + void doc_css_is_one(Info & i); + void doc_css_more_than_one(Info & i); /* @@ -177,6 +184,7 @@ namespace TemplatesFunctions void item_is_link_to(Info & i); void item_link_to(Info & i); void item_is_link_redirect(Info & i); + void item_file_size(Info & i); void item_tab(Info & i); void item_tab_id(Info & i); @@ -189,6 +197,8 @@ namespace TemplatesFunctions void item_tab_dir(Info & i); void item_tab_url(Info & i); void item_tab_link(Info & i); + void item_tab_filetype_is_none(Info & i); + void item_tab_filetype_is_image(Info & i); void item_tab_can_read(Info & i); void item_tab_can_write(Info & i); void item_tab_user(Info & i); @@ -210,7 +220,9 @@ namespace TemplatesFunctions void item_tab_is_link_to(Info & i); void item_tab_link_to(Info & i); void item_tab_is_link_redirect(Info & i); - + void item_tab_file_size(Info & i); + void item_tab_has_next(Info & i); + /* last @@ -229,6 +241,13 @@ namespace TemplatesFunctions void mount_page_arg_is(Info & i); void mount_has_html_template(Info & i); void mount_first_html_template(Info & i); + void mount_css_tab(Info & i); + void mount_css_tab_file(Info & i); + void mount_css_tab_file_is_global(Info & i); + void mount_css_tab_has_next(Info & i); + void mount_css_is_empty(Info & i); + void mount_css_is_one(Info & i); + void mount_css_more_than_one(Info & i); void mount_cur_type(Info & i); void mount_cur_dir(Info & i); void mount_cur_fs(Info & i); @@ -239,6 +258,7 @@ namespace TemplatesFunctions void mount_tab_fs(Info & i); void mount_tab_parlist(Info & i); + /* */ @@ -412,6 +432,7 @@ public: void CreateFunctions(); // should be called before reading patterns (patterns will cache ezc functions) void Generate(); void GenerateRunRaw(); + void Generate(Ezc::Pattern & pattern); private: diff --git a/templates/upload.cpp b/templates/upload.cpp index b40c64b..8a044bf 100755 --- a/templates/upload.cpp +++ b/templates/upload.cpp @@ -32,4 +32,6 @@ void upload_ckeditor_funnum(Info & i) i.out << upload_fun_num; } + + } // namespace