changed: in plugin 'menu'

menu_dir_tab ezc functions can be nested now
         (not finished yet)
added:   'meta' winix function
         additional meta information for files and directories
         (not finished yet)



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@775 e52654a7-88a9-db11-a3e9-0013d4bc506e
pull/3/head
Tomasz Sowa 11 years ago
parent 1e9ab2f805
commit 7902389ef1

@ -5,11 +5,11 @@ 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 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: ../db/dbitemcolumns.h ../core/confparser.h ../core/user.h
app.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h log.h
app.o: textstream.h 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: mount.h ../templates/locale.h ../notify/notify.h
app.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
app.o: ../templates/localefilter.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
app.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
@ -27,22 +27,23 @@ app.o: ../functions/chmod.h ../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
app.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
app.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
app.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
app.o: ../functions/sort.h ../functions/specialdefault.h ../functions/stat.h
app.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h
app.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
app.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h
app.o: ../templates/templates.h ../templates/patterncacher.h
app.o: ../templates/indexpatterns.h ../templates/patterns.h
app.o: ../templates/changepatterns.h ../core/sessionmanager.h compress.h
app.o: postparser.h httpsimpleparser.h cookieparser.h postmultiparser.h
app.o: acceptencodingparser.h acceptbaseparser.h plugin.h pluginmsg.h
app.o: ../functions/ls.h ../functions/meta.h ../functions/mkdir.h
app.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h
app.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h
app.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h
app.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
app.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
app.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
app.o: ../core/htmlfilter.h ../templates/templates.h
app.o: ../templates/patterncacher.h ../templates/indexpatterns.h
app.o: ../templates/patterns.h ../templates/changepatterns.h
app.o: ../core/sessionmanager.h compress.h postparser.h httpsimpleparser.h
app.o: cookieparser.h postmultiparser.h acceptencodingparser.h
app.o: acceptbaseparser.h plugin.h pluginmsg.h
basethread.o: basethread.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: request.h requesttypes.h item.h confparser.h error.h config.h
compress.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h
compress.o: misc.h session.h user.h plugindata.h rebus.h mount.h
compress.o: ../templates/locale.h ../core/confparser.h
@ -73,11 +74,12 @@ 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/passwd.h ../functions/priv.h ../functions/reload.h
config.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h
config.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
config.o: ../functions/ln.h ../functions/ls.h ../functions/meta.h
config.o: ../functions/mkdir.h ../functions/mv.h ../functions/nicedit.h
config.o: ../functions/node.h ../functions/passwd.h ../functions/priv.h
config.o: ../functions/reload.h ../functions/rm.h ../functions/sort.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
config.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
config.o: ../core/htmlfilter.h ../templates/templates.h
@ -91,21 +93,20 @@ crypt.o: logmanipulators.h slog.h cur.h request.h error.h
crypt.o: ../templates/htmltextstream.h ../core/textstream.h session.h
crypt.o: plugindata.h rebus.h mount.h ../templates/locale.h
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: dircontainer.h item.h confparser.h log.h textstream.h
dircontainer.o: logmanipulators.h slog.h cur.h request.h requesttypes.h
dircontainer.o: error.h config.h htmlfilter.h ../templates/htmltextstream.h
dircontainer.o: ../core/textstream.h misc.h session.h user.h plugindata.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 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/patterns.h ../templates/locale.h
dirs.o: dirs.h item.h confparser.h dircontainer.h ../db/db.h ../db/dbbase.h
dirs.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h
dirs.o: requesttypes.h ../core/error.h ../db/dbitemquery.h ../core/item.h
dirs.o: ../db/dbitemcolumns.h ../core/confparser.h ../core/user.h
dirs.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h log.h
dirs.o: textstream.h logmanipulators.h slog.h cur.h request.h error.h
dirs.o: config.h htmlfilter.h ../templates/htmltextstream.h session.h user.h
dirs.o: plugindata.h rebus.h mount.h ../templates/locale.h ../notify/notify.h
dirs.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
dirs.o: ../templates/localefilter.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
dirs.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
dirs.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
@ -115,74 +116,75 @@ dirs.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h
dirs.o: ../templates/misc.h ../templates/htmltextstream.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 requesttypes.h ../core/error.h ../db/dbitemquery.h
groups.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
groups.o: item.h confparser.h requesttypes.h ../core/error.h
groups.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
groups.o: ../core/confparser.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 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
groups.o: htmlfilter.h ../templates/htmltextstream.h session.h user.h
groups.o: plugindata.h rebus.h mount.h ../templates/locale.h
htmlfilter.o: htmlfilter.h
httpsimpleparser.o: httpsimpleparser.h
image.o: image.h basethread.h textstream.h ../db/db.h ../db/dbbase.h
image.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h
image.o: item.h requesttypes.h ../core/error.h ../db/dbitemquery.h
image.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
image.o: item.h confparser.h requesttypes.h ../core/error.h
image.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
image.o: ../core/confparser.h ../core/user.h ../core/group.h
image.o: ../core/dircontainer.h ../core/ugcontainer.h log.h logmanipulators.h
image.o: slog.h cur.h request.h error.h config.h confparser.h htmlfilter.h
image.o: slog.h cur.h request.h error.h config.h htmlfilter.h
image.o: ../templates/htmltextstream.h session.h user.h plugindata.h rebus.h
image.o: mount.h ../templates/locale.h ../core/confparser.h ../core/config.h
image.o: ../../ezc/src/utf8.h system.h dirs.h dircontainer.h
image.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
image.o: ../templates/locale.h ../templates/localefilter.h
image.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
image.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
image.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
image.o: ../notify/notifythread.h ../core/basethread.h synchro.h
image.o: ../notify/templatesnotify.h ../core/users.h ugcontainer.h
image.o: lastcontainer.h ../templates/misc.h ../templates/htmltextstream.h
image.o: mounts.h mountparser.h crypt.h run.h users.h groups.h group.h
image.o: loadavg.h threadmanager.h plugin.h pluginmsg.h sessionmanager.h
image.o: sessioncontainer.h ../functions/functions.h
image.o: ../functions/functionbase.h ../core/request.h ../core/system.h
image.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h
image.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
image.o: ../functions/privchanger.h ../functions/chown.h
image.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h
image.o: ../functions/download.h ../functions/emacs.h ../functions/last.h
image.o: ../functions/login.h ../functions/logout.h ../functions/ln.h
image.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
image.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
image.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
image.o: ../functions/sort.h ../functions/specialdefault.h
image.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
image.o: mount.h ../templates/locale.h ../core/config.h ../../ezc/src/utf8.h
image.o: system.h dirs.h dircontainer.h ../notify/notify.h
image.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
image.o: ../templates/localefilter.h ../../ezc/src/ezc.h
image.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
image.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
image.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
image.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h
image.o: ../core/users.h ugcontainer.h lastcontainer.h ../templates/misc.h
image.o: ../templates/htmltextstream.h mounts.h mountparser.h crypt.h run.h
image.o: users.h groups.h group.h loadavg.h threadmanager.h plugin.h
image.o: pluginmsg.h sessionmanager.h sessioncontainer.h
image.o: ../functions/functions.h ../functions/functionbase.h
image.o: ../core/request.h ../core/system.h ../core/synchro.h
image.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h
image.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
image.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
image.o: ../functions/default.h ../functions/download.h ../functions/emacs.h
image.o: ../functions/last.h ../functions/login.h ../functions/logout.h
image.o: ../functions/ln.h ../functions/ls.h ../functions/meta.h
image.o: ../functions/mkdir.h ../functions/mv.h ../functions/nicedit.h
image.o: ../functions/node.h ../functions/passwd.h ../functions/priv.h
image.o: ../functions/reload.h ../functions/rm.h ../functions/sort.h
image.o: ../functions/specialdefault.h ../functions/stat.h
image.o: ../functions/subject.h ../functions/template.h
image.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
image.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
image.o: ../core/htmlfilter.h ../templates/templates.h
image.o: ../templates/patterncacher.h ../templates/indexpatterns.h
image.o: ../templates/patterns.h ../templates/changepatterns.h
image.o: ../core/sessionmanager.h
item.o: item.h misc.h requesttypes.h crypt.h run.h config.h confparser.h
item.o: item.h confparser.h misc.h requesttypes.h crypt.h run.h config.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: cur.h request.h requesttypes.h item.h confparser.h error.h
lastcontainer.o: config.h htmlfilter.h ../templates/htmltextstream.h
lastcontainer.o: ../core/textstream.h misc.h session.h user.h plugindata.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: request.h requesttypes.h item.h confparser.h error.h config.h
loadavg.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h
loadavg.o: misc.h session.h user.h plugindata.h rebus.h mount.h
loadavg.o: ../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: requesttypes.h item.h confparser.h error.h config.h htmlfilter.h
log.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.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 mount.h ../templates/locale.h
misc.o: misc.h item.h confparser.h requesttypes.h log.h textstream.h
misc.o: logmanipulators.h slog.h cur.h request.h error.h config.h
misc.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h
misc.o: session.h user.h plugindata.h rebus.h mount.h ../templates/locale.h
misc.o: ../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
@ -196,38 +198,38 @@ 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 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 requesttypes.h ../core/error.h
mountparser.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
mount.o: mount.h misc.h item.h confparser.h requesttypes.h
mountparser.o: mountparser.h mount.h item.h confparser.h dirs.h
mountparser.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
mountparser.o: ../db/dbtextstream.h ../core/textstream.h misc.h
mountparser.o: requesttypes.h ../core/error.h ../db/dbitemquery.h
mountparser.o: ../core/item.h ../db/dbitemcolumns.h ../core/confparser.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 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/patterns.h ../templates/locale.h
mountparser.o: ../templates/localefilter.h ../../ezc/src/ezc.h
mountparser.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
mountparser.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
mountparser.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
mountparser.o: ../notify/notifythread.h ../core/basethread.h synchro.h
mountparser.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
mountparser.o: ugcontainer.h lastcontainer.h ../templates/misc.h
mountparser.o: ../templates/htmltextstream.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
mountparser.o: slog.h cur.h request.h error.h config.h htmlfilter.h
mountparser.o: ../templates/htmltextstream.h session.h user.h plugindata.h
mountparser.o: rebus.h ../templates/locale.h ../notify/notify.h
mountparser.o: ../notify/notifypool.h ../templates/patterns.h
mountparser.o: ../templates/locale.h ../templates/localefilter.h
mountparser.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h
mountparser.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
mountparser.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
mountparser.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
mountparser.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h
mountparser.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h
mountparser.o: ../templates/misc.h ../templates/htmltextstream.h
mounts.o: mounts.h mount.h error.h dirs.h item.h confparser.h dircontainer.h
mounts.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.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: ../core/confparser.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 config.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/patterns.h
mounts.o: ../templates/locale.h ../templates/localefilter.h
mounts.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
mounts.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
mounts.o: ../templates/patterns.h ../templates/locale.h
mounts.o: ../templates/localefilter.h ../../ezc/src/ezc.h
mounts.o: ../../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: ../notify/notifythread.h ../core/basethread.h synchro.h
@ -243,11 +245,12 @@ 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/passwd.h ../functions/priv.h ../functions/reload.h
mounts.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h
mounts.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
mounts.o: ../functions/ln.h ../functions/ls.h ../functions/meta.h
mounts.o: ../functions/mkdir.h ../functions/mv.h ../functions/nicedit.h
mounts.o: ../functions/node.h ../functions/passwd.h ../functions/priv.h
mounts.o: ../functions/reload.h ../functions/rm.h ../functions/sort.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
mounts.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
mounts.o: ../core/htmlfilter.h ../templates/templates.h
@ -255,7 +258,7 @@ mounts.o: ../templates/patterncacher.h ../templates/indexpatterns.h
mounts.o: ../templates/patterns.h ../templates/changepatterns.h
mounts.o: ../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: cur.h request.h requesttypes.h item.h confparser.h error.h config.h
plugin.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h
plugin.o: misc.h session.h user.h plugindata.h rebus.h mount.h
plugin.o: ../templates/locale.h ../core/confparser.h system.h dirs.h
@ -281,11 +284,12 @@ plugin.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
plugin.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
plugin.o: ../functions/default.h ../functions/download.h ../functions/emacs.h
plugin.o: ../functions/last.h ../functions/login.h ../functions/logout.h
plugin.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h
plugin.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h
plugin.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h
plugin.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h
plugin.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
plugin.o: ../functions/ln.h ../functions/ls.h ../functions/meta.h
plugin.o: ../functions/mkdir.h ../functions/mv.h ../functions/nicedit.h
plugin.o: ../functions/node.h ../functions/passwd.h ../functions/priv.h
plugin.o: ../functions/reload.h ../functions/rm.h ../functions/sort.h
plugin.o: ../functions/specialdefault.h ../functions/stat.h
plugin.o: ../functions/subject.h ../functions/template.h
plugin.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
plugin.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
plugin.o: ../core/htmlfilter.h ../templates/templates.h
@ -294,7 +298,7 @@ plugin.o: ../templates/patterns.h ../templates/changepatterns.h
plugin.o: ../core/sessionmanager.h
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: confparser.h error.h config.h htmlfilter.h
plugindata.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
plugindata.o: session.h user.h rebus.h mount.h ../templates/locale.h
plugindata.o: ../core/confparser.h system.h dirs.h dircontainer.h ../db/db.h
@ -322,9 +326,10 @@ plugindata.o: ../functions/ckeditor.h ../functions/cp.h
plugindata.o: ../functions/default.h ../functions/download.h
plugindata.o: ../functions/emacs.h ../functions/last.h ../functions/login.h
plugindata.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h
plugindata.o: ../functions/mkdir.h ../functions/mv.h ../functions/nicedit.h
plugindata.o: ../functions/node.h ../functions/passwd.h ../functions/priv.h
plugindata.o: ../functions/reload.h ../functions/rm.h ../functions/sort.h
plugindata.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h
plugindata.o: ../functions/nicedit.h ../functions/node.h
plugindata.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h
plugindata.o: ../functions/rm.h ../functions/sort.h
plugindata.o: ../functions/specialdefault.h ../functions/stat.h
plugindata.o: ../functions/subject.h ../functions/template.h
plugindata.o: ../functions/tinymce.h ../functions/uname.h
@ -341,11 +346,11 @@ 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: requesttypes.h item.h confparser.h error.h config.h htmlfilter.h
rebus.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.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: request.h requesttypes.h item.h confparser.h error.h config.h
request.o: htmlfilter.h textstream.h ../templates/htmltextstream.h
request.o: ../core/textstream.h misc.h log.h logmanipulators.h slog.h cur.h
request.o: session.h user.h plugindata.h rebus.h mount.h
@ -374,11 +379,11 @@ request.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
request.o: ../functions/default.h ../functions/download.h
request.o: ../functions/emacs.h ../functions/last.h ../functions/login.h
request.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h
request.o: ../functions/mkdir.h ../functions/mv.h ../functions/nicedit.h
request.o: ../functions/node.h ../functions/passwd.h ../functions/priv.h
request.o: ../functions/reload.h ../functions/rm.h ../functions/sort.h
request.o: ../functions/specialdefault.h ../functions/stat.h
request.o: ../functions/subject.h ../functions/template.h
request.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h
request.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
request.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
request.o: ../functions/sort.h ../functions/specialdefault.h
request.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
request.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
request.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
request.o: ../core/htmlfilter.h ../templates/templates.h
@ -386,29 +391,29 @@ request.o: ../templates/patterncacher.h ../templates/indexpatterns.h
request.o: ../templates/patterns.h ../templates/changepatterns.h
request.o: ../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: requesttypes.h item.h confparser.h error.h config.h htmlfilter.h
run.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.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 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
session.o: session.h item.h confparser.h error.h user.h plugindata.h rebus.h
session.o: textstream.h misc.h requesttypes.h
sessioncontainer.o: sessioncontainer.h session.h item.h confparser.h error.h
sessioncontainer.o: user.h plugindata.h rebus.h textstream.h cur.h request.h
sessioncontainer.o: requesttypes.h config.h htmlfilter.h
sessioncontainer.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
sessioncontainer.o: mount.h log.h logmanipulators.h slog.h
sessioncontainer.o: ../templates/locale.h ../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: 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: confparser.h error.h user.h plugindata.h rebus.h
sessionmanager.o: textstream.h cur.h request.h requesttypes.h config.h
sessionmanager.o: htmlfilter.h ../templates/htmltextstream.h
sessionmanager.o: ../core/textstream.h misc.h mount.h lastcontainer.h
sessionmanager.o: system.h dirs.h dircontainer.h ../db/db.h ../db/dbbase.h
sessionmanager.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
sessionmanager.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
sessionmanager.o: ../core/confparser.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: ../notify/notify.h ../notify/notifypool.h
sessionmanager.o: ../templates/patterns.h ../templates/locale.h
sessionmanager.o: ../templates/localefilter.h ../../ezc/src/ezc.h
@ -432,7 +437,7 @@ sessionmanager.o: ../functions/cp.h ../functions/default.h
sessionmanager.o: ../functions/download.h ../functions/emacs.h
sessionmanager.o: ../functions/last.h ../functions/login.h
sessionmanager.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h
sessionmanager.o: ../functions/mkdir.h ../functions/mv.h
sessionmanager.o: ../functions/meta.h ../functions/mkdir.h ../functions/mv.h
sessionmanager.o: ../functions/nicedit.h ../functions/node.h
sessionmanager.o: ../functions/passwd.h ../functions/priv.h
sessionmanager.o: ../functions/reload.h ../functions/rm.h ../functions/sort.h
@ -444,29 +449,29 @@ sessionmanager.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h
sessionmanager.o: ../templates/templates.h ../templates/patterncacher.h
sessionmanager.o: ../templates/indexpatterns.h ../templates/patterns.h
sessionmanager.o: ../templates/changepatterns.h ../core/sessionmanager.h
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: sessionparser.h session.h item.h confparser.h error.h user.h
sessionparser.o: plugindata.h rebus.h textstream.h sessioncontainer.h cur.h
sessionparser.o: request.h requesttypes.h config.h htmlfilter.h
sessionparser.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
sessionparser.o: mount.h users.h log.h logmanipulators.h slog.h
sessionparser.o: ../templates/locale.h ../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: slog.h cur.h request.h requesttypes.h item.h confparser.h error.h
slog.o: config.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: 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: requesttypes.h ../core/error.h ../db/dbitemquery.h ../core/item.h
system.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
system.o: system.h dirs.h item.h confparser.h dircontainer.h ../db/db.h
system.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
system.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h
system.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
system.o: ../core/confparser.h ../core/user.h ../core/group.h
system.o: ../core/dircontainer.h ../core/ugcontainer.h log.h textstream.h
system.o: logmanipulators.h slog.h cur.h request.h error.h config.h
system.o: 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/patterns.h ../templates/locale.h
system.o: ../templates/localefilter.h ../../ezc/src/ezc.h
system.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
system.o: htmlfilter.h ../templates/htmltextstream.h session.h user.h
system.o: plugindata.h rebus.h mount.h ../templates/locale.h
system.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
system.o: ../templates/locale.h ../templates/localefilter.h
system.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
system.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
system.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
system.o: ../notify/notifythread.h ../core/basethread.h synchro.h
@ -485,18 +490,18 @@ system.o: ../functions/privchanger.h ../functions/chown.h
system.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h
system.o: ../functions/download.h ../functions/emacs.h ../functions/last.h
system.o: ../functions/login.h ../functions/logout.h ../functions/ln.h
system.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
system.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
system.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
system.o: ../functions/sort.h ../functions/specialdefault.h
system.o: ../functions/ls.h ../functions/meta.h ../functions/mkdir.h
system.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h
system.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h
system.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h
system.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
system.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
system.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
system.o: plugin.h pluginmsg.h sessionmanager.h sessioncontainer.h
textstream.o: textstream.h misc.h item.h requesttypes.h
textstream.o: textstream.h misc.h item.h confparser.h requesttypes.h
threadmanager.o: threadmanager.h basethread.h synchro.h log.h textstream.h
threadmanager.o: logmanipulators.h slog.h cur.h request.h requesttypes.h
threadmanager.o: item.h error.h config.h confparser.h htmlfilter.h
threadmanager.o: item.h confparser.h error.h config.h htmlfilter.h
threadmanager.o: ../templates/htmltextstream.h ../core/textstream.h misc.h
threadmanager.o: session.h user.h plugindata.h rebus.h mount.h
threadmanager.o: ../templates/locale.h ../core/confparser.h

@ -406,7 +406,7 @@ bool Config::ListText(const std::wstring & name, std::vector<std::wstring> & lis
void Config::Print(std::wostream & out)
{
space.Print(out);
space.Serialize(out);
}

@ -345,58 +345,6 @@ return false;
void Space::PrintLevel(std::wostream & out, int level)
{
for(int i=0 ; i<level ; ++i)
out << ' ';
}
void Space::Print(std::wostream & out, int level)
{
PrintLevel(out, level);
out << "Space name: " << name << std::endl;
if( !table_single.empty() )
{
PrintLevel(out, level);
out << "table_single: " << std::endl;
TableSingle::iterator i1;
for(i1 = table_single.begin() ; i1 != table_single.end() ; ++i1)
{
PrintLevel(out, level);
out << i1->first << '=' << i1->second << std::endl;
}
}
if( !table.empty() )
{
PrintLevel(out, level);
out << "table: " << std::endl;
Table::iterator i2;
Value::iterator i3;
for(i2 = table.begin() ; i2 != table.end() ; ++i2)
{
PrintLevel(out, level);
out << i2->first << '=';
for(i3 = i2->second.begin() ; i3 != i2->second.end() ; ++i3)
out << *i3 << ',';
out << std::endl;
}
}
for(size_t i=0 ; i<spaces.size() ; ++i)
spaces[i]->Print(out, level+1);
}
/*
*
*
@ -872,6 +820,8 @@ bool ConfParser::ReadValueQuoted()
{
ReadChar(); // skipping the first quote
// !! dodac obsluge innych escapowanych znakow w szczegolnosci \0 (serializator Space juz tak zapisuje)
while( lastc != '"' && lastc != -1 )
{
if( use_escape_char && lastc == '\\' )

@ -236,7 +236,8 @@ public:
printing the content
(for debug purposes)
*/
void Print(std::wostream & out, int level = 0);
template<class Stream>
void Serialize(Stream & out, bool use_indents = false, bool use_comments = false, int level = 0) const;
private:
std::wstring tmp_name;
@ -248,12 +249,165 @@ private:
bool ToBool(const std::wstring & value);
wchar_t ToSmall(wchar_t c);
bool EqualNoCase(const wchar_t * str1, const wchar_t * str2);
void PrintLevel(std::wostream & out, int level);
template<class Stream>
void PrintLevel(Stream & out, bool use_indents, int level) const;
template<class Stream>
void SerializeTableSingle(Stream & out, bool use_indents, int level) const;
template<class Stream>
void SerializeTableMulti(Stream & out, bool use_indents, int level) const;
template<class Stream>
void PrintValue(Stream & out, const std::wstring & str) const;
};
template<class Stream>
void Space::PrintLevel(Stream & out, bool use_indents, int level) const
{
if( use_indents )
{
for(int i=0 ; i<level ; ++i)
out << ' ';
}
}
template<class Stream>
void Space::PrintValue(Stream & out, const std::wstring & str) const
{
out << '\"';
for(size_t i=0 ; i<str.size() ; ++i)
{
if( str[i] == '\\' )
out << L"\\\\";
else
if( str[i] == '"' )
out << L"\\\"";
else
if( str[i] == 0 )
out << L"\\0";
else
out << str[i];
}
out << '\"';
}
template<class Stream>
void Space::SerializeTableSingle(Stream & out, bool use_indents, int level) const
{
if( !table_single.empty() )
{
TableSingle::const_iterator i;
for(i = table_single.begin() ; i != table_single.end() ; ++i)
{
PrintLevel(out, use_indents, level);
out << i->first << L" = ";
PrintValue(out, i->second);
out << '\n';
}
}
}
template<class Stream>
void Space::SerializeTableMulti(Stream & out, bool use_indents, int level) const
{
Table::const_iterator i2;
size_t v;
if( !table.empty() )
{
for(i2 = table.begin() ; i2 != table.end() ; ++i2)
{
PrintLevel(out, use_indents, level);
out << i2->first << L" = ";
if( i2->second.size() != 1 )
out << '(';
for(v = 0 ; v < i2->second.size() ; ++v)
{
if( v > 0 )
PrintLevel(out, use_indents, level + i2->first.size() + 3);
PrintValue(out, i2->second[v]);
if( v + 1 < i2->second.size() )
out << '\n';
}
if( i2->second.size() != 1 )
out << ')';
out << '\n';
}
}
}
template<class Stream>
void Space::Serialize(Stream & out, bool use_indents, bool use_comments, int level) const
{
if( level > 0 )
{
out << '\n';
PrintLevel(out, use_indents, level);
if( !name.empty() )
out << name << ' ';
out << L"(\n";
if( use_comments )
{
PrintLevel(out, use_indents, level);
out << L"# space level " << level << '\n';
}
}
SerializeTableSingle(out, use_indents, level);
SerializeTableMulti(out, use_indents, level);
for(size_t i=0 ; i<spaces.size() ; ++i)
spaces[i]->Serialize(out, use_indents, use_comments, level+1);
if( level > 0 )
{
PrintLevel(out, use_indents, level);
out << ')';
if( use_comments )
{
if( name.empty() )
out << L" # end of unnamed space";
else
out << L" # end of space: " << name;
out << L" (level " << level << L")";
}
out << '\n';
}
}
class ConfParser
{
public:

@ -69,6 +69,7 @@ void Item::Clear()
html_template.clear();
sort_index = 0;
meta.Clear();
SetDateToNow();
}

@ -11,6 +11,7 @@
#define headerfile_winix_core_item
#include <string>
#include "confparser.h"
#define WINIX_ITEM_FILETYPE_NONE 0
@ -86,7 +87,6 @@ struct Item
size_t file_size; // size of the file
std::wstring html_template;
@ -94,6 +94,10 @@ struct Item
int sort_index;
// meta information
Space meta;
// methods
Item();
void SetDateToNow();

@ -132,6 +132,18 @@ return true;
}
bool Request::IsPostVar(const std::wstring & var)
{
PostTab::iterator p;
p = post_tab.find(var);
if( p == post_tab.end() )
return false;
return true;
}
const std::wstring & Request::PostVar(const wchar_t * var)
{
@ -144,6 +156,17 @@ return p->second;
}
const std::wstring & Request::PostVar(const std::wstring & var)
{
PostTab::iterator p = post_tab.find(var);
if( p == post_tab.end() )
return str_empty;
return p->second;
}
bool Request::PostVar(const wchar_t * var, std::wstring & result)
{
@ -161,6 +184,23 @@ return true;
}
bool Request::PostVar(const std::wstring & var, std::wstring & result)
{
PostTab::iterator p = post_tab.find(var);
if( p == post_tab.end() )
{
result.clear();
return false;
}
result = p->second;
return true;
}
std::wstring * Request::PostVarp(const wchar_t * var)
{
PostTab::iterator p = post_tab.find(var);

@ -140,15 +140,23 @@ struct Request
bool IsParam(const wchar_t * param_name);
bool IsParam(const std::wstring & param_name);
const std::wstring & ParamValue(const wchar_t * param_name); // returns empty string if there is no such a parameter
const std::wstring & ParamValue(const std::wstring & param_name); // returns empty string if there is no such a parameter
const std::wstring & ParamValue(const wchar_t * param_name); // returns an empty string if there is no such a parameter
const std::wstring & ParamValue(const std::wstring & param_name); // returns an empty string if there is no such a parameter
void SetCookie(const char * name, const char * value, tm * expires = 0);
void SetCookie(const char * name, long value, tm * expires = 0);
bool IsPostVar(const wchar_t * var);
const std::wstring & PostVar(const wchar_t * var); // !! zamienic na referencje nie do sta³ej (bez const)
bool IsPostVar(const std::wstring & var);
const std::wstring & PostVar(const wchar_t * var); // returns an empty string if there is no such a parameter
const std::wstring & PostVar(const std::wstring & var); // returns an empty string if there is no such a parameter
bool PostVar(const wchar_t * var, std::wstring & result);
bool PostVar(const std::wstring & var, std::wstring & result);
std::wstring * PostVarp(const wchar_t * var);
bool AllPostVarEmpty(); // returning true if all post vars are empty

@ -1,23 +1,27 @@
# 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/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 ../core/mount.h
db.o: ../templates/locale.h ../core/confparser.h ../core/log.h ../core/misc.h
db.o: ../core/misc.h ../core/item.h ../core/confparser.h
db.o: ../core/requesttypes.h ../core/error.h dbitemquery.h ../core/item.h
db.o: dbitemcolumns.h ../core/confparser.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/error.h ../core/config.h
db.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h
db.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
db.o: ../templates/locale.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/requesttypes.h
dbbase.o: ../core/error.h ../core/log.h ../core/misc.h ../../ezc/src/utf8.h
dbbase.o: ../core/misc.h ../core/item.h ../core/confparser.h
dbbase.o: ../core/requesttypes.h ../core/error.h ../core/log.h ../core/misc.h
dbbase.o: ../../ezc/src/utf8.h
dbconn.o: dbconn.h dbtextstream.h ../core/textstream.h ../core/misc.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/requesttypes.h ../core/error.h
dbconn.o: ../core/item.h ../core/confparser.h ../core/requesttypes.h
dbconn.o: ../core/log.h ../core/error.h
dbitemcolumns.o: dbitemcolumns.h ../core/item.h ../core/confparser.h dbbase.h
dbitemcolumns.o: dbconn.h dbtextstream.h ../core/textstream.h ../core/misc.h
dbitemcolumns.o: ../core/item.h ../core/confparser.h ../core/requesttypes.h
dbitemcolumns.o: ../core/error.h ../core/log.h
dbitemquery.o: dbitemquery.h ../core/item.h
dbtextstream.o: dbtextstream.h ../core/textstream.h ../core/misc.h
dbtextstream.o: ../core/item.h ../core/requesttypes.h ../../ezc/src/utf8.h
dbtextstream.o: ../core/item.h ../core/confparser.h ../core/requesttypes.h
dbtextstream.o: ../../ezc/src/utf8.h

@ -678,6 +678,7 @@ void Db::GetItemsQuerySelect(const DbItemQuery & iq, DbTextStream & query, bool
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");
if( iq.sel_meta ) query << R(", meta");
}
query << R(" from core.item");
@ -811,16 +812,18 @@ void Db::GetItems(std::vector<Item> & item_tab, const DbItemQuery & item_query)
r = GetItemsQuery(item_query);
AssertResult(r, PGRES_TUPLES_OK);
Item item;
get_item_temp.Clear();
int rows = Rows(r);
DbItemColumns col;
col.SetColumns(r);
if( rows > 0 && size_t(rows) > item_tab.capacity() )
item_tab.reserve(rows);
item_cols.SetColumns(r);
for(int i = 0 ; i<rows ; ++i)
for(int i=0 ; i<rows ; ++i)
{
col.SetItem(r, i, item);
item_tab.push_back(item);
item_tab.push_back(get_item_temp);
item_cols.SetItem(r, i, item_tab.back());
}
}
catch(const Error &)
@ -874,9 +877,8 @@ Error Db::GetItem(Item & item, const DbItemQuery & item_query)
if( rows == 1 )
{
DbItemColumns col;
col.SetColumns(r);
col.SetItem(r, 0, item);
item_cols.SetColumns(r);
item_cols.SetItem(r, 0, item);
}
else
if( rows == 0 )
@ -957,9 +959,8 @@ Error Db::GetItem(long parent_id, const std::wstring & url, Item & item)
if( Rows(r) == 0 )
throw Error(WINIX_ERR_NO_ITEM);
DbItemColumns col;
col.SetColumns(r);
col.SetItem(r, 0, item);
item_cols.SetColumns(r);
item_cols.SetItem(r, 0, item);
}
catch(const Error & e)
{
@ -991,9 +992,8 @@ Error Db::GetItemById(long item_id, Item & item)
if( Rows(r) == 0 )
throw Error(WINIX_ERR_NO_ITEM);
DbItemColumns col;
col.SetColumns(r);
col.SetItem(r, 0, item);
item_cols.SetColumns(r);
item_cols.SetItem(r, 0, item);
}
catch(const Error & e)
{
@ -1076,9 +1076,8 @@ bool result = false;
if( Rows(r) != 1 )
throw Error();
DbItemColumns col;
col.SetColumns(r);
col.SetItem(r, 0, item);
item_cols.SetColumns(r);
item_cols.SetItem(r, 0, item);
result = true;
}
@ -1238,6 +1237,23 @@ return EndTrans(result);
Error Db::EditMetaById(const Space & meta, long id)
{
meta_stream.Clear();
meta.Serialize(meta_stream);
query.Clear();
query << R("update core.item set (meta) = (")
<< meta_stream.Str()
<< R(") where id=")
<< id
<< R(";");
meta_stream.Clear();
return DoCommand(query);
}
@ -1466,13 +1482,11 @@ void Db::GetDirs(DirContainer & dir_tab)
dir_temp.Clear();
int rows = Rows(r);
item_cols.SetColumns(r);
DbItemColumns col;
col.SetColumns(r);
for(int i = 0 ; i<rows ; ++i)
for(int i=0 ; i<rows ; ++i)
{
col.SetItem(r, i, dir_temp);
item_cols.SetItem(r, i, dir_temp);
dir_tab.PushBack(dir_temp);
}
}

@ -57,10 +57,11 @@ public:
Error GetItem(Item & item, const DbItemQuery & item_query);
bool GetPriv(Item & item, long id);
Error EditPrivById(Item & item, long id);
Error EditPrivById(Item & item, long id); // !! dlaczego tu nie ma const?
Error EditParentUrlById(Item & item, long id);
Error EditFileById(const Item & item, long id); // file_path, file_fs, file_type
Error EditHasThumbById(bool has_thumb, long id);
Error EditMetaById(const Space & meta, long id);
Error DelDirById(long id);
Error DelFileById(long file_id);
@ -96,7 +97,11 @@ protected:
DbTextStream query, query_create_url;
std::wstring temp_url;
Item dir_temp;
Item get_item_temp;
std::wstring iq_id_list;
DbItemColumns item_cols;
TextStream<std::wstring> meta_stream;
bool AddItemCreateUrlSubject(Item & item);

@ -9,6 +9,7 @@
#include "dbitemcolumns.h"
#include "dbbase.h"
#include "core/log.h"
@ -43,6 +44,28 @@ void DbItemColumns::SetColumns(PGresult * r)
ref = PQfnumber(r, "ref");
modify_index = PQfnumber(r, "modify_index");
sort_index = PQfnumber(r, "sort_index");
meta = PQfnumber(r, "meta");
}
void DbItemColumns::SetMeta(PGresult * r, long row, Item & item)
{
DbBase::AssertValueWide(r, row, meta, meta_str);
item.meta.Clear();
conf_parser.SetSpace(item.meta);
conf_parser.UTF8(true); // from the db we always have UTF-8 string
conf_parser.SplitSingle(true);
if( conf_parser.ParseString(meta_str) != ConfParser::ok )
{
log << log1 << "Db: syntax error when parsing meta information for"
<< " item id: " << item.id
<< ", url: " << item.url
<< ", line: " << conf_parser.line << logend;
}
meta_str.clear();
}
@ -79,6 +102,8 @@ void DbItemColumns::SetItem(PGresult * r, long row, Item & item)
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);
if( meta != -1 ) SetMeta(r, row, item);
}

@ -13,6 +13,7 @@
#include <libpq-fe.h>
#include "core/item.h"
#include "core/confparser.h"
@ -47,9 +48,22 @@ struct DbItemColumns
int ref;
int modify_index;
int sort_index;
int meta;
void SetColumns(PGresult * r);
void SetItem(PGresult * r, long row, Item & item);
private:
// for parsing meta information
ConfParser conf_parser;
// meta string
std::wstring meta_str;
void SetMeta(PGresult * r, long row, Item & item);
};

@ -57,6 +57,7 @@ void DbItemQuery::SetAllSel(bool sel)
sel_file = sel;
sel_html_template = sel;
sel_sort_index = sel;
sel_meta = sel;
}

@ -33,6 +33,7 @@ struct DbItemQuery
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 sel_meta; // meta Space
bool where_id; //
bool where_parent_id; //

File diff suppressed because it is too large Load Diff

@ -1 +1 @@
o = adduser.o cat.o chmod.o chown.o ckeditor.o cp.o default.o download.o emacs.o functionbase.o functionparser.o functions.o last.o ln.o login.o logout.o ls.o mkdir.o mount.o mv.o nicedit.o node.o passwd.o priv.o privchanger.o reload.o rm.o run.o sort.o specialdefault.o stat.o subject.o template.o tinymce.o uname.o upload.o uptime.o vim.o who.o
o = adduser.o cat.o chmod.o chown.o ckeditor.o cp.o default.o download.o emacs.o functionbase.o functionparser.o functions.o last.o ln.o login.o logout.o ls.o meta.o mkdir.o mount.o mv.o nicedit.o node.o passwd.o priv.o privchanger.o reload.o rm.o run.o sort.o specialdefault.o stat.o subject.o template.o tinymce.o uname.o upload.o uptime.o vim.o who.o

@ -185,6 +185,7 @@ void Functions::CreateFunctions()
Add(fun_logout);
Add(fun_ln);
Add(fun_ls);
Add(fun_meta);
Add(fun_mkdir);
Add(fun_mount);
Add(fun_mv);