tomasz.sowa
/
winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

added: Patterns class (in templates) 

ezc patterns are managed by this class
added: some work in groupitem plugin (not finished yet)
changed: ConfParser can read a string from memory now
         (need some testing yet)



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@757 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa 2011-08-25 23:53:49 +00:00
parent ee6500ac65
commit 5b8a9c0108
46 changed files with 2896 additions and 1715 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

292
core/Makefile.dep
View File

@ -10,16 +10,16 @@ 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: 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: ../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 ../core/confparser.h ../notify/notify.h
app.o: ../notify/notifypool.h ../templates/misc.h ../templates/localefilter.h app.o: ../notify/notifypool.h ../templates/patterns.h ../templates/locale.h
app.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h app.o: ../templates/localefilter.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
app.o: ../../ezc/src/generator.h ../../ezc/src/pattern.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/functions.h ../../ezc/src/funinfo.h
app.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h app.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
app.o: ../notify/notifythread.h ../core/basethread.h synchro.h app.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h
app.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h app.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h
app.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h app.o: ../templates/misc.h ../templates/htmltextstream.h mounts.h
app.o: users.h groups.h group.h loadavg.h thumb.h basethread.h app.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h thumb.h
app.o: threadmanager.h sessionmanager.h sessioncontainer.h app.o: basethread.h threadmanager.h sessionmanager.h sessioncontainer.h
app.o: ../functions/functions.h ../functions/functionbase.h ../core/request.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/system.h ../core/synchro.h ../functions/functionparser.h
app.o: ../core/cur.h ../functions/adduser.h ../functions/cat.h app.o: ../core/cur.h ../functions/adduser.h ../functions/cat.h
@ -35,7 +35,8 @@ 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/uname.h ../functions/upload.h ../functions/uptime.h
app.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h app.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h
app.o: ../templates/templates.h ../templates/patterncacher.h app.o: ../templates/templates.h ../templates/patterncacher.h
app.o: ../templates/indexpatterns.h ../core/sessionmanager.h compress.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: postparser.h httpsimpleparser.h cookieparser.h postmultiparser.h
app.o: acceptencodingparser.h acceptbaseparser.h plugin.h pluginmsg.h app.o: acceptencodingparser.h acceptbaseparser.h plugin.h pluginmsg.h
basethread.o: basethread.h basethread.o: basethread.h
@ -54,33 +55,34 @@ config.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
config.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h config.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
config.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h config.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
config.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h config.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
config.o: ../notify/notifypool.h ../templates/misc.h config.o: ../notify/notifypool.h ../templates/patterns.h
config.o: ../templates/localefilter.h ../templates/locale.h config.o: ../templates/locale.h ../templates/localefilter.h
config.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h config.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
config.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h config.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
config.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h config.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
config.o: ../templates/htmltextstream.h ../notify/notifythread.h config.o: ../notify/notifythread.h ../core/basethread.h synchro.h
config.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h config.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
config.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h config.o: ugcontainer.h lastcontainer.h ../templates/misc.h
config.o: mounts.h mountparser.h crypt.h run.h users.h groups.h group.h config.o: ../templates/htmltextstream.h mounts.h mountparser.h crypt.h run.h
config.o: loadavg.h thumb.h basethread.h threadmanager.h sessionmanager.h config.o: users.h groups.h group.h loadavg.h thumb.h basethread.h
config.o: sessioncontainer.h ../functions/functions.h config.o: threadmanager.h sessionmanager.h sessioncontainer.h
config.o: ../functions/functionbase.h ../core/request.h ../core/system.h config.o: ../functions/functions.h ../functions/functionbase.h
config.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h config.o: ../core/request.h ../core/system.h ../core/synchro.h
config.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h config.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h
config.o: ../functions/privchanger.h ../functions/chown.h config.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
config.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h config.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
config.o: ../functions/download.h ../functions/emacs.h ../functions/last.h config.o: ../functions/default.h ../functions/download.h ../functions/emacs.h
config.o: ../functions/login.h ../functions/logout.h ../functions/ln.h config.o: ../functions/last.h ../functions/login.h ../functions/logout.h
config.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h config.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h
config.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.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/passwd.h ../functions/priv.h ../functions/reload.h
config.o: ../functions/sort.h ../functions/specialdefault.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/stat.h ../functions/subject.h ../functions/template.h
config.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.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: ../functions/uptime.h ../functions/who.h ../functions/vim.h
config.o: ../core/htmlfilter.h ../templates/templates.h config.o: ../core/htmlfilter.h ../templates/templates.h
config.o: ../templates/patterncacher.h ../templates/indexpatterns.h config.o: ../templates/patterncacher.h ../templates/indexpatterns.h
config.o: ../templates/patterns.h ../templates/changepatterns.h
config.o: ../core/sessionmanager.h config.o: ../core/sessionmanager.h
confparser.o: confparser.h misc.h item.h requesttypes.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: crypt.h run.h config.h confparser.h htmlfilter.h user.h
@ -103,13 +105,14 @@ 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: confparser.h htmlfilter.h ../templates/htmltextstream.h session.h
dirs.o: user.h plugindata.h rebus.h mount.h ../templates/locale.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: ../core/confparser.h ../notify/notify.h ../notify/notifypool.h
dirs.o: ../templates/misc.h ../templates/localefilter.h ../templates/locale.h dirs.o: ../templates/patterns.h ../templates/locale.h
dirs.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h dirs.o: ../templates/localefilter.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
dirs.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h dirs.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
dirs.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h dirs.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
dirs.o: ../templates/htmltextstream.h ../notify/notifythread.h dirs.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
dirs.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h dirs.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h
dirs.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h 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: 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: ../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: item.h requesttypes.h ../core/error.h ../db/dbitemquery.h
@ -147,13 +150,14 @@ misc.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
misc.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h misc.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
misc.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h misc.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
misc.o: ../templates/patterncacher.h ../core/item.h misc.o: ../templates/patterncacher.h ../core/item.h
misc.o: ../templates/indexpatterns.h ../templates/localefilter.h misc.o: ../templates/indexpatterns.h ../templates/patterns.h
misc.o: ../templates/locale.h ../core/config.h ../templates/htmltextstream.h misc.o: ../templates/locale.h ../templates/changepatterns.h
misc.o: ../core/cur.h ../core/system.h ../core/sessionmanager.h misc.o: ../templates/htmltextstream.h ../templates/localefilter.h
misc.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h misc.o: ../core/config.h ../core/cur.h ../core/system.h
misc.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h misc.o: ../core/sessionmanager.h ../core/htmlfilter.h ../db/db.h
misc.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h misc.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
misc.o: ../core/dircontainer.h ../core/ugcontainer.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 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: 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: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
@ -165,14 +169,15 @@ 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: htmlfilter.h ../templates/htmltextstream.h session.h user.h
mountparser.o: plugindata.h rebus.h ../templates/locale.h mountparser.o: plugindata.h rebus.h ../templates/locale.h
mountparser.o: ../core/confparser.h ../notify/notify.h ../notify/notifypool.h mountparser.o: ../core/confparser.h ../notify/notify.h ../notify/notifypool.h
mountparser.o: ../templates/misc.h ../templates/localefilter.h mountparser.o: ../templates/patterns.h ../templates/locale.h
mountparser.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h mountparser.o: ../templates/localefilter.h ../../ezc/src/ezc.h
mountparser.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h mountparser.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
mountparser.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h mountparser.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
mountparser.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h mountparser.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
mountparser.o: ../notify/notifythread.h ../core/basethread.h synchro.h mountparser.o: ../notify/notifythread.h ../core/basethread.h synchro.h
mountparser.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h mountparser.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
mountparser.o: ugcontainer.h lastcontainer.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: 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: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
mounts.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h mounts.o: ../core/textstream.h misc.h requesttypes.h ../core/error.h
@ -182,33 +187,34 @@ 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: 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/htmltextstream.h session.h user.h plugindata.h rebus.h
mounts.o: ../templates/locale.h ../core/confparser.h ../notify/notify.h mounts.o: ../templates/locale.h ../core/confparser.h ../notify/notify.h
mounts.o: ../notify/notifypool.h ../templates/misc.h mounts.o: ../notify/notifypool.h ../templates/patterns.h
mounts.o: ../templates/localefilter.h ../templates/locale.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: ../../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/pattern.h ../../ezc/src/functions.h
mounts.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h mounts.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
mounts.o: ../templates/htmltextstream.h ../notify/notifythread.h mounts.o: ../notify/notifythread.h ../core/basethread.h synchro.h
mounts.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h mounts.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
mounts.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h mounts.o: ugcontainer.h lastcontainer.h ../templates/misc.h
mounts.o: mountparser.h plugin.h pluginmsg.h system.h crypt.h run.h users.h mounts.o: ../templates/htmltextstream.h mountparser.h plugin.h pluginmsg.h
mounts.o: groups.h group.h loadavg.h thumb.h basethread.h threadmanager.h mounts.o: system.h crypt.h run.h users.h groups.h group.h loadavg.h thumb.h
mounts.o: sessionmanager.h sessioncontainer.h ../functions/functions.h mounts.o: basethread.h threadmanager.h sessionmanager.h sessioncontainer.h
mounts.o: ../functions/functionbase.h ../core/request.h ../core/system.h mounts.o: ../functions/functions.h ../functions/functionbase.h
mounts.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h mounts.o: ../core/request.h ../core/system.h ../core/synchro.h
mounts.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h mounts.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h
mounts.o: ../functions/privchanger.h ../functions/chown.h mounts.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
mounts.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h mounts.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
mounts.o: ../functions/download.h ../functions/emacs.h ../functions/last.h mounts.o: ../functions/default.h ../functions/download.h ../functions/emacs.h
mounts.o: ../functions/login.h ../functions/logout.h ../functions/ln.h mounts.o: ../functions/last.h ../functions/login.h ../functions/logout.h
mounts.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h mounts.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h
mounts.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.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: ../functions/passwd.h ../functions/priv.h ../functions/reload.h
mounts.o: ../functions/sort.h ../functions/specialdefault.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/stat.h ../functions/subject.h ../functions/template.h
mounts.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.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: ../functions/uptime.h ../functions/who.h ../functions/vim.h
mounts.o: ../core/htmlfilter.h ../templates/templates.h mounts.o: ../core/htmlfilter.h ../templates/templates.h
mounts.o: ../templates/patterncacher.h ../templates/indexpatterns.h mounts.o: ../templates/patterncacher.h ../templates/indexpatterns.h
mounts.o: ../templates/patterns.h ../templates/changepatterns.h
mounts.o: ../core/sessionmanager.h mounts.o: ../core/sessionmanager.h
plugin.o: plugin.h pluginmsg.h log.h textstream.h logmanipulators.h slog.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 error.h config.h confparser.h
@ -219,33 +225,34 @@ 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: ../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/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
plugin.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h plugin.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
plugin.o: ../notify/notifypool.h ../templates/misc.h plugin.o: ../notify/notifypool.h ../templates/patterns.h
plugin.o: ../templates/localefilter.h ../templates/locale.h plugin.o: ../templates/locale.h ../templates/localefilter.h
plugin.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.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/pattern.h ../../ezc/src/functions.h
plugin.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h plugin.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
plugin.o: ../templates/htmltextstream.h ../notify/notifythread.h plugin.o: ../notify/notifythread.h ../core/basethread.h synchro.h
plugin.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h plugin.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
plugin.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h plugin.o: ugcontainer.h lastcontainer.h ../templates/misc.h
plugin.o: mounts.h mountparser.h crypt.h run.h users.h groups.h group.h plugin.o: ../templates/htmltextstream.h mounts.h mountparser.h crypt.h run.h
plugin.o: loadavg.h thumb.h basethread.h threadmanager.h sessionmanager.h plugin.o: users.h groups.h group.h loadavg.h thumb.h basethread.h
plugin.o: sessioncontainer.h ../functions/functions.h plugin.o: threadmanager.h sessionmanager.h sessioncontainer.h
plugin.o: ../functions/functionbase.h ../core/request.h ../core/system.h plugin.o: ../functions/functions.h ../functions/functionbase.h
plugin.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h plugin.o: ../core/request.h ../core/system.h ../core/synchro.h
plugin.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h plugin.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h
plugin.o: ../functions/privchanger.h ../functions/chown.h plugin.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
plugin.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h plugin.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
plugin.o: ../functions/download.h ../functions/emacs.h ../functions/last.h plugin.o: ../functions/default.h ../functions/download.h ../functions/emacs.h
plugin.o: ../functions/login.h ../functions/logout.h ../functions/ln.h plugin.o: ../functions/last.h ../functions/login.h ../functions/logout.h
plugin.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h plugin.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h
plugin.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h plugin.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h
plugin.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h plugin.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h
plugin.o: ../functions/sort.h ../functions/specialdefault.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/stat.h ../functions/subject.h ../functions/template.h
plugin.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.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: ../functions/uptime.h ../functions/who.h ../functions/vim.h
plugin.o: ../core/htmlfilter.h ../templates/templates.h plugin.o: ../core/htmlfilter.h ../templates/templates.h
plugin.o: ../templates/patterncacher.h ../templates/indexpatterns.h plugin.o: ../templates/patterncacher.h ../templates/indexpatterns.h
plugin.o: ../templates/patterns.h ../templates/changepatterns.h
plugin.o: ../core/sessionmanager.h plugin.o: ../core/sessionmanager.h
plugindata.o: plugindata.h plugin.h pluginmsg.h log.h textstream.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: logmanipulators.h slog.h cur.h request.h requesttypes.h item.h
@ -257,20 +264,20 @@ plugindata.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
plugindata.o: ../core/error.h ../db/dbitemquery.h ../core/item.h plugindata.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
plugindata.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h plugindata.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
plugindata.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h plugindata.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h
plugindata.o: ../notify/notifypool.h ../templates/misc.h plugindata.o: ../notify/notifypool.h ../templates/patterns.h
plugindata.o: ../templates/localefilter.h ../templates/locale.h plugindata.o: ../templates/locale.h ../templates/localefilter.h
plugindata.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h plugindata.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h
plugindata.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h plugindata.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
plugindata.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h plugindata.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
plugindata.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h plugindata.o: ../../ezc/src/stringconv.h ../notify/notifythread.h
plugindata.o: ../notify/notifythread.h ../core/basethread.h synchro.h plugindata.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h
plugindata.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h plugindata.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h
plugindata.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h plugindata.o: ../templates/misc.h ../templates/htmltextstream.h mounts.h
plugindata.o: run.h users.h groups.h group.h loadavg.h thumb.h basethread.h plugindata.o: mountparser.h crypt.h run.h users.h groups.h group.h loadavg.h
plugindata.o: threadmanager.h sessionmanager.h sessioncontainer.h plugindata.o: thumb.h basethread.h threadmanager.h sessionmanager.h
plugindata.o: ../functions/functions.h ../functions/functionbase.h plugindata.o: sessioncontainer.h ../functions/functions.h
plugindata.o: ../core/request.h ../core/system.h ../core/synchro.h plugindata.o: ../functions/functionbase.h ../core/request.h ../core/system.h
plugindata.o: ../functions/functionparser.h ../core/cur.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/adduser.h ../functions/cat.h ../functions/chmod.h
plugindata.o: ../functions/privchanger.h ../functions/chown.h plugindata.o: ../functions/privchanger.h ../functions/chown.h
plugindata.o: ../functions/ckeditor.h ../functions/cp.h plugindata.o: ../functions/ckeditor.h ../functions/cp.h
@ -286,7 +293,8 @@ plugindata.o: ../functions/tinymce.h ../functions/uname.h
plugindata.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h plugindata.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h
plugindata.o: ../functions/vim.h ../core/htmlfilter.h plugindata.o: ../functions/vim.h ../core/htmlfilter.h
plugindata.o: ../templates/templates.h ../templates/patterncacher.h plugindata.o: ../templates/templates.h ../templates/patterncacher.h
plugindata.o: ../templates/indexpatterns.h ../core/sessionmanager.h plugindata.o: ../templates/indexpatterns.h ../templates/patterns.h
plugindata.o: ../templates/changepatterns.h ../core/sessionmanager.h
postmultiparser.o: postmultiparser.h error.h requesttypes.h config.h postmultiparser.o: postmultiparser.h error.h requesttypes.h config.h
postmultiparser.o: confparser.h htmlfilter.h misc.h item.h log.h textstream.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: logmanipulators.h slog.h cur.h request.h
@ -309,14 +317,15 @@ request.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
request.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.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/user.h ../core/group.h ../core/dircontainer.h
request.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h request.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h
request.o: ../templates/misc.h ../templates/localefilter.h request.o: ../templates/patterns.h ../templates/locale.h
request.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h request.o: ../templates/localefilter.h ../../ezc/src/ezc.h
request.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h request.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
request.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h request.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
request.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h request.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
request.o: ../notify/notifythread.h ../core/basethread.h synchro.h request.o: ../notify/notifythread.h ../core/basethread.h synchro.h
request.o: ../notify/templatesnotify.h ../core/config.h ../core/users.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: ugcontainer.h lastcontainer.h ../templates/misc.h
request.o: ../templates/htmltextstream.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: users.h groups.h group.h loadavg.h thumb.h basethread.h
request.o: threadmanager.h sessionmanager.h sessioncontainer.h request.o: threadmanager.h sessionmanager.h sessioncontainer.h
request.o: ../functions/functions.h ../functions/functionbase.h request.o: ../functions/functions.h ../functions/functionbase.h
@ -336,6 +345,7 @@ request.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
request.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h request.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
request.o: ../core/htmlfilter.h ../templates/templates.h request.o: ../core/htmlfilter.h ../templates/templates.h
request.o: ../templates/patterncacher.h ../templates/indexpatterns.h request.o: ../templates/patterncacher.h ../templates/indexpatterns.h
request.o: ../templates/patterns.h ../templates/changepatterns.h
request.o: ../core/sessionmanager.h request.o: ../core/sessionmanager.h
run.o: run.h log.h textstream.h logmanipulators.h slog.h cur.h request.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 error.h config.h confparser.h htmlfilter.h
@ -362,19 +372,20 @@ sessionmanager.o: ../core/group.h ../core/dircontainer.h
sessionmanager.o: ../core/ugcontainer.h log.h logmanipulators.h slog.h sessionmanager.o: ../core/ugcontainer.h log.h logmanipulators.h slog.h
sessionmanager.o: ../templates/locale.h ../core/confparser.h sessionmanager.o: ../templates/locale.h ../core/confparser.h
sessionmanager.o: ../notify/notify.h ../notify/notifypool.h sessionmanager.o: ../notify/notify.h ../notify/notifypool.h
sessionmanager.o: ../templates/misc.h ../templates/localefilter.h sessionmanager.o: ../templates/patterns.h ../templates/locale.h
sessionmanager.o: ../templates/locale.h ../../ezc/src/ezc.h sessionmanager.o: ../templates/localefilter.h ../../ezc/src/ezc.h
sessionmanager.o: ../../ezc/src/utf8.h ../../ezc/src/generator.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/pattern.h ../../ezc/src/functions.h
sessionmanager.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h sessionmanager.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
sessionmanager.o: ../templates/htmltextstream.h ../notify/notifythread.h sessionmanager.o: ../notify/notifythread.h ../core/basethread.h synchro.h
sessionmanager.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h sessionmanager.o: ../notify/templatesnotify.h ../core/config.h
sessionmanager.o: ../core/config.h ../core/users.h ugcontainer.h mounts.h sessionmanager.o: ../core/users.h ugcontainer.h ../templates/misc.h
sessionmanager.o: mountparser.h crypt.h run.h users.h groups.h group.h sessionmanager.o: ../templates/htmltextstream.h mounts.h mountparser.h
sessionmanager.o: loadavg.h thumb.h basethread.h threadmanager.h sessionmanager.o: crypt.h run.h users.h groups.h group.h loadavg.h thumb.h
sessionmanager.o: sessionparser.h plugin.h pluginmsg.h sessionmanager.o: basethread.h threadmanager.h sessionparser.h plugin.h
sessionmanager.o: ../functions/functions.h ../functions/functionbase.h sessionmanager.o: pluginmsg.h ../functions/functions.h
sessionmanager.o: ../core/request.h ../core/system.h ../core/synchro.h sessionmanager.o: ../functions/functionbase.h ../core/request.h
sessionmanager.o: ../core/system.h ../core/synchro.h
sessionmanager.o: ../functions/functionparser.h ../core/cur.h sessionmanager.o: ../functions/functionparser.h ../core/cur.h
sessionmanager.o: ../functions/adduser.h ../functions/cat.h sessionmanager.o: ../functions/adduser.h ../functions/cat.h
sessionmanager.o: ../functions/chmod.h ../functions/privchanger.h sessionmanager.o: ../functions/chmod.h ../functions/privchanger.h
@ -393,7 +404,8 @@ sessionmanager.o: ../functions/tinymce.h ../functions/uname.h
sessionmanager.o: ../functions/upload.h ../functions/uptime.h sessionmanager.o: ../functions/upload.h ../functions/uptime.h
sessionmanager.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h sessionmanager.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h
sessionmanager.o: ../templates/templates.h ../templates/patterncacher.h sessionmanager.o: ../templates/templates.h ../templates/patterncacher.h
sessionmanager.o: ../templates/indexpatterns.h ../core/sessionmanager.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: 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: rebus.h textstream.h sessioncontainer.h cur.h request.h
sessionparser.o: requesttypes.h config.h confparser.h htmlfilter.h sessionparser.o: requesttypes.h config.h confparser.h htmlfilter.h
@ -414,31 +426,32 @@ 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: confparser.h htmlfilter.h ../templates/htmltextstream.h session.h
system.o: user.h plugindata.h rebus.h mount.h ../templates/locale.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: ../core/confparser.h ../notify/notify.h ../notify/notifypool.h
system.o: ../templates/misc.h ../templates/localefilter.h system.o: ../templates/patterns.h ../templates/locale.h
system.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h system.o: ../templates/localefilter.h ../../ezc/src/ezc.h
system.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h system.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
system.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h system.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
system.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h system.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
system.o: ../notify/notifythread.h ../core/basethread.h synchro.h system.o: ../notify/notifythread.h ../core/basethread.h synchro.h
system.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h system.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
system.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h system.o: ugcontainer.h lastcontainer.h ../templates/misc.h
system.o: ../templates/htmltextstream.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: users.h groups.h group.h loadavg.h thumb.h basethread.h
system.o: threadmanager.h ../templates/templates.h system.o: threadmanager.h ../templates/templates.h
system.o: ../templates/patterncacher.h ../templates/indexpatterns.h system.o: ../templates/patterncacher.h ../templates/indexpatterns.h
system.o: ../core/cur.h ../core/system.h ../core/sessionmanager.h system.o: ../templates/patterns.h ../templates/changepatterns.h ../core/cur.h
system.o: ../core/htmlfilter.h ../functions/functionbase.h ../core/request.h system.o: ../core/system.h ../core/sessionmanager.h ../core/htmlfilter.h
system.o: ../core/synchro.h plugin.h pluginmsg.h sessionmanager.h system.o: ../functions/functionbase.h ../core/request.h ../core/synchro.h
system.o: sessioncontainer.h ../functions/functions.h system.o: plugin.h pluginmsg.h sessionmanager.h sessioncontainer.h
system.o: ../functions/functionbase.h ../functions/functionparser.h system.o: ../functions/functions.h ../functions/functionbase.h
system.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h system.o: ../functions/functionparser.h ../functions/adduser.h
system.o: ../functions/privchanger.h ../functions/chown.h system.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
system.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h system.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
system.o: ../functions/download.h ../functions/emacs.h ../functions/last.h system.o: ../functions/default.h ../functions/download.h ../functions/emacs.h
system.o: ../functions/login.h ../functions/logout.h ../functions/ln.h system.o: ../functions/last.h ../functions/login.h ../functions/logout.h
system.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h system.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h
system.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h system.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h
system.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h system.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h
system.o: ../functions/sort.h ../functions/specialdefault.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/stat.h ../functions/subject.h ../functions/template.h
system.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.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: ../functions/uptime.h ../functions/who.h ../functions/vim.h
@ -458,13 +471,14 @@ 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: ../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: 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: ../../ezc/src/utf8.h system.h dirs.h dircontainer.h
thumb.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h thumb.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
thumb.o: ../templates/localefilter.h ../templates/locale.h thumb.o: ../templates/locale.h ../templates/localefilter.h
thumb.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h thumb.o: ../../ezc/src/ezc.h ../../ezc/src/generator.h
thumb.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h thumb.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
thumb.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h thumb.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
thumb.o: ../templates/htmltextstream.h ../notify/notifythread.h thumb.o: ../notify/notifythread.h ../core/basethread.h synchro.h
thumb.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h thumb.o: ../notify/templatesnotify.h ../core/users.h ugcontainer.h
thumb.o: ../core/users.h ugcontainer.h lastcontainer.h mounts.h mountparser.h thumb.o: lastcontainer.h ../templates/misc.h ../templates/htmltextstream.h
thumb.o: crypt.h run.h users.h groups.h group.h loadavg.h threadmanager.h thumb.o: mounts.h mountparser.h crypt.h run.h users.h groups.h group.h
thumb.o: loadavg.h threadmanager.h
users.o: users.h users.o: users.h

126
core/confparser.cpp
View File

@ -60,6 +60,7 @@ void ConfParser::UseEscapeChar(bool escape)
ConfParser::Status ConfParser::Parse(const char * file_name) ConfParser::Status ConfParser::Parse(const char * file_name)
{ {
reading_from_file = true;
line = 1; line = 1;
table.clear(); table.clear();
table_single.clear(); table_single.clear();
@ -105,6 +106,49 @@ ConfParser::Status ConfParser::Parse(const std::wstring & file_name)
ConfParser::Status ConfParser::ParseString(const char * str)
{
reading_from_file = false;
reading_from_wchar_string = false;
line = 1;
table.clear();
table_single.clear();
pchar_ascii = str;
pchar_unicode = 0;
status = ParseFile();
return status;
}
ConfParser::Status ConfParser::ParseString(const std::string & str)
{
return ParseString(str.c_str());
}
ConfParser::Status ConfParser::ParseString(const wchar_t * str)
{
reading_from_file = false;
reading_from_wchar_string = true;
line = 1;
table.clear();
table_single.clear();
pchar_ascii = 0;
pchar_unicode = str;
status = ParseFile();
return status;
}
ConfParser::Status ConfParser::ParseString(const std::wstring & str)
{
return ParseString(str.c_str());
}
ConfParser::Status ConfParser::ParseFile() ConfParser::Status ConfParser::ParseFile()
{ {
@ -363,12 +407,86 @@ return lastc;
} }
int ConfParser::ReadCharFromWcharString()
{
if( *pchar_unicode == 0 )
lastc = -1;
else
lastc = *(pchar_unicode++);
if( lastc == '\n' )
++line;
return lastc;
}
int ConfParser::ReadCharFromUTF8String()
{
int c;
bool correct;
lastc = -1;
do
{
size_t len = Ezc::UTF8ToInt(pchar_ascii, c, correct);
pchar_ascii += len;
if( *pchar_ascii == 0 )
return lastc;
}
while( !correct );
lastc = c;
if( lastc == '\n' )
++line;
return lastc;
}
int ConfParser::ReadCharFromAsciiString()
{
if( *pchar_ascii == 0 )
lastc = -1;
else
lastc = *(pchar_ascii++);
if( lastc == '\n' )
++line;
return lastc;
}
int ConfParser::ReadChar() int ConfParser::ReadChar()
{ {
if( input_as_utf8 ) if( reading_from_file )
return ReadUTF8Char(); {
if( input_as_utf8 )
return ReadASCIIChar(); return ReadUTF8Char();
else
return ReadASCIIChar();
}
else
{
if( reading_from_wchar_string )
{
return ReadCharFromWcharString();
}
else
{
if( input_as_utf8 )
return ReadCharFromUTF8String();
else
return ReadCharFromAsciiString();
}
}
} }

35
core/confparser.h
View File

@ -154,6 +154,18 @@ public:
Status Parse(const wchar_t * file_name); Status Parse(const wchar_t * file_name);
Status Parse(const std::wstring & file_name); Status Parse(const std::wstring & file_name);
/*
the main methods used to parse
str - input string (either 8bit ascii or UTF-8)
*/
Status ParseString(const char * str);
Status ParseString(const std::string & str);
// here input string is always in unicode
Status ParseString(const wchar_t * str);
Status ParseString(const std::wstring & str);
/* /*
a number of a line in which there is a syntax_error a number of a line in which there is a syntax_error
@ -276,6 +288,26 @@ public:
private: private:
/*
true if Parse() method was called
false if ParseString() was called
*/
bool reading_from_file;
/*
pointers to the current character
if ParseString() is in used
*/
const char * pchar_ascii;
const wchar_t * pchar_unicode;
/*
true if ParseString(wchar_t *) or ParseString(std::wstring&) is used
*/
bool reading_from_wchar_string;
/* /*
last read variable (option) last read variable (option)
*/ */
@ -392,6 +424,9 @@ private:
int ReadUTF8Char(); int ReadUTF8Char();
int ReadASCIIChar(); int ReadASCIIChar();
int ReadCharFromWcharString();
int ReadCharFromUTF8String();
int ReadCharFromAsciiString();
int ReadChar(); int ReadChar();
bool IsWhite(int c); bool IsWhite(int c);
bool IsVariableChar(int c); bool IsVariableChar(int c);

1
core/mounts.cpp
View File

@ -56,6 +56,7 @@ void Mounts::CreateMountPar()
mount_par_mkdir_on = AddMountPar(L"mkdir_on"); mount_par_mkdir_on = AddMountPar(L"mkdir_on");
mount_par_app = AddMountPar(L"app"); mount_par_app = AddMountPar(L"app");
mount_par_html_template = AddMountPar(L"html_template"); mount_par_html_template = AddMountPar(L"html_template");
mount_par_change_template = AddMountPar(L"change_template");
mount_par_static = AddMountPar(L"static"); mount_par_static = AddMountPar(L"static");
mount_par_css = AddMountPar(L"css"); mount_par_css = AddMountPar(L"css");
} }

2
core/mounts.h
View File

@ -76,6 +76,7 @@ public:
int MountParMkdirOn() { return mount_par_mkdir_on; } int MountParMkdirOn() { return mount_par_mkdir_on; }
int MountParApp() { return mount_par_app; } int MountParApp() { return mount_par_app; }
int MountParHtmlTemplate() { return mount_par_html_template; } int MountParHtmlTemplate() { return mount_par_html_template; }
int MountParChangeTemplate() { return mount_par_change_template; }
int MountParStatic() { return mount_par_static; } int MountParStatic() { return mount_par_static; }
int MountParCss() { return mount_par_css; } int MountParCss() { return mount_par_css; }
@ -145,6 +146,7 @@ private:
int mount_par_mkdir_on; int mount_par_mkdir_on;
int mount_par_app; int mount_par_app;
int mount_par_html_template; int mount_par_html_template;
int mount_par_change_template;
int mount_par_static; int mount_par_static;
int mount_par_css; int mount_par_css;

783
functions/Makefile.dep
View File

File diff suppressed because it is too large Load Diff

4
functions/functionbase.cpp
View File

@ -2,7 +2,7 @@
* This file is a part of Winix * This file is a part of Winix
* and is not publicly distributed * and is not publicly distributed
* *
* Copyright (c) 2010, Tomasz Sowa * Copyright (c) 2010-2011, Tomasz Sowa
* All rights reserved. * All rights reserved.
* *
*/ */
@ -14,8 +14,8 @@
FunctionBase::FunctionBase() FunctionBase::FunctionBase()
{ {
id = -1;
follow_symlinks = true; follow_symlinks = true;
template_index = size_t(-1);
fun.user_id = -1; fun.user_id = -1;
fun.group_id = -1; fun.group_id = -1;

10
functions/functionbase.h
View File

@ -2,7 +2,7 @@
* This file is a part of Winix * This file is a part of Winix
* and is not publicly distributed * and is not publicly distributed
* *
* Copyright (c) 2010, Tomasz Sowa * Copyright (c) 2010-2011, Tomasz Sowa
* All rights reserved. * All rights reserved.
* *
*/ */
@ -32,11 +32,6 @@ class FunctionBase
{ {
public: public:
// function id
// it is set automatically when you add the function to functions list
// is used to load a template (in templates)
long id;
FunctionBase(); FunctionBase();
// user, group, permissions, url (function name) // user, group, permissions, url (function name)
@ -45,6 +40,9 @@ public:
// auto follow sym links, default: true // auto follow sym links, default: true
bool follow_symlinks; bool follow_symlinks;
// html template index (for using with 'patterns' object)
size_t template_index;
virtual void Init(); virtual void Init();
virtual bool HasAccess(); virtual bool HasAccess();
virtual void MakePost(); virtual void MakePost();

2
functions/functions.cpp
View File

@ -124,6 +124,7 @@ Error Functions::CheckSpecialFile(const Item & item)
system->mounts.ReadMounts(item.content); system->mounts.ReadMounts(item.content);
templates->ReadNewIndexTemplates(); templates->ReadNewIndexTemplates();
templates->ReadNewChangeTemplates();
return WINIX_ERR_OK; return WINIX_ERR_OK;
} }
@ -154,7 +155,6 @@ void Functions::Add(FunctionBase * fun)
return; return;
} }
fun->id = table.size();
SetObjects(fun); SetObjects(fun);
table[fun->fun.url] = fun; table[fun->fun.url] = fun;
} }

12
functions/upload.cpp
View File

@ -271,18 +271,14 @@ void Upload::CreateJSON()
{ {
// !! locale beda w zaleznosci od uzytkownika // !! locale beda w zaleznosci od uzytkownika
size_t loc = TemplatesFunctions::locale.GetLang(); size_t loc = TemplatesFunctions::locale.GetLang();
size_t idu = static_cast<size_t>(id); Ezc::Pattern * pat = TemplatesFunctions::patterns.Get(template_index, loc);
TemplatesFunctions::Patterns & patfun = TemplatesFunctions::patterns_fun;
if( loc < patfun.size() && idu < patfun[loc].size() ) if( pat )
{ {
templates->Generate(patfun[loc][idu]); templates->Generate(*pat);
cur->request->page_generated = true; cur->request->page_generated = true;
cur->request->use_html_filter = false; cur->request->use_html_filter = false;
} }
// !! usunac
//log << log1 << cur->request->page.Str() << logend;
} }

4
html/fun_reload.html
View File

@ -11,6 +11,10 @@
<li><a href="[doc_base_url][dir]reload/tickets">{reload_tickets}</a></li> <li><a href="[doc_base_url][dir]reload/tickets">{reload_tickets}</a></li>
[end] [end]
[if winix_has_plugin "groupitem"]
<li><a href="[doc_base_url][dir]reload/groupitem">{reload_groupitem}</a></li>
[end]
</ul> </ul>

1
locale/en
View File

@ -152,6 +152,7 @@ reload_header = Reload
reload_select = Choose an item to reload reload_select = Choose an item to reload
reload_templates = html templates reload_templates = html templates
reload_tickets = tickets config files reload_tickets = tickets config files
reload_groupitem = groups config files
rm_header = Remove rm_header = Remove

1
locale/pl
View File

@ -170,6 +170,7 @@ reload_header = Przeładuj
reload_select = Wybierz pozycję reload_select = Wybierz pozycję
reload_templates = szablony html reload_templates = szablony html
reload_tickets = pliki konfiguracyjne ticketów reload_tickets = pliki konfiguracyjne ticketów
reload_groupitem = pliki konfiguracyjne grup
rm_header = Usuń rm_header = Usuń

15
main/Makefile.dep
View File

@ -12,15 +12,15 @@ main.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
main.o: ../core/error.h ../db/dbitemquery.h ../core/item.h main.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
main.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h main.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
main.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h main.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
main.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h main.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
main.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h main.o: ../templates/locale.h ../templates/localefilter.h ../../ezc/src/ezc.h
main.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h main.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
main.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h main.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
main.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h main.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
main.o: ../templates/htmltextstream.h ../notify/notifythread.h main.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
main.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h main.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
main.o: ../core/config.h ../core/users.h ../core/ugcontainer.h main.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h
main.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h main.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mountparser.h
main.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.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/group.h ../core/loadavg.h ../core/thumb.h
main.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h main.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h
@ -40,7 +40,8 @@ main.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h
main.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h main.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
main.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h main.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h
main.o: ../templates/templates.h ../templates/patterncacher.h main.o: ../templates/templates.h ../templates/patterncacher.h
main.o: ../templates/indexpatterns.h ../core/sessionmanager.h main.o: ../templates/indexpatterns.h ../templates/patterns.h
main.o: ../templates/changepatterns.h ../core/sessionmanager.h
main.o: ../core/compress.h ../core/postparser.h ../core/httpsimpleparser.h main.o: ../core/compress.h ../core/postparser.h ../core/httpsimpleparser.h
main.o: ../core/cookieparser.h ../core/postmultiparser.h main.o: ../core/cookieparser.h ../core/postmultiparser.h
main.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h main.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h

85
notify/Makefile.dep
View File

@ -1,33 +1,35 @@
# DO NOT DELETE # DO NOT DELETE
notify.o: notify.h notifypool.h ../templates/locale.h ../core/confparser.h notify.o: notify.h notifypool.h ../templates/locale.h ../core/confparser.h
notify.o: ../templates/misc.h ../templates/localefilter.h notify.o: ../templates/patterns.h ../templates/locale.h
notify.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h notify.o: ../templates/localefilter.h ../../ezc/src/ezc.h
notify.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h notify.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
notify.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h notify.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
notify.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h notify.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
notify.o: ../templates/htmltextstream.h ../core/textstream.h ../core/misc.h notify.o: ../../ezc/src/stringconv.h ../templates/misc.h
notify.o: ../core/requesttypes.h ../core/user.h notifythread.h notify.o: ../templates/htmltextstream.h ../core/textstream.h notifythread.h
notify.o: ../core/basethread.h ../core/synchro.h templatesnotify.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/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/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/textstream.h ../core/logmanipulators.h ../core/slog.h
notify.o: ../core/cur.h ../core/request.h ../core/error.h ../core/config.h notify.o: ../core/cur.h ../core/request.h ../core/requesttypes.h
notify.o: ../templates/htmltextstream.h ../core/session.h notify.o: ../core/error.h ../core/config.h ../templates/htmltextstream.h
notify.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h notify.o: ../core/session.h ../core/plugindata.h ../core/rebus.h
notify.o: ../core/lastcontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h notify.o: ../core/mount.h ../core/lastcontainer.h ../db/db.h ../db/dbbase.h
notify.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h notify.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
notify.o: ../core/item.h ../db/dbitemcolumns.h ../core/group.h notify.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
notify.o: ../core/dircontainer.h ../core/ugcontainer.h notify.o: ../core/user.h ../core/group.h ../core/dircontainer.h
notify.o: ../templates/templates.h ../templates/patterncacher.h notify.o: ../core/ugcontainer.h ../templates/misc.h ../templates/templates.h
notify.o: ../templates/indexpatterns.h ../core/cur.h ../core/system.h notify.o: ../templates/patterncacher.h ../templates/indexpatterns.h
notify.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h notify.o: ../templates/patterns.h ../templates/changepatterns.h ../core/cur.h
notify.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h notify.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
notify.o: ../core/run.h ../core/users.h ../core/groups.h ../core/group.h notify.o: ../notify/notify.h ../core/mounts.h ../core/mountparser.h
notify.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h notify.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
notify.o: ../core/threadmanager.h ../core/sessionmanager.h notify.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
notify.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h notify.o: ../core/basethread.h ../core/threadmanager.h
notify.o: ../core/request.h ../core/dirs.h ../core/synchro.h ../core/plugin.h notify.o: ../core/sessionmanager.h ../core/sessioncontainer.h
notify.o: ../core/system.h ../core/htmlfilter.h ../core/request.h
notify.o: ../core/dirs.h ../core/synchro.h ../core/plugin.h
notify.o: ../core/pluginmsg.h ../core/sessionmanager.h notify.o: ../core/pluginmsg.h ../core/sessionmanager.h
notify.o: ../functions/functions.h ../functions/functionbase.h notify.o: ../functions/functions.h ../functions/functionbase.h
notify.o: ../functions/functionparser.h ../functions/adduser.h notify.o: ../functions/functionparser.h ../functions/adduser.h
@ -48,31 +50,34 @@ 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/generator.h ../../ezc/src/pattern.h
notifythread.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h notifythread.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
notifythread.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h notifythread.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
notifythread.o: ../core/textstream.h ../core/misc.h ../core/requesttypes.h notifythread.o: ../core/textstream.h ../templates/misc.h
notifythread.o: notifypool.h ../templates/locale.h ../core/confparser.h notifythread.o: ../templates/localefilter.h ../templates/locale.h
notifythread.o: ../templates/misc.h ../templates/localefilter.h notifythread.o: ../templates/htmltextstream.h notifypool.h
notifythread.o: ../templates/locale.h ../templates/htmltextstream.h notifythread.o: ../templates/locale.h ../core/confparser.h ../core/config.h
notifythread.o: ../core/user.h ../core/config.h ../core/confparser.h notifythread.o: ../core/confparser.h ../core/htmlfilter.h ../core/users.h
notifythread.o: ../core/htmlfilter.h ../core/users.h ../core/user.h notifythread.o: ../core/user.h ../core/ugcontainer.h ../core/log.h
notifythread.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h notifythread.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
notifythread.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h notifythread.o: ../core/cur.h ../core/request.h ../core/requesttypes.h
notifythread.o: ../core/request.h ../core/error.h ../core/config.h notifythread.o: ../core/error.h ../core/config.h
notifythread.o: ../templates/htmltextstream.h ../core/session.h notifythread.o: ../templates/htmltextstream.h ../core/session.h
notifythread.o: ../core/plugindata.h ../core/rebus.h ../core/mount.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: ../core/lastcontainer.h ../db/db.h ../db/dbbase.h
notifythread.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h notifythread.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
notifythread.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h notifythread.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
notifythread.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h notifythread.o: ../core/user.h ../core/group.h ../core/dircontainer.h
notifythread.o: ../core/ugcontainer.h ../templates/patterns.h
templatesnotify.o: templatesnotify.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h 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/generator.h ../../ezc/src/pattern.h
templatesnotify.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h templatesnotify.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
templatesnotify.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h templatesnotify.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
templatesnotify.o: ../core/textstream.h ../core/misc.h ../core/requesttypes.h templatesnotify.o: ../core/textstream.h ../templates/misc.h
templatesnotify.o: notifypool.h ../templates/locale.h ../core/confparser.h templatesnotify.o: ../templates/localefilter.h ../templates/locale.h
templatesnotify.o: ../templates/htmltextstream.h notifypool.h
templatesnotify.o: ../templates/locale.h ../core/confparser.h
templatesnotify.o: ../core/plugin.h ../core/pluginmsg.h ../core/log.h templatesnotify.o: ../core/plugin.h ../core/pluginmsg.h ../core/log.h
templatesnotify.o: ../core/textstream.h ../core/logmanipulators.h templatesnotify.o: ../core/textstream.h ../core/logmanipulators.h
templatesnotify.o: ../core/slog.h ../core/cur.h ../core/request.h templatesnotify.o: ../core/slog.h ../core/cur.h ../core/request.h
templatesnotify.o: ../core/error.h ../core/config.h templatesnotify.o: ../core/requesttypes.h ../core/error.h ../core/config.h
templatesnotify.o: ../templates/htmltextstream.h ../core/session.h templatesnotify.o: ../templates/htmltextstream.h ../core/session.h
templatesnotify.o: ../core/user.h ../core/plugindata.h ../core/rebus.h templatesnotify.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
templatesnotify.o: ../core/mount.h ../core/system.h ../core/sessionmanager.h templatesnotify.o: ../core/mount.h ../core/system.h ../core/sessionmanager.h
@ -108,7 +113,7 @@ templatesnotify.o: ../functions/uname.h ../functions/upload.h
templatesnotify.o: ../functions/uptime.h ../functions/who.h templatesnotify.o: ../functions/uptime.h ../functions/who.h
templatesnotify.o: ../functions/vim.h ../core/htmlfilter.h templatesnotify.o: ../functions/vim.h ../core/htmlfilter.h
templatesnotify.o: ../templates/templates.h ../templates/patterncacher.h templatesnotify.o: ../templates/templates.h ../templates/patterncacher.h
templatesnotify.o: ../templates/indexpatterns.h ../templates/localefilter.h templatesnotify.o: ../templates/indexpatterns.h ../templates/patterns.h
templatesnotify.o: ../templates/locale.h ../templates/htmltextstream.h templatesnotify.o: ../templates/changepatterns.h ../core/sessionmanager.h
templatesnotify.o: ../core/sessionmanager.h ../core/sessioncontainer.h templatesnotify.o: ../core/sessioncontainer.h ../core/lastcontainer.h
templatesnotify.o: ../core/lastcontainer.h ../core/misc.h templatesnotify.o: ../core/misc.h

34
notify/notify.cpp
View File

@ -69,6 +69,11 @@ void Notify::Init()
notify_thread.SetSynchro(synchro); notify_thread.SetSynchro(synchro);
thread_manager->Add(&notify_thread); thread_manager->Add(&notify_thread);
patterns.SetUTF8(config->utf8);
patterns.SetDirectories(config->txt_templates_dir, config->txt_templates_dir_default);
patterns.SetLocale(&TemplatesFunctions::locale);
patterns.SetLocaleFilter(&TemplatesFunctions::locale_filter);
notify_template_cms = AddTemplate(L"notify_email_cms.txt"); notify_template_cms = AddTemplate(L"notify_email_cms.txt");
plugin.Call(WINIX_NOTIFY_ADD_TEMPLATE); plugin.Call(WINIX_NOTIFY_ADD_TEMPLATE);
@ -78,29 +83,7 @@ void Notify::Init()
void Notify::ReadTemplates() void Notify::ReadTemplates()
{ {
if( templates_names.empty() ) patterns.Reload();
{
patterns.clear();
return;
}
patterns.resize(TemplatesFunctions::locale.Size());
for(size_t i=0 ; i<patterns.size() ; ++i)
{
patterns[i].resize(templates_names.size());
for(size_t a=0 ; a<patterns[i].size() ; ++a)
{
patterns[i][a].UTF8(config->utf8);
patterns[i][a].DeleteWhiteTextItems(false);
patterns[i][a].Directory(config->txt_templates_dir, config->txt_templates_dir_default);
patterns[i][a].ParseFile(templates_names[a]);
TemplatesFunctions::locale_filter.Filter(patterns[i][a], TemplatesFunctions::locale, i);
}
}
notify_thread.PatternsChanged(); notify_thread.PatternsChanged();
} }
@ -132,10 +115,7 @@ void Notify::ItemChanged(const NotifyMsg & msg)
size_t Notify::AddTemplate(const std::wstring & file_name) size_t Notify::AddTemplate(const std::wstring & file_name)
{ {
size_t index = templates_names.size(); return patterns.Add(file_name, false);
templates_names.push_back(file_name);
return index;
} }

11
notify/notify.h
View File

@ -13,9 +13,12 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include "notifypool.h" #include "notifypool.h"
#include "templates/misc.h" #include "templates/patterns.h"
#include "notifythread.h" #include "notifythread.h"
// !! skasowac?
#include "templates/misc.h"
class Request; class Request;
class Config; class Config;
@ -61,11 +64,7 @@ private:
size_t notify_template_cms; size_t notify_template_cms;
// templates file names Patterns patterns;
std::vector<std::wstring> templates_names;
// vector table [language][file]
TemplatesFunctions::Patterns patterns;
void CreateItemLink(const Item & item, std::wstring & link, std::wstring & dir_link); void CreateItemLink(const Item & item, std::wstring & link, std::wstring & dir_link);
}; };

33
notify/notifythread.cpp
View File

@ -41,7 +41,7 @@ void NotifyThread::SetNotifyPool(NotifyPool * pool)
// first thread (objects are locked) // first thread (objects are locked)
void NotifyThread::SetPatterns(TemplatesFunctions::Patterns * pat) void NotifyThread::SetPatterns(Patterns * pat)
{ {
pat_global = pat; pat_global = pat;
} }
@ -163,24 +163,25 @@ void NotifyThread::SendMail()
size_t lang_index = TemplatesNotifyFunctions::notify_user_msg.lang; size_t lang_index = TemplatesNotifyFunctions::notify_user_msg.lang;
size_t template_index = TemplatesNotifyFunctions::notify_msg.template_index; size_t template_index = TemplatesNotifyFunctions::notify_msg.template_index;
if( lang_index >= patterns.size() ) Lock();
return; // 'patterns' object can use logger or other stuff so we use Lock() before
Ezc::Pattern * pat = patterns.Get(template_index, lang_index);
if( template_index >= patterns[lang_index].size() ) if( !pat )
log << log1 << "NotifyThread: I don't have a template with index: " << template_index
<< " and locale index: " << lang_index << logend;
Unlock();
if( pat )
{ {
Lock(); generator.RecognizeSpecialChars(true);
log << log1 << "NotifyThread: incorrect template index: " << template_index << logend; generator.TrimWhite(true);
Unlock(); generator.SkipNewLine(true);
return; generator.Generate(notify_stream, *pat, TemplatesNotifyFunctions::ezc_functions);
SendMail(TemplatesNotifyFunctions::notify_user_msg.email, notify_stream.Str());
} }
generator.RecognizeSpecialChars(true);
generator.TrimWhite(true);
generator.SkipNewLine(true);
generator.Generate(notify_stream, patterns[lang_index][template_index],
TemplatesNotifyFunctions::ezc_functions);
SendMail(TemplatesNotifyFunctions::notify_user_msg.email, notify_stream.Str());
} }

8
notify/notifythread.h
View File

@ -13,9 +13,9 @@
#include "core/basethread.h" #include "core/basethread.h"
#include "templatesnotify.h" #include "templatesnotify.h"
#include "ezc.h" #include "ezc.h"
#include "templates/misc.h"
#include "core/config.h" #include "core/config.h"
#include "core/users.h" #include "core/users.h"
#include "templates/patterns.h"
@ -30,7 +30,7 @@ public:
void SetConfig(Config * pconfig); void SetConfig(Config * pconfig);
void SetUsers(Users * pusers); void SetUsers(Users * pusers);
void SetNotifyPool(NotifyPool * pool); void SetNotifyPool(NotifyPool * pool);
void SetPatterns(TemplatesFunctions::Patterns * pat); void SetPatterns(Patterns * pat);
void PatternsChanged(); void PatternsChanged();
private: private:
@ -38,14 +38,14 @@ private:
Config * config; Config * config;
Users * users; Users * users;
NotifyPool * notify_pool; NotifyPool * notify_pool;
TemplatesFunctions::Patterns * pat_global; Patterns * pat_global;
NotifyUserMsg msg; NotifyUserMsg msg;
typedef std::list<NotifyUserMsg> NotifyUser; typedef std::list<NotifyUserMsg> NotifyUser;
NotifyUser notify_user; NotifyUser notify_user;
std::string sendmail_command; std::string sendmail_command;
bool patterns_changed; bool patterns_changed;
TemplatesFunctions::Patterns patterns; Patterns patterns;
TemplatesNotifyFunctions::NotifyStream notify_stream; TemplatesNotifyFunctions::NotifyStream notify_stream;
Ezc::Generator<TemplatesNotifyFunctions::NotifyStream> generator; Ezc::Generator<TemplatesNotifyFunctions::NotifyStream> generator;

31
plugins/export/Makefile.dep
View File

@ -17,23 +17,23 @@ init.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h
init.o: ../../db/dbitemquery.h ../../core/item.h ../../db/dbitemcolumns.h init.o: ../../db/dbitemquery.h ../../core/item.h ../../db/dbitemcolumns.h
init.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h init.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
init.o: ../../core/ugcontainer.h ../../notify/notify.h init.o: ../../core/ugcontainer.h ../../notify/notify.h
init.o: ../../notify/notifypool.h ../../templates/misc.h init.o: ../../notify/notifypool.h ../../templates/patterns.h
init.o: ../../templates/localefilter.h ../../templates/locale.h init.o: ../../templates/locale.h ../../templates/localefilter.h
init.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.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/generator.h ../../../ezc/src/pattern.h
init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
init.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h init.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
init.o: ../../notify/notifythread.h ../../core/basethread.h init.o: ../../core/basethread.h ../../core/synchro.h
init.o: ../../core/synchro.h ../../notify/templatesnotify.h init.o: ../../notify/templatesnotify.h ../../core/config.h ../../core/users.h
init.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
init.o: ../../core/lastcontainer.h ../../core/mounts.h init.o: ../../templates/misc.h ../../templates/htmltextstream.h
init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h init.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h
init.o: ../../core/users.h ../../core/groups.h ../../core/group.h init.o: ../../core/run.h ../../core/users.h ../../core/groups.h
init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h init.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h
init.o: ../../core/threadmanager.h ../../core/sessionmanager.h init.o: ../../core/basethread.h ../../core/threadmanager.h
init.o: ../../core/sessioncontainer.h ../../functions/functions.h init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
init.o: ../../functions/functionbase.h ../../core/request.h init.o: ../../functions/functions.h ../../functions/functionbase.h
init.o: ../../core/system.h ../../core/synchro.h init.o: ../../core/request.h ../../core/system.h ../../core/synchro.h
init.o: ../../functions/functionparser.h ../../core/cur.h init.o: ../../functions/functionparser.h ../../core/cur.h
init.o: ../../functions/adduser.h ../../functions/cat.h init.o: ../../functions/adduser.h ../../functions/cat.h
init.o: ../../functions/chmod.h ../../functions/privchanger.h init.o: ../../functions/chmod.h ../../functions/privchanger.h
@ -52,5 +52,6 @@ init.o: ../../functions/tinymce.h ../../functions/uname.h
init.o: ../../functions/upload.h ../../functions/uptime.h init.o: ../../functions/upload.h ../../functions/uptime.h
init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h
init.o: ../../templates/templates.h ../../templates/patterncacher.h init.o: ../../templates/templates.h ../../templates/patterncacher.h
init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h init.o: ../../templates/indexpatterns.h ../../templates/patterns.h
init.o: ../../templates/changepatterns.h ../../core/sessionmanager.h
init.o: exportthread.h message.h init.o: exportthread.h message.h

90
plugins/gallery/Makefile.dep
View File

@ -16,20 +16,20 @@ gallery.o: ../../core/mount.h ../../templates/locale.h
gallery.o: ../../core/confparser.h ../../core/request.h ../../core/config.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: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h
gallery.o: ../../notify/notify.h ../../notify/notifypool.h gallery.o: ../../notify/notify.h ../../notify/notifypool.h
gallery.o: ../../templates/misc.h ../../templates/localefilter.h gallery.o: ../../templates/patterns.h ../../templates/locale.h
gallery.o: ../../templates/locale.h ../../../ezc/src/ezc.h gallery.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
gallery.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h gallery.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
gallery.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h gallery.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
gallery.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h gallery.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
gallery.o: ../../templates/htmltextstream.h ../../notify/notifythread.h gallery.o: ../../notify/notifythread.h ../../core/basethread.h
gallery.o: ../../core/basethread.h ../../core/synchro.h gallery.o: ../../core/synchro.h ../../notify/templatesnotify.h
gallery.o: ../../notify/templatesnotify.h ../../core/users.h gallery.o: ../../core/users.h ../../core/ugcontainer.h
gallery.o: ../../core/ugcontainer.h ../../core/lastcontainer.h gallery.o: ../../core/lastcontainer.h ../../templates/misc.h
gallery.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h gallery.o: ../../templates/htmltextstream.h ../../core/mounts.h
gallery.o: ../../core/run.h ../../core/users.h ../../core/groups.h gallery.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
gallery.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h gallery.o: ../../core/users.h ../../core/groups.h ../../core/group.h
gallery.o: ../../core/basethread.h ../../core/threadmanager.h gallery.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h
gallery.o: ../../core/synchro.h galleryinfo.h gallery.o: ../../core/threadmanager.h ../../core/synchro.h galleryinfo.h
galleryinfo.o: galleryinfo.h ../../core/item.h galleryinfo.o: galleryinfo.h ../../core/item.h
init.o: gallery.h ../../functions/functionbase.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/db.h ../../db/dbbase.h ../../db/dbconn.h
@ -46,25 +46,25 @@ 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/confparser.h ../../core/request.h ../../core/config.h
init.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h init.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h
init.o: ../../notify/notify.h ../../notify/notifypool.h init.o: ../../notify/notify.h ../../notify/notifypool.h
init.o: ../../templates/misc.h ../../templates/localefilter.h init.o: ../../templates/patterns.h ../../templates/locale.h
init.o: ../../templates/locale.h ../../../ezc/src/ezc.h init.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
init.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.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/pattern.h ../../../ezc/src/functions.h
init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
init.o: ../../templates/htmltextstream.h ../../notify/notifythread.h init.o: ../../notify/notifythread.h ../../core/basethread.h
init.o: ../../core/basethread.h ../../core/synchro.h init.o: ../../core/synchro.h ../../notify/templatesnotify.h
init.o: ../../notify/templatesnotify.h ../../core/users.h init.o: ../../core/users.h ../../core/ugcontainer.h
init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h init.o: ../../core/lastcontainer.h ../../templates/misc.h
init.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h init.o: ../../templates/htmltextstream.h ../../core/mounts.h
init.o: ../../core/run.h ../../core/users.h ../../core/groups.h init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
init.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h init.o: ../../core/users.h ../../core/groups.h ../../core/group.h
init.o: ../../core/basethread.h ../../core/threadmanager.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/threadmanager.h ../../core/synchro.h galleryinfo.h
init.o: ../../core/plugin.h ../../core/pluginmsg.h ../../core/system.h init.o: ../../core/log.h ../../core/plugin.h ../../core/pluginmsg.h
init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h init.o: ../../core/system.h ../../core/sessionmanager.h
init.o: ../../functions/functions.h ../../functions/functionbase.h init.o: ../../core/sessioncontainer.h ../../functions/functions.h
init.o: ../../functions/functionparser.h ../../core/cur.h init.o: ../../functions/functionbase.h ../../functions/functionparser.h
init.o: ../../functions/adduser.h ../../functions/cat.h init.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h
init.o: ../../functions/chmod.h ../../functions/privchanger.h init.o: ../../functions/chmod.h ../../functions/privchanger.h
init.o: ../../functions/chown.h ../../functions/ckeditor.h init.o: ../../functions/chown.h ../../functions/ckeditor.h
init.o: ../../functions/cp.h ../../functions/default.h init.o: ../../functions/cp.h ../../functions/default.h
@ -81,7 +81,8 @@ init.o: ../../functions/tinymce.h ../../functions/uname.h
init.o: ../../functions/upload.h ../../functions/uptime.h init.o: ../../functions/upload.h ../../functions/uptime.h
init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h
init.o: ../../templates/templates.h ../../templates/patterncacher.h init.o: ../../templates/templates.h ../../templates/patterncacher.h
init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h init.o: ../../templates/indexpatterns.h ../../templates/patterns.h
init.o: ../../templates/changepatterns.h ../../core/sessionmanager.h
templates.o: gallery.h ../../functions/functionbase.h ../../core/item.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/db.h ../../db/dbbase.h ../../db/dbconn.h
templates.o: ../../db/dbtextstream.h ../../core/textstream.h templates.o: ../../db/dbtextstream.h ../../core/textstream.h
@ -99,25 +100,25 @@ templates.o: ../../core/mount.h ../../templates/locale.h
templates.o: ../../core/confparser.h ../../core/request.h ../../core/config.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: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h
templates.o: ../../notify/notify.h ../../notify/notifypool.h templates.o: ../../notify/notify.h ../../notify/notifypool.h
templates.o: ../../templates/misc.h ../../templates/localefilter.h templates.o: ../../templates/patterns.h ../../templates/locale.h
templates.o: ../../templates/locale.h ../../../ezc/src/ezc.h templates.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
templates.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h templates.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
templates.o: ../../templates/htmltextstream.h ../../notify/notifythread.h templates.o: ../../notify/notifythread.h ../../core/basethread.h
templates.o: ../../core/basethread.h ../../core/synchro.h templates.o: ../../core/synchro.h ../../notify/templatesnotify.h
templates.o: ../../notify/templatesnotify.h ../../core/users.h templates.o: ../../core/users.h ../../core/ugcontainer.h
templates.o: ../../core/ugcontainer.h ../../core/lastcontainer.h templates.o: ../../core/lastcontainer.h ../../templates/misc.h
templates.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h templates.o: ../../templates/htmltextstream.h ../../core/mounts.h
templates.o: ../../core/run.h ../../core/users.h ../../core/groups.h templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
templates.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h
templates.o: ../../core/basethread.h ../../core/threadmanager.h templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h
templates.o: ../../core/synchro.h galleryinfo.h ../../core/misc.h templates.o: ../../core/threadmanager.h ../../core/synchro.h galleryinfo.h
templates.o: ../../core/plugin.h ../../core/pluginmsg.h ../../core/system.h templates.o: ../../core/misc.h ../../core/plugin.h ../../core/pluginmsg.h
templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h templates.o: ../../core/system.h ../../core/sessionmanager.h
templates.o: ../../functions/functions.h ../../functions/functionbase.h templates.o: ../../core/sessioncontainer.h ../../functions/functions.h
templates.o: ../../functions/functionparser.h ../../core/cur.h templates.o: ../../functions/functionbase.h ../../functions/functionparser.h
templates.o: ../../functions/adduser.h ../../functions/cat.h templates.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h
templates.o: ../../functions/chmod.h ../../functions/privchanger.h templates.o: ../../functions/chmod.h ../../functions/privchanger.h
templates.o: ../../functions/chown.h ../../functions/ckeditor.h templates.o: ../../functions/chown.h ../../functions/ckeditor.h
templates.o: ../../functions/cp.h ../../functions/default.h templates.o: ../../functions/cp.h ../../functions/default.h
@ -136,4 +137,5 @@ templates.o: ../../functions/upload.h ../../functions/uptime.h
templates.o: ../../functions/who.h ../../functions/vim.h templates.o: ../../functions/who.h ../../functions/vim.h
templates.o: ../../core/htmlfilter.h ../../templates/templates.h templates.o: ../../core/htmlfilter.h ../../templates/templates.h
templates.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h templates.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h
templates.o: ../../templates/patterns.h ../../templates/changepatterns.h
templates.o: ../../core/sessionmanager.h templates.o: ../../core/sessionmanager.h

173
plugins/groupitem/Makefile.dep
View File

@ -1,37 +1,67 @@
# DO NOT DELETE # DO NOT DELETE
init.o: ../../core/log.h ../../core/textstream.h ../../core/misc.h groupinfo.o: groupinfo.h groups.h ../../core/confparser.h ../../core/item.h
init.o: ../../core/item.h ../../core/requesttypes.h groupinfo.o: ../../core/system.h ../../core/dirs.h ../../core/item.h
init.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h groupinfo.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
init.o: ../../core/request.h ../../core/error.h ../../core/config.h groupinfo.o: ../../db/dbconn.h ../../db/dbtextstream.h
init.o: ../../core/confparser.h ../../core/htmlfilter.h groupinfo.o: ../../core/textstream.h ../../core/misc.h
groupinfo.o: ../../core/requesttypes.h ../../core/error.h
groupinfo.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
groupinfo.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
groupinfo.o: ../../core/ugcontainer.h ../../core/log.h
groupinfo.o: ../../core/textstream.h ../../core/logmanipulators.h
groupinfo.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
groupinfo.o: ../../core/error.h ../../core/config.h ../../core/confparser.h
groupinfo.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
groupinfo.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
groupinfo.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
groupinfo.o: ../../notify/notify.h ../../notify/notifypool.h
groupinfo.o: ../../templates/patterns.h ../../templates/locale.h
groupinfo.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
groupinfo.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
groupinfo.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
groupinfo.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
groupinfo.o: ../../notify/notifythread.h ../../core/basethread.h
groupinfo.o: ../../core/synchro.h ../../notify/templatesnotify.h
groupinfo.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
groupinfo.o: ../../core/lastcontainer.h ../../templates/misc.h
groupinfo.o: ../../templates/htmltextstream.h ../../core/mounts.h
groupinfo.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
groupinfo.o: ../../core/users.h ../../core/loadavg.h ../../core/thumb.h
groupinfo.o: ../../core/basethread.h ../../core/threadmanager.h
groupinfo.o: ../../core/log.h
groups.o: groups.h ../../core/log.h
init.o: ../../core/log.h ../../core/plugin.h ../../core/pluginmsg.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/item.h ../../core/error.h
init.o: ../../core/config.h ../../core/confparser.h ../../core/htmlfilter.h
init.o: ../../templates/htmltextstream.h ../../core/textstream.h init.o: ../../templates/htmltextstream.h ../../core/textstream.h
init.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h init.o: ../../core/misc.h ../../core/session.h ../../core/user.h
init.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h init.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h
init.o: ../../core/confparser.h ../../core/plugin.h ../../core/pluginmsg.h init.o: ../../templates/locale.h ../../core/confparser.h ../../core/system.h
init.o: ../../core/log.h ../../core/system.h ../../core/dirs.h init.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h
init.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h init.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
init.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h init.o: ../../core/error.h ../../db/dbitemquery.h ../../core/item.h
init.o: ../../db/dbitemquery.h ../../core/item.h ../../db/dbitemcolumns.h init.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
init.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h init.o: ../../core/dircontainer.h ../../core/ugcontainer.h
init.o: ../../core/ugcontainer.h ../../notify/notify.h init.o: ../../notify/notify.h ../../notify/notifypool.h
init.o: ../../notify/notifypool.h ../../templates/misc.h init.o: ../../templates/patterns.h ../../templates/locale.h
init.o: ../../templates/localefilter.h ../../templates/locale.h init.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
init.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h init.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
init.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h init.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
init.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h
init.o: ../../notify/notifythread.h ../../core/basethread.h init.o: ../../notify/notifythread.h ../../core/basethread.h
init.o: ../../core/synchro.h ../../notify/templatesnotify.h init.o: ../../core/synchro.h ../../notify/templatesnotify.h
init.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h init.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
init.o: ../../core/lastcontainer.h ../../core/mounts.h init.o: ../../core/lastcontainer.h ../../templates/misc.h
init.o: ../../templates/htmltextstream.h ../../core/mounts.h
init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.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/users.h groups.h ../../core/loadavg.h ../../core/thumb.h
init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h init.o: ../../core/basethread.h ../../core/threadmanager.h
init.o: ../../core/threadmanager.h ../../core/sessionmanager.h init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
init.o: ../../core/sessioncontainer.h ../../functions/functions.h init.o: ../../functions/functions.h ../../functions/functionbase.h
init.o: ../../functions/functionbase.h ../../core/request.h init.o: ../../core/request.h ../../core/system.h ../../core/synchro.h
init.o: ../../core/system.h ../../core/synchro.h
init.o: ../../functions/functionparser.h ../../core/cur.h init.o: ../../functions/functionparser.h ../../core/cur.h
init.o: ../../functions/adduser.h ../../functions/cat.h init.o: ../../functions/adduser.h ../../functions/cat.h
init.o: ../../functions/chmod.h ../../functions/privchanger.h init.o: ../../functions/chmod.h ../../functions/privchanger.h
@ -50,7 +80,9 @@ init.o: ../../functions/tinymce.h ../../functions/uname.h
init.o: ../../functions/upload.h ../../functions/uptime.h init.o: ../../functions/upload.h ../../functions/uptime.h
init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h
init.o: ../../templates/templates.h ../../templates/patterncacher.h init.o: ../../templates/templates.h ../../templates/patterncacher.h
init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h init.o: ../../templates/indexpatterns.h ../../templates/patterns.h
init.o: ../../templates/changepatterns.h ../../core/sessionmanager.h
init.o: groupinfo.h
templates.o: ../../templates/templates.h ../../../ezc/src/ezc.h templates.o: ../../templates/templates.h ../../../ezc/src/ezc.h
templates.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h templates.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
templates.o: ../../../ezc/src/pattern.h ../../core/item.h templates.o: ../../../ezc/src/pattern.h ../../core/item.h
@ -58,49 +90,52 @@ templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
templates.o: ../../../ezc/src/stringconv.h ../../core/misc.h templates.o: ../../../ezc/src/stringconv.h ../../core/misc.h
templates.o: ../../core/requesttypes.h ../../templates/patterncacher.h templates.o: ../../core/requesttypes.h ../../templates/patterncacher.h
templates.o: ../../core/item.h ../../templates/indexpatterns.h templates.o: ../../core/item.h ../../templates/indexpatterns.h
templates.o: ../../templates/localefilter.h ../../templates/locale.h templates.o: ../../templates/patterns.h ../../templates/locale.h
templates.o: ../../core/config.h ../../templates/htmltextstream.h templates.o: ../../templates/changepatterns.h
templates.o: ../../core/cur.h ../../core/system.h ../../core/sessionmanager.h templates.o: ../../templates/htmltextstream.h ../../templates/localefilter.h
templates.o: ../../core/htmlfilter.h ../../db/db.h ../../db/dbbase.h templates.o: ../../core/config.h ../../core/cur.h ../../core/system.h
templates.o: ../../db/dbconn.h ../../db/dbtextstream.h templates.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h
templates.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
templates.o: ../../core/textstream.h ../../core/error.h templates.o: ../../core/textstream.h ../../core/error.h
templates.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h templates.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
templates.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h 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/ugcontainer.h ../../core/log.h
templates.o: ../../core/pluginmsg.h ../../core/plugindata.h templates.o: ../../core/textstream.h ../../core/logmanipulators.h
templates.o: ../../core/config.h ../../core/confparser.h templates.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
templates.o: ../../core/htmlfilter.h ../../core/request.h ../../core/error.h templates.o: ../../core/error.h ../../core/config.h ../../core/confparser.h
templates.o: ../../core/textstream.h ../../templates/htmltextstream.h templates.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
templates.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h templates.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
templates.o: ../../notify/notify.h ../../notify/notifypool.h templates.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
templates.o: ../../templates/locale.h ../../core/confparser.h templates.o: ../../core/confparser.h ../../notify/notify.h
templates.o: ../../templates/misc.h ../../notify/notifythread.h templates.o: ../../notify/notifypool.h ../../templates/patterns.h
templates.o: ../../core/basethread.h ../../core/synchro.h templates.o: ../../notify/notifythread.h ../../core/basethread.h
templates.o: ../../notify/templatesnotify.h ../../core/users.h templates.o: ../../core/synchro.h ../../notify/templatesnotify.h
templates.o: ../../core/user.h ../../core/ugcontainer.h templates.o: ../../core/users.h ../../core/ugcontainer.h
templates.o: ../../core/lastcontainer.h ../../core/cur.h ../../core/session.h templates.o: ../../core/lastcontainer.h ../../templates/misc.h
templates.o: ../../core/rebus.h ../../core/mount.h ../../core/mounts.h templates.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h
templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h templates.o: ../../core/run.h ../../core/users.h groups.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/loadavg.h ../../core/thumb.h ../../core/basethread.h
templates.o: ../../core/threadmanager.h ../../core/sessionmanager.h templates.o: ../../core/threadmanager.h ../../core/sessionmanager.h
templates.o: ../../core/sessioncontainer.h ../../functions/functions.h templates.o: ../../core/htmlfilter.h ../../core/plugin.h
templates.o: ../../functions/functionbase.h ../../core/request.h templates.o: ../../core/pluginmsg.h ../../core/system.h
templates.o: ../../core/synchro.h ../../functions/functionparser.h templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
templates.o: ../../functions/adduser.h ../../functions/cat.h templates.o: ../../functions/functions.h ../../functions/functionbase.h
templates.o: ../../functions/chmod.h ../../functions/privchanger.h templates.o: ../../core/request.h ../../core/synchro.h
templates.o: ../../functions/chown.h ../../functions/ckeditor.h templates.o: ../../functions/functionparser.h ../../functions/adduser.h
templates.o: ../../functions/cp.h ../../functions/default.h templates.o: ../../functions/cat.h ../../functions/chmod.h
templates.o: ../../functions/download.h ../../functions/emacs.h templates.o: ../../functions/privchanger.h ../../functions/chown.h
templates.o: ../../functions/last.h ../../functions/login.h templates.o: ../../functions/ckeditor.h ../../functions/cp.h
templates.o: ../../functions/logout.h ../../functions/ln.h templates.o: ../../functions/default.h ../../functions/download.h
templates.o: ../../functions/ls.h ../../functions/mkdir.h templates.o: ../../functions/emacs.h ../../functions/last.h
templates.o: ../../functions/mv.h ../../functions/nicedit.h templates.o: ../../functions/login.h ../../functions/logout.h
templates.o: ../../functions/node.h ../../functions/passwd.h templates.o: ../../functions/ln.h ../../functions/ls.h
templates.o: ../../functions/priv.h ../../functions/reload.h templates.o: ../../functions/mkdir.h ../../functions/mv.h
templates.o: ../../functions/rm.h ../../functions/sort.h templates.o: ../../functions/nicedit.h ../../functions/node.h
templates.o: ../../functions/specialdefault.h ../../functions/stat.h templates.o: ../../functions/passwd.h ../../functions/priv.h
templates.o: ../../functions/subject.h ../../functions/template.h templates.o: ../../functions/reload.h ../../functions/rm.h
templates.o: ../../functions/tinymce.h ../../functions/uname.h templates.o: ../../functions/sort.h ../../functions/specialdefault.h
templates.o: ../../functions/upload.h ../../functions/uptime.h templates.o: ../../functions/stat.h ../../functions/subject.h
templates.o: ../../functions/who.h ../../functions/vim.h templates.o: ../../functions/template.h ../../functions/tinymce.h
templates.o: ../../functions/uname.h ../../functions/upload.h
templates.o: ../../functions/uptime.h ../../functions/who.h
templates.o: ../../functions/vim.h groupinfo.h

2
plugins/groupitem/Makefile.o.dep
View File

@ -1 +1 @@
o = init.o templates.o o = groupinfo.o groups.o init.o templates.o

203
plugins/groupitem/groupinfo.cpp Executable file
View File

@ -0,0 +1,203 @@
/*
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2011, Tomasz Sowa
* All rights reserved.
*
*/
#include "groupinfo.h"
#include "core/log.h"
#include "core/system.h"
namespace GroupItem
{
GroupInfo::GroupInfo()
{
mount_par_group_conf = -1;
mount_par_group_lang_conf = -1;
}
void GroupInfo::SetSystem(System * psystem)
{
system = psystem;
}
Groups * GroupInfo::FindGroups(long dir_id)
{
GroupsWrap::iterator i = groups_wrap.find(dir_id);
if( i == groups_wrap.end() )
return 0;
return &(i->second.groups);
}
bool GroupInfo::ParseGroups(const std::wstring & str, Groups & groups)
{
groups.Clear();
if( conf_parser.ParseString(str) == ConfParser::ok )
{
ConfParser::Table::iterator i;
for(i=conf_parser.table.begin() ; i!=conf_parser.table.end() ; ++i)
{
groups.AddGroup();
log << log1 << "stworzylem nowa grupe" << logend;
for(size_t a=0 ; a<i->second.size() ; ++a)
{
groups.AddPath(i->second[a]);
log << log1 << " dodalem sciezke: " << i->second[a] << logend;
}
}
}
return conf_parser.status == ConfParser::ok;
}
void GroupInfo::MarkAllGroupsToDelete()
{
GroupsWrap::iterator i = groups_wrap.begin();
for( ; i != groups_wrap.end() ; ++i)
i->second.to_delete = true;
}
void GroupInfo::DeleteAllMarkedGroups()
{
GroupsWrap::iterator inext;
GroupsWrap::iterator i = groups_wrap.begin();
while( i != groups_wrap.end() )
{
inext = i;
++inext;
if( i->second.to_delete )
{
log << log3 << "GroupItem: deleting group for dir id: " << i->first << logend;
groups_wrap.erase(i);
}
i = inext;
}
}
bool GroupInfo::GetConfContent(const std::wstring & path)
{
int status = system->FollowAllLinks(path, config_dir_tab, config_file, false, false, false);
if( status != 1 )
{
log << log1 << "GroupItem: problem with reading a config file: " << path << ", status: " << status << logend;
return false;
}
return true;
}
// if skip_existing_configs is true then only new config files will be parsed
void GroupInfo::ReadGroupsConf(Mounts & mounts, bool skip_existing_configs)
{
Mounts::MountTab::const_iterator i;
const Mounts::MountTab * mtab = mounts.GetMountTab();
// loop through all mount points
for(i=mtab->begin() ; i!=mtab->end() ; ++i)
{
const Mount & mount = i->second;
if( mount.param[mount_par_group_conf].defined &&
mount.param[mount_par_group_conf].arg.size() == 1 )
{
const std::wstring & file_name = mount.param[mount_par_group_conf].arg[0];
GroupsWrap::iterator c = groups_wrap.find(mount.dir_id);
bool exists = (c != groups_wrap.end() && c->second.file_name == file_name);
if( exists )
c->second.to_delete = false;
if( !(skip_existing_configs && exists) )
{
if( GetConfContent(file_name) )
{
log << log3 << "GroupItem: parsing conf file: " << config_file.url << logend;
groups_wrap[mount.dir_id].file_name = file_name;
if( !ParseGroups(config_file.content, groups_wrap[mount.dir_id].groups) )
groups_wrap[mount.dir_id].to_delete = true;
}
else
{
if( exists )
c->second.to_delete = true;
}
}
}
}
}
// if skip_existing_configs is true then only new config files will be parsed
void GroupInfo::ReadGroupsConfigs(bool skip_existing_configs)
{
MarkAllGroupsToDelete();
ReadGroupsConf(system->mounts, skip_existing_configs);
DeleteAllMarkedGroups();
}
void GroupInfo::PrintGroups()
{
GroupsWrap::iterator i = groups_wrap.begin();
for( ; i != groups_wrap.end() ; ++i)
{
log << "grupy dla dir_id: " << i->first << logend;
Groups & g = i->second.groups;
log << "rozmiar: " << g.Size() << logend;
for(size_t a=0 ; a<g.Size() ; ++a )
{
log << "grupa: " << a << logend;
log << "sciezek: " << g.GroupSize(a) << logend;
for(size_t x=0 ; x<g.GroupSize(a) ; ++x)
{
log << " " << g.GroupPath(a, x) << logend;
}
}
}
}
}

84
plugins/groupitem/groupinfo.h Executable file
View File

@ -0,0 +1,84 @@
/*
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2011, Tomasz Sowa
* All rights reserved.
*
*/
#ifndef headerfile_winix_plugins_groupitem_groupinfo
#define headerfile_winix_plugins_groupitem_groupinfo
#include <string>
#include <vector>
#include "groups.h"
#include "core/confparser.h"
#include "core/item.h"
#include "core/system.h"
namespace GroupItem
{
struct GroupsWrapItem
{
bool to_delete;
std::wstring file_name;
Groups groups;
GroupsWrapItem()
{
to_delete = false;
}
};
class GroupInfo
{
public:
GroupInfo();
void SetSystem(System * psystem);
void ReadGroupsConfigs(bool skip_existing_configs);
Groups * FindGroups(long dir_id); // can return a null pointer
int mount_par_group_conf;
int mount_par_group_lang_conf;
void PrintGroups();
private:
System * system;
// map[dir_id] -> GroupsWrap
typedef std::map<long, GroupsWrapItem> GroupsWrap;
GroupsWrap groups_wrap;
ConfParser conf_parser;
std::vector<Item*> config_dir_tab;
Item config_file;
void MarkAllGroupsToDelete();
void DeleteAllMarkedGroups();
bool GetConfContent(const std::wstring & path);
bool ParseGroupsConf(long mount_dir_id, const std::wstring & path);
bool ParseGroups(const std::wstring & str, Groups & groups);
void ReadGroupsConf(Mounts & mounts, bool skip_existing_configs);
};
}
#endif

119
plugins/groupitem/groups.cpp Executable file
View File

@ -0,0 +1,119 @@
/*
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2011, Tomasz Sowa
* All rights reserved.
*
*/
#include "groups.h"
#include "core/log.h"
namespace GroupItem
{
size_t Groups::AddGroup()
{
groups_tab.push_back(paths_names.size());
return groups_tab.size()-1;
}
void Groups::AddPath(const std::wstring & path)
{
if( groups_tab.empty() )
{
log << log1 << "GroupItem: cannot add a path (there are not any groups)" << logend;
return;
}
size_t group_index = groups_tab.size()-1;
std::pair<PathsMap::iterator, bool> res = paths_map.insert(std::make_pair(path, group_index));
if( !res.second )
return;
paths_names.push_back(&(res.first->first));
}
size_t Groups::Find(const std::wstring & path)
{
log << "mapa: " << logend;
PathsMap::iterator a = paths_map.begin();
for( ; a != paths_map.end() ; ++a )
{
log << a->first << " -> " << a->second << logend;
}
PathsMap::iterator i = paths_map.find(path);
if( i == paths_map.end() )
return groups_tab.size();
return i->second;
}
size_t Groups::Size()
{
return groups_tab.size();
}
size_t Groups::GroupSize(size_t group_index)
{
if( group_index >= groups_tab.size() )
return 0;
if( group_index+1 == groups_tab.size() )
return paths_names.size() - groups_tab[group_index];
return groups_tab[group_index+1] - groups_tab[group_index];
}
const std::wstring & Groups::GroupPath(size_t group_index, size_t path_index)
{
if( group_index >= groups_tab.size() )
return empty_str;
size_t index = groups_tab[group_index] + path_index;
if( index >= paths_names.size() )
return empty_str;
return *paths_names[index];
}
void Groups::Clear()
{
paths_map.clear();
groups_tab.clear();
paths_names.clear();
}
}

105
plugins/groupitem/groups.h Executable file
View File

@ -0,0 +1,105 @@
/*
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2011, Tomasz Sowa
* All rights reserved.
*
*/
#ifndef headerfile_winix_plugins_groupitem_groups
#define headerfile_winix_plugins_groupitem_groups
#include <map>
#include <vector>
#include <string>
namespace GroupItem
{
class Groups
{
public:
/*
adding a new group
this method returns a group index
*/
size_t AddGroup();
/*
adding a new path to the last group
*/
void AddPath(const std::wstring & path);
/*
finding a group which has the specified path
this method returns a group index
if there is not such a path everywhere then group size is returned
*/
size_t Find(const std::wstring & path);
/*
returning how many groups we have
*/
size_t Size();
/*
returning the size of the specified group
*/
size_t GroupSize(size_t group_index);
/*
returning a path of the specified group and position
or en empty string if indexes are out of ranges
*/
const std::wstring & GroupPath(size_t group_index, size_t path_index);
/*
removing all groups
*/
void Clear();
private:
/*
paths_map[L"path_name"] -> group index
*/
typedef std::map<std::wstring, size_t> PathsMap;
PathsMap paths_map;
/*
groups[group_index] -> index in paths_names
the group consists of elements from
groups_tab[groups_index] to groups_tab[groups_index+1] (without the last one)
*/
typedef std::vector<size_t> GroupsTab;
GroupsTab groups_tab;
/*
paths_names
*/
typedef std::vector<const std::wstring*> PathsNames;
PathsNames paths_names;
const std::wstring empty_str;
};
}
#endif

40
plugins/groupitem/init.cpp
View File

@ -6,10 +6,10 @@
* All rights reserved. * All rights reserved.
* *
*/ */
#include "core/log.h" #include "core/log.h"
#include "core/plugin.h" #include "core/plugin.h"
#include "groupinfo.h"
@ -18,15 +18,39 @@ extern "C" void Init(PluginInfo &);
namespace Groupitem namespace GroupItem
{ {
const wchar_t plugin_name[] = L"groupitem"; const wchar_t plugin_name[] = L"groupitem";
GroupInfo group_info;
void AddMountPar(PluginInfo & info)
{
group_info.mount_par_group_conf = info.system->mounts.AddMountPar(L"group_conf");
group_info.mount_par_group_lang_conf = info.system->mounts.AddMountPar(L"group_lang_conf");
}
void FstabChanged(PluginInfo & info)
{
group_info.ReadGroupsConfigs(true);
group_info.PrintGroups();
}
void ProcessRequest(PluginInfo & info)
{
if( info.cur->request->function == &info.functions->fun_reload )
{
if( info.cur->request->IsParam(L"groupitem") )
group_info.ReadGroupsConfigs(false);
}
}
void AddEzcFunctions(PluginInfo & info); void AddEzcFunctions(PluginInfo & info);
@ -39,10 +63,14 @@ void AddEzcFunctions(PluginInfo & info);
void Init(PluginInfo & info) void Init(PluginInfo & info)
{ {
using namespace Groupitem; using namespace GroupItem;
plugin.Assign(WINIX_TEMPLATES_CREATEFUNCTIONS, AddEzcFunctions); plugin.Assign(WINIX_TEMPLATES_CREATEFUNCTIONS, AddEzcFunctions);
plugin.Assign(WINIX_ADD_MOUNTS, AddMountPar);
plugin.Assign(WINIX_FSTAB_CHANGED, FstabChanged);
plugin.Assign(WINIX_PROCESS_REQUEST, ProcessRequest);
group_info.SetSystem(info.system);
info.p1 = (void*)(plugin_name); info.p1 = (void*)(plugin_name);
} }

54
plugins/groupitem/templates.cpp
View File

@ -9,16 +9,65 @@
#include "templates/templates.h" #include "templates/templates.h"
#include "core/plugin.h" #include "core/plugin.h"
#include "groupinfo.h"
namespace Groupitem namespace GroupItem
{ {
using namespace TemplatesFunctions; using namespace TemplatesFunctions;
using TemplatesFunctions::system; using TemplatesFunctions::system;
extern GroupInfo group_info;
static size_t group_tab_reqid = 0;
static bool group_tab_found = false;
static Groups * pgroups;
static size_t group_index;
static size_t group_tab_index;
static std::wstring group_last_path;
void group_tab_init(const std::wstring & path)
{
if( group_tab_reqid != cur->request->id || group_last_path != path)
{
group_tab_found = false;
group_tab_reqid = cur->request->id;
group_last_path = path;
pgroups = group_info.FindGroups(cur->request->dir_tab.back()->id);
if( pgroups )
{
group_tab_found = true;
group_index = pgroups->Find(path);
}
}
}
void group_tab(Info & i)
{
group_tab_init(i.par);
group_tab_index = i.iter;
if( group_tab_found )
i.res = group_tab_index < pgroups->GroupSize(group_index);
}
void group_tab_link(Info & i)
{
if( group_tab_found )
i.out << pgroups->GroupPath(group_index, group_tab_index);
}
void AddEzcFunctions(PluginInfo & info) void AddEzcFunctions(PluginInfo & info)
@ -26,7 +75,8 @@ void AddEzcFunctions(PluginInfo & info)
using TemplatesFunctions::EzcFun; using TemplatesFunctions::EzcFun;
EzcFun * fun = reinterpret_cast<EzcFun*>(info.p1); EzcFun * fun = reinterpret_cast<EzcFun*>(info.p1);
// fun->Insert("gallery_tab", gallery_tab); fun->Insert("group_tab", group_tab);
fun->Insert("group_tab_link", group_tab_link);
} }

114
plugins/menu/Makefile.dep
View File

@ -15,23 +15,23 @@ init.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h
init.o: ../../db/dbitemquery.h ../../core/item.h ../../db/dbitemcolumns.h init.o: ../../db/dbitemquery.h ../../core/item.h ../../db/dbitemcolumns.h
init.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h init.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
init.o: ../../core/ugcontainer.h ../../notify/notify.h init.o: ../../core/ugcontainer.h ../../notify/notify.h
init.o: ../../notify/notifypool.h ../../templates/misc.h init.o: ../../notify/notifypool.h ../../templates/patterns.h
init.o: ../../templates/localefilter.h ../../templates/locale.h init.o: ../../templates/locale.h ../../templates/localefilter.h
init.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.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/generator.h ../../../ezc/src/pattern.h
init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
init.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h init.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
init.o: ../../notify/notifythread.h ../../core/basethread.h init.o: ../../core/basethread.h ../../core/synchro.h
init.o: ../../core/synchro.h ../../notify/templatesnotify.h init.o: ../../notify/templatesnotify.h ../../core/config.h ../../core/users.h
init.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
init.o: ../../core/lastcontainer.h ../../core/mounts.h init.o: ../../templates/misc.h ../../templates/htmltextstream.h
init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h init.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h
init.o: ../../core/users.h ../../core/groups.h ../../core/group.h init.o: ../../core/run.h ../../core/users.h ../../core/groups.h
init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h init.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h
init.o: ../../core/threadmanager.h ../../core/sessionmanager.h init.o: ../../core/basethread.h ../../core/threadmanager.h
init.o: ../../core/sessioncontainer.h ../../functions/functions.h init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
init.o: ../../functions/functionbase.h ../../core/request.h init.o: ../../functions/functions.h ../../functions/functionbase.h
init.o: ../../core/system.h ../../core/synchro.h init.o: ../../core/request.h ../../core/system.h ../../core/synchro.h
init.o: ../../functions/functionparser.h ../../core/cur.h init.o: ../../functions/functionparser.h ../../core/cur.h
init.o: ../../functions/adduser.h ../../functions/cat.h init.o: ../../functions/adduser.h ../../functions/cat.h
init.o: ../../functions/chmod.h ../../functions/privchanger.h init.o: ../../functions/chmod.h ../../functions/privchanger.h
@ -50,7 +50,8 @@ init.o: ../../functions/tinymce.h ../../functions/uname.h
init.o: ../../functions/upload.h ../../functions/uptime.h init.o: ../../functions/upload.h ../../functions/uptime.h
init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h
init.o: ../../templates/templates.h ../../templates/patterncacher.h init.o: ../../templates/templates.h ../../templates/patterncacher.h
init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h init.o: ../../templates/indexpatterns.h ../../templates/patterns.h
init.o: ../../templates/changepatterns.h ../../core/sessionmanager.h
templates.o: ../../templates/templates.h ../../../ezc/src/ezc.h templates.o: ../../templates/templates.h ../../../ezc/src/ezc.h
templates.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h templates.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
templates.o: ../../../ezc/src/pattern.h ../../core/item.h templates.o: ../../../ezc/src/pattern.h ../../core/item.h
@ -58,50 +59,53 @@ templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
templates.o: ../../../ezc/src/stringconv.h ../../core/misc.h templates.o: ../../../ezc/src/stringconv.h ../../core/misc.h
templates.o: ../../core/requesttypes.h ../../templates/patterncacher.h templates.o: ../../core/requesttypes.h ../../templates/patterncacher.h
templates.o: ../../core/item.h ../../templates/indexpatterns.h templates.o: ../../core/item.h ../../templates/indexpatterns.h
templates.o: ../../templates/localefilter.h ../../templates/locale.h templates.o: ../../templates/patterns.h ../../templates/locale.h
templates.o: ../../core/config.h ../../templates/htmltextstream.h templates.o: ../../templates/changepatterns.h
templates.o: ../../core/cur.h ../../core/system.h ../../core/sessionmanager.h templates.o: ../../templates/htmltextstream.h ../../templates/localefilter.h
templates.o: ../../core/htmlfilter.h ../../db/db.h ../../db/dbbase.h templates.o: ../../core/config.h ../../core/cur.h ../../core/system.h
templates.o: ../../db/dbconn.h ../../db/dbtextstream.h templates.o: ../../core/sessionmanager.h ../../core/htmlfilter.h
templates.o: ../../core/textstream.h ../../core/error.h templates.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
templates.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h templates.o: ../../db/dbtextstream.h ../../core/textstream.h
templates.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h templates.o: ../../core/error.h ../../db/dbitemquery.h
templates.o: ../../core/ugcontainer.h ../../core/log.h ../../core/plugin.h templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
templates.o: ../../core/pluginmsg.h ../../core/plugindata.h templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
templates.o: ../../core/config.h ../../core/confparser.h templates.o: ../../core/log.h ../../core/plugin.h ../../core/pluginmsg.h
templates.o: ../../core/htmlfilter.h ../../core/request.h ../../core/error.h templates.o: ../../core/plugindata.h ../../core/config.h
templates.o: ../../core/textstream.h ../../templates/htmltextstream.h templates.o: ../../core/confparser.h ../../core/htmlfilter.h
templates.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h templates.o: ../../core/request.h ../../core/error.h ../../core/textstream.h
templates.o: ../../templates/htmltextstream.h ../../core/system.h
templates.o: ../../core/dirs.h ../../core/dircontainer.h
templates.o: ../../notify/notify.h ../../notify/notifypool.h templates.o: ../../notify/notify.h ../../notify/notifypool.h
templates.o: ../../templates/locale.h ../../core/confparser.h templates.o: ../../templates/locale.h ../../core/confparser.h
templates.o: ../../templates/misc.h ../../notify/notifythread.h templates.o: ../../templates/patterns.h ../../notify/notifythread.h
templates.o: ../../core/basethread.h ../../core/synchro.h templates.o: ../../core/basethread.h ../../core/synchro.h
templates.o: ../../notify/templatesnotify.h ../../core/users.h templates.o: ../../notify/templatesnotify.h ../../core/users.h
templates.o: ../../core/user.h ../../core/ugcontainer.h templates.o: ../../core/user.h ../../core/ugcontainer.h
templates.o: ../../core/lastcontainer.h ../../core/cur.h ../../core/session.h templates.o: ../../core/lastcontainer.h ../../core/cur.h ../../core/session.h
templates.o: ../../core/rebus.h ../../core/mount.h ../../core/mounts.h templates.o: ../../core/rebus.h ../../core/mount.h ../../templates/misc.h
templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h templates.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h
templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h templates.o: ../../core/run.h ../../core/users.h ../../core/groups.h
templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h templates.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h
templates.o: ../../core/threadmanager.h ../../core/sessionmanager.h templates.o: ../../core/basethread.h ../../core/threadmanager.h
templates.o: ../../core/sessioncontainer.h ../../functions/functions.h templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
templates.o: ../../functions/functionbase.h ../../core/request.h templates.o: ../../functions/functions.h ../../functions/functionbase.h
templates.o: ../../core/synchro.h ../../functions/functionparser.h templates.o: ../../core/request.h ../../core/synchro.h
templates.o: ../../functions/adduser.h ../../functions/cat.h templates.o: ../../functions/functionparser.h ../../functions/adduser.h
templates.o: ../../functions/chmod.h ../../functions/privchanger.h templates.o: ../../functions/cat.h ../../functions/chmod.h
templates.o: ../../functions/chown.h ../../functions/ckeditor.h templates.o: ../../functions/privchanger.h ../../functions/chown.h
templates.o: ../../functions/cp.h ../../functions/default.h templates.o: ../../functions/ckeditor.h ../../functions/cp.h
templates.o: ../../functions/download.h ../../functions/emacs.h templates.o: ../../functions/default.h ../../functions/download.h
templates.o: ../../functions/last.h ../../functions/login.h templates.o: ../../functions/emacs.h ../../functions/last.h
templates.o: ../../functions/logout.h ../../functions/ln.h templates.o: ../../functions/login.h ../../functions/logout.h
templates.o: ../../functions/ls.h ../../functions/mkdir.h templates.o: ../../functions/ln.h ../../functions/ls.h
templates.o: ../../functions/mv.h ../../functions/nicedit.h templates.o: ../../functions/mkdir.h ../../functions/mv.h
templates.o: ../../functions/node.h ../../functions/passwd.h templates.o: ../../functions/nicedit.h ../../functions/node.h
templates.o: ../../functions/priv.h ../../functions/reload.h templates.o: ../../functions/passwd.h ../../functions/priv.h
templates.o: ../../functions/rm.h ../../functions/sort.h templates.o: ../../functions/reload.h ../../functions/rm.h
templates.o: ../../functions/specialdefault.h ../../functions/stat.h templates.o: ../../functions/sort.h ../../functions/specialdefault.h
templates.o: ../../functions/subject.h ../../functions/template.h templates.o: ../../functions/stat.h ../../functions/subject.h
templates.o: ../../functions/tinymce.h ../../functions/uname.h templates.o: ../../functions/template.h ../../functions/tinymce.h
templates.o: ../../functions/upload.h ../../functions/uptime.h templates.o: ../../functions/uname.h ../../functions/upload.h
templates.o: ../../functions/who.h ../../functions/vim.h ../../core/log.h templates.o: ../../functions/uptime.h ../../functions/who.h
templates.o: ../../functions/vim.h ../../core/log.h
templates.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/misc.h templates.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/misc.h

52
plugins/stats/Makefile.dep
View File

@ -17,24 +17,25 @@ init.o: ../../core/group.h ../../core/dircontainer.h ../../core/ugcontainer.h
init.o: ../../core/log.h bot.h stats.h templates.h ../../core/plugin.h init.o: ../../core/log.h bot.h stats.h templates.h ../../core/plugin.h
init.o: ../../core/pluginmsg.h ../../core/system.h ../../core/dirs.h init.o: ../../core/pluginmsg.h ../../core/system.h ../../core/dirs.h
init.o: ../../core/dircontainer.h ../../notify/notify.h init.o: ../../core/dircontainer.h ../../notify/notify.h
init.o: ../../notify/notifypool.h ../../templates/misc.h init.o: ../../notify/notifypool.h ../../templates/patterns.h
init.o: ../../templates/localefilter.h ../../templates/locale.h init.o: ../../templates/locale.h ../../templates/localefilter.h
init.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.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/generator.h ../../../ezc/src/pattern.h
init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
init.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h init.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
init.o: ../../notify/notifythread.h ../../core/basethread.h init.o: ../../core/basethread.h ../../core/synchro.h
init.o: ../../core/synchro.h ../../notify/templatesnotify.h init.o: ../../notify/templatesnotify.h ../../core/users.h
init.o: ../../core/users.h ../../core/ugcontainer.h init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
init.o: ../../core/lastcontainer.h ../../core/mounts.h init.o: ../../templates/misc.h ../../templates/htmltextstream.h
init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h init.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h
init.o: ../../core/users.h ../../core/groups.h ../../core/group.h init.o: ../../core/run.h ../../core/users.h ../../core/groups.h
init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h init.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h
init.o: ../../core/threadmanager.h ../../core/sessionmanager.h init.o: ../../core/basethread.h ../../core/threadmanager.h
init.o: ../../core/sessioncontainer.h ../../functions/functions.h init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
init.o: ../../functions/functionbase.h ../../core/system.h init.o: ../../functions/functions.h ../../functions/functionbase.h
init.o: ../../core/synchro.h ../../functions/functionparser.h init.o: ../../core/system.h ../../core/synchro.h
init.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h init.o: ../../functions/functionparser.h ../../core/cur.h
init.o: ../../functions/adduser.h ../../functions/cat.h
init.o: ../../functions/chmod.h ../../functions/privchanger.h init.o: ../../functions/chmod.h ../../functions/privchanger.h
init.o: ../../functions/chown.h ../../functions/ckeditor.h init.o: ../../functions/chown.h ../../functions/ckeditor.h
init.o: ../../functions/cp.h ../../functions/default.h init.o: ../../functions/cp.h ../../functions/default.h
@ -51,7 +52,8 @@ init.o: ../../functions/tinymce.h ../../functions/uname.h
init.o: ../../functions/upload.h ../../functions/uptime.h init.o: ../../functions/upload.h ../../functions/uptime.h
init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h
init.o: ../../templates/templates.h ../../templates/patterncacher.h init.o: ../../templates/templates.h ../../templates/patterncacher.h
init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h init.o: ../../templates/indexpatterns.h ../../templates/patterns.h
init.o: ../../templates/changepatterns.h ../../core/sessionmanager.h
init.o: statssession.h ../../core/plugindata.h init.o: statssession.h ../../core/plugindata.h
stats.o: stats.h ../../core/config.h ../../core/log.h ../../core/textstream.h stats.o: stats.h ../../core/config.h ../../core/log.h ../../core/textstream.h
stats.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h stats.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
@ -76,17 +78,18 @@ templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
templates.o: ../../notify/notify.h ../../notify/notifypool.h templates.o: ../../notify/notify.h ../../notify/notifypool.h
templates.o: ../../templates/locale.h ../../core/confparser.h templates.o: ../../templates/locale.h ../../core/confparser.h
templates.o: ../../templates/misc.h ../../templates/localefilter.h templates.o: ../../templates/patterns.h ../../templates/locale.h
templates.o: ../../templates/locale.h ../../../ezc/src/ezc.h templates.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
templates.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h templates.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
templates.o: ../../templates/htmltextstream.h ../../notify/notifythread.h templates.o: ../../notify/notifythread.h ../../core/basethread.h
templates.o: ../../core/basethread.h ../../core/synchro.h templates.o: ../../core/synchro.h ../../notify/templatesnotify.h
templates.o: ../../notify/templatesnotify.h ../../core/config.h templates.o: ../../core/config.h ../../core/users.h ../../core/user.h
templates.o: ../../core/users.h ../../core/user.h ../../core/ugcontainer.h templates.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
templates.o: ../../core/lastcontainer.h ../../core/cur.h ../../core/session.h templates.o: ../../core/cur.h ../../core/session.h ../../core/rebus.h
templates.o: ../../core/rebus.h ../../core/mount.h ../../core/mounts.h templates.o: ../../core/mount.h ../../templates/misc.h
templates.o: ../../templates/htmltextstream.h ../../core/mounts.h
templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.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/users.h ../../core/groups.h ../../core/group.h
templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h
@ -114,4 +117,5 @@ templates.o: ../../functions/upload.h ../../functions/uptime.h
templates.o: ../../functions/who.h ../../functions/vim.h templates.o: ../../functions/who.h ../../functions/vim.h
templates.o: ../../core/htmlfilter.h ../../templates/templates.h templates.o: ../../core/htmlfilter.h ../../templates/templates.h
templates.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h templates.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h
templates.o: ../../templates/patterns.h ../../templates/changepatterns.h
templates.o: ../../core/sessionmanager.h ../../core/misc.h stats.h templates.o: ../../core/sessionmanager.h ../../core/misc.h stats.h

174
plugins/thread/Makefile.dep
View File

@ -19,22 +19,23 @@ createthread.o: ../../templates/locale.h ../../core/confparser.h
createthread.o: ../../core/request.h ../../core/config.h ../../core/system.h createthread.o: ../../core/request.h ../../core/config.h ../../core/system.h
createthread.o: ../../core/dirs.h ../../core/dircontainer.h createthread.o: ../../core/dirs.h ../../core/dircontainer.h
createthread.o: ../../notify/notify.h ../../notify/notifypool.h createthread.o: ../../notify/notify.h ../../notify/notifypool.h
createthread.o: ../../templates/misc.h ../../templates/localefilter.h createthread.o: ../../templates/patterns.h ../../templates/locale.h
createthread.o: ../../templates/locale.h ../../../ezc/src/ezc.h createthread.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
createthread.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h createthread.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
createthread.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h createthread.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
createthread.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h createthread.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
createthread.o: ../../templates/htmltextstream.h ../../notify/notifythread.h createthread.o: ../../notify/notifythread.h ../../core/basethread.h
createthread.o: ../../core/basethread.h ../../core/synchro.h createthread.o: ../../core/synchro.h ../../notify/templatesnotify.h
createthread.o: ../../notify/templatesnotify.h ../../core/users.h createthread.o: ../../core/users.h ../../core/ugcontainer.h
createthread.o: ../../core/ugcontainer.h ../../core/lastcontainer.h createthread.o: ../../core/lastcontainer.h ../../templates/misc.h
createthread.o: ../../core/mounts.h ../../core/mountparser.h createthread.o: ../../templates/htmltextstream.h ../../core/mounts.h
createthread.o: ../../core/crypt.h ../../core/run.h ../../core/users.h createthread.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
createthread.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h createthread.o: ../../core/users.h ../../core/groups.h ../../core/group.h
createthread.o: ../../core/thumb.h ../../core/basethread.h createthread.o: ../../core/loadavg.h ../../core/thumb.h
createthread.o: ../../core/threadmanager.h ../../core/synchro.h tdb.h createthread.o: ../../core/basethread.h ../../core/threadmanager.h
createthread.o: thread.h ../../db/dbbase.h threadinfo.h createthread.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h
createthread.o: ../../functions/functions.h ../../functions/functionbase.h createthread.o: threadinfo.h ../../functions/functions.h
createthread.o: ../../functions/functionbase.h
createthread.o: ../../functions/functionparser.h ../../core/cur.h createthread.o: ../../functions/functionparser.h ../../core/cur.h
createthread.o: ../../functions/adduser.h ../../functions/cat.h createthread.o: ../../functions/adduser.h ../../functions/cat.h
createthread.o: ../../functions/chmod.h ../../functions/privchanger.h createthread.o: ../../functions/chmod.h ../../functions/privchanger.h
@ -71,21 +72,21 @@ funthread.o: ../../core/mount.h ../../templates/locale.h
funthread.o: ../../core/confparser.h ../../core/request.h ../../core/config.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: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h
funthread.o: ../../notify/notify.h ../../notify/notifypool.h funthread.o: ../../notify/notify.h ../../notify/notifypool.h
funthread.o: ../../templates/misc.h ../../templates/localefilter.h funthread.o: ../../templates/patterns.h ../../templates/locale.h
funthread.o: ../../templates/locale.h ../../../ezc/src/ezc.h funthread.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
funthread.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h funthread.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
funthread.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h funthread.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
funthread.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h funthread.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
funthread.o: ../../templates/htmltextstream.h ../../notify/notifythread.h funthread.o: ../../notify/notifythread.h ../../core/basethread.h
funthread.o: ../../core/basethread.h ../../core/synchro.h funthread.o: ../../core/synchro.h ../../notify/templatesnotify.h
funthread.o: ../../notify/templatesnotify.h ../../core/users.h funthread.o: ../../core/users.h ../../core/ugcontainer.h
funthread.o: ../../core/ugcontainer.h ../../core/lastcontainer.h funthread.o: ../../core/lastcontainer.h ../../templates/misc.h
funthread.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h funthread.o: ../../templates/htmltextstream.h ../../core/mounts.h
funthread.o: ../../core/run.h ../../core/users.h ../../core/groups.h funthread.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
funthread.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h funthread.o: ../../core/users.h ../../core/groups.h ../../core/group.h
funthread.o: ../../core/basethread.h ../../core/threadmanager.h funthread.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h
funthread.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h funthread.o: ../../core/threadmanager.h ../../core/synchro.h tdb.h thread.h
funthread.o: threadinfo.h funthread.o: ../../db/dbbase.h threadinfo.h
init.o: tdb.h thread.h ../../db/dbbase.h ../../core/error.h reply.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: ../../functions/functionbase.h ../../core/item.h ../../db/db.h
init.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h init.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
@ -102,25 +103,26 @@ 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/confparser.h ../../core/request.h ../../core/config.h
init.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h init.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h
init.o: ../../notify/notify.h ../../notify/notifypool.h init.o: ../../notify/notify.h ../../notify/notifypool.h
init.o: ../../templates/misc.h ../../templates/localefilter.h init.o: ../../templates/patterns.h ../../templates/locale.h
init.o: ../../templates/locale.h ../../../ezc/src/ezc.h init.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
init.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.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/pattern.h ../../../ezc/src/functions.h
init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
init.o: ../../templates/htmltextstream.h ../../notify/notifythread.h init.o: ../../notify/notifythread.h ../../core/basethread.h
init.o: ../../core/basethread.h ../../core/synchro.h init.o: ../../core/synchro.h ../../notify/templatesnotify.h
init.o: ../../notify/templatesnotify.h ../../core/users.h init.o: ../../core/users.h ../../core/ugcontainer.h
init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h init.o: ../../core/lastcontainer.h ../../templates/misc.h
init.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h init.o: ../../templates/htmltextstream.h ../../core/mounts.h
init.o: ../../core/run.h ../../core/users.h ../../core/groups.h init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
init.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h init.o: ../../core/users.h ../../core/groups.h ../../core/group.h
init.o: ../../core/basethread.h ../../core/threadmanager.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: ../../core/threadmanager.h ../../core/synchro.h threadinfo.h
init.o: showthreads.h ../../core/log.h ../../core/plugin.h pluginmsg.h init.o: funthread.h createthread.h showthreads.h ../../core/log.h
init.o: ../../core/system.h ../../core/sessionmanager.h init.o: ../../core/plugin.h pluginmsg.h ../../core/system.h
init.o: ../../core/sessioncontainer.h ../../functions/functions.h init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
init.o: ../../functions/functionbase.h ../../functions/functionparser.h init.o: ../../functions/functions.h ../../functions/functionbase.h
init.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h init.o: ../../functions/functionparser.h ../../core/cur.h
init.o: ../../functions/adduser.h ../../functions/cat.h
init.o: ../../functions/chmod.h ../../functions/privchanger.h init.o: ../../functions/chmod.h ../../functions/privchanger.h
init.o: ../../functions/chown.h ../../functions/ckeditor.h init.o: ../../functions/chown.h ../../functions/ckeditor.h
init.o: ../../functions/cp.h ../../functions/default.h init.o: ../../functions/cp.h ../../functions/default.h
@ -137,7 +139,8 @@ init.o: ../../functions/tinymce.h ../../functions/uname.h
init.o: ../../functions/upload.h ../../functions/uptime.h init.o: ../../functions/upload.h ../../functions/uptime.h
init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h
init.o: ../../templates/templates.h ../../templates/patterncacher.h init.o: ../../templates/templates.h ../../templates/patterncacher.h
init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h init.o: ../../templates/indexpatterns.h ../../templates/patterns.h
init.o: ../../templates/changepatterns.h ../../core/sessionmanager.h
init.o: templates.h init.o: templates.h
reply.o: reply.h ../../functions/functionbase.h ../../core/item.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/db.h ../../db/dbbase.h ../../db/dbconn.h
@ -154,23 +157,24 @@ reply.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h
reply.o: ../../core/mount.h ../../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/request.h ../../core/config.h ../../core/system.h
reply.o: ../../core/dirs.h ../../core/dircontainer.h ../../notify/notify.h reply.o: ../../core/dirs.h ../../core/dircontainer.h ../../notify/notify.h
reply.o: ../../notify/notifypool.h ../../templates/misc.h reply.o: ../../notify/notifypool.h ../../templates/patterns.h
reply.o: ../../templates/localefilter.h ../../templates/locale.h reply.o: ../../templates/locale.h ../../templates/localefilter.h
reply.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h reply.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h
reply.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h reply.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
reply.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h reply.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
reply.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h reply.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
reply.o: ../../notify/notifythread.h ../../core/basethread.h reply.o: ../../core/basethread.h ../../core/synchro.h
reply.o: ../../core/synchro.h ../../notify/templatesnotify.h reply.o: ../../notify/templatesnotify.h ../../core/users.h
reply.o: ../../core/users.h ../../core/ugcontainer.h reply.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
reply.o: ../../core/lastcontainer.h ../../core/mounts.h reply.o: ../../templates/misc.h ../../templates/htmltextstream.h
reply.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h reply.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h
reply.o: ../../core/users.h ../../core/groups.h ../../core/group.h reply.o: ../../core/run.h ../../core/users.h ../../core/groups.h
reply.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h reply.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h
reply.o: ../../core/threadmanager.h ../../core/synchro.h tdb.h thread.h reply.o: ../../core/basethread.h ../../core/threadmanager.h
reply.o: ../../db/dbbase.h threadinfo.h ../../functions/functions.h reply.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h threadinfo.h
reply.o: ../../functions/functionbase.h ../../functions/functionparser.h reply.o: ../../functions/functions.h ../../functions/functionbase.h
reply.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h reply.o: ../../functions/functionparser.h ../../core/cur.h
reply.o: ../../functions/adduser.h ../../functions/cat.h
reply.o: ../../functions/chmod.h ../../functions/privchanger.h reply.o: ../../functions/chmod.h ../../functions/privchanger.h
reply.o: ../../functions/chown.h ../../functions/ckeditor.h reply.o: ../../functions/chown.h ../../functions/ckeditor.h
reply.o: ../../functions/cp.h ../../functions/default.h reply.o: ../../functions/cp.h ../../functions/default.h
@ -190,6 +194,7 @@ reply.o: ../../core/misc.h ../../core/plugin.h pluginmsg.h
reply.o: ../../core/system.h ../../core/sessionmanager.h reply.o: ../../core/system.h ../../core/sessionmanager.h
reply.o: ../../core/sessioncontainer.h ../../templates/templates.h reply.o: ../../core/sessioncontainer.h ../../templates/templates.h
reply.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h reply.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h
reply.o: ../../templates/patterns.h ../../templates/changepatterns.h
reply.o: ../../core/sessionmanager.h reply.o: ../../core/sessionmanager.h
showthreads.o: showthreads.h ../../functions/functionbase.h ../../core/item.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/db.h ../../db/dbbase.h ../../db/dbconn.h
@ -208,22 +213,22 @@ showthreads.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
showthreads.o: ../../core/confparser.h ../../core/request.h showthreads.o: ../../core/confparser.h ../../core/request.h
showthreads.o: ../../core/config.h ../../core/system.h ../../core/dirs.h showthreads.o: ../../core/config.h ../../core/system.h ../../core/dirs.h
showthreads.o: ../../core/dircontainer.h ../../notify/notify.h showthreads.o: ../../core/dircontainer.h ../../notify/notify.h
showthreads.o: ../../notify/notifypool.h ../../templates/misc.h showthreads.o: ../../notify/notifypool.h ../../templates/patterns.h
showthreads.o: ../../templates/localefilter.h ../../templates/locale.h showthreads.o: ../../templates/locale.h ../../templates/localefilter.h
showthreads.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h showthreads.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h
showthreads.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h showthreads.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
showthreads.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h showthreads.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
showthreads.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h showthreads.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
showthreads.o: ../../notify/notifythread.h ../../core/basethread.h showthreads.o: ../../core/basethread.h ../../core/synchro.h
showthreads.o: ../../core/synchro.h ../../notify/templatesnotify.h showthreads.o: ../../notify/templatesnotify.h ../../core/users.h
showthreads.o: ../../core/users.h ../../core/ugcontainer.h showthreads.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
showthreads.o: ../../core/lastcontainer.h ../../core/mounts.h showthreads.o: ../../templates/misc.h ../../templates/htmltextstream.h
showthreads.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h showthreads.o: ../../core/mounts.h ../../core/mountparser.h
showthreads.o: ../../core/users.h ../../core/groups.h ../../core/group.h showthreads.o: ../../core/crypt.h ../../core/run.h ../../core/users.h
showthreads.o: ../../core/loadavg.h ../../core/thumb.h showthreads.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h
showthreads.o: ../../core/basethread.h ../../core/threadmanager.h showthreads.o: ../../core/thumb.h ../../core/basethread.h
showthreads.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h showthreads.o: ../../core/threadmanager.h ../../core/synchro.h tdb.h thread.h
showthreads.o: threadinfo.h showthreads.o: ../../db/dbbase.h threadinfo.h
tdb.o: tdb.h thread.h ../../db/dbbase.h ../../core/error.h ../../core/log.h tdb.o: tdb.h thread.h ../../db/dbbase.h ../../core/error.h ../../core/log.h
templates.o: threadinfo.h ../../core/item.h ../../core/system.h templates.o: threadinfo.h ../../core/item.h ../../core/system.h
templates.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h templates.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
@ -240,16 +245,17 @@ templates.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
templates.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h templates.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
templates.o: ../../core/rebus.h ../../core/mount.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: ../../core/confparser.h ../../notify/notify.h
templates.o: ../../notify/notifypool.h ../../templates/misc.h templates.o: ../../notify/notifypool.h ../../templates/patterns.h
templates.o: ../../templates/localefilter.h ../../templates/locale.h templates.o: ../../templates/locale.h ../../templates/localefilter.h
templates.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h templates.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h
templates.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h templates.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
templates.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h templates.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
templates.o: ../../notify/notifythread.h ../../core/basethread.h templates.o: ../../core/basethread.h ../../core/synchro.h
templates.o: ../../core/synchro.h ../../notify/templatesnotify.h templates.o: ../../notify/templatesnotify.h ../../core/config.h
templates.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h templates.o: ../../core/users.h ../../core/ugcontainer.h
templates.o: ../../core/lastcontainer.h ../../core/mounts.h templates.o: ../../core/lastcontainer.h ../../templates/misc.h
templates.o: ../../templates/htmltextstream.h ../../core/mounts.h
templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.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/users.h ../../core/groups.h ../../core/group.h
templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h
@ -279,6 +285,7 @@ templates.o: ../../functions/upload.h ../../functions/uptime.h
templates.o: ../../functions/who.h ../../functions/vim.h templates.o: ../../functions/who.h ../../functions/vim.h
templates.o: ../../core/htmlfilter.h ../../templates/templates.h templates.o: ../../core/htmlfilter.h ../../templates/templates.h
templates.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h templates.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h
templates.o: ../../templates/patterns.h ../../templates/changepatterns.h
templates.o: ../../core/sessionmanager.h templates.o: ../../core/sessionmanager.h
threadinfo.o: threadinfo.h ../../core/item.h ../../core/system.h threadinfo.o: threadinfo.h ../../core/item.h ../../core/system.h
threadinfo.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h threadinfo.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
@ -295,16 +302,17 @@ threadinfo.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
threadinfo.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h threadinfo.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
threadinfo.o: ../../core/rebus.h ../../core/mount.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: ../../core/confparser.h ../../notify/notify.h
threadinfo.o: ../../notify/notifypool.h ../../templates/misc.h threadinfo.o: ../../notify/notifypool.h ../../templates/patterns.h
threadinfo.o: ../../templates/localefilter.h ../../templates/locale.h threadinfo.o: ../../templates/locale.h ../../templates/localefilter.h
threadinfo.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h threadinfo.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h
threadinfo.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h threadinfo.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
threadinfo.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h threadinfo.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
threadinfo.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h threadinfo.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
threadinfo.o: ../../notify/notifythread.h ../../core/basethread.h threadinfo.o: ../../core/basethread.h ../../core/synchro.h
threadinfo.o: ../../core/synchro.h ../../notify/templatesnotify.h threadinfo.o: ../../notify/templatesnotify.h ../../core/config.h
threadinfo.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h threadinfo.o: ../../core/users.h ../../core/ugcontainer.h
threadinfo.o: ../../core/lastcontainer.h ../../core/mounts.h threadinfo.o: ../../core/lastcontainer.h ../../templates/misc.h
threadinfo.o: ../../templates/htmltextstream.h ../../core/mounts.h
threadinfo.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.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/users.h ../../core/groups.h ../../core/group.h
threadinfo.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h threadinfo.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h

147
plugins/ticket/Makefile.dep
View File

@ -19,22 +19,22 @@ createticket.o: ../../templates/locale.h ../../core/confparser.h
createticket.o: ../../core/request.h ../../core/config.h ../../core/system.h createticket.o: ../../core/request.h ../../core/config.h ../../core/system.h
createticket.o: ../../core/dirs.h ../../core/dircontainer.h createticket.o: ../../core/dirs.h ../../core/dircontainer.h
createticket.o: ../../notify/notify.h ../../notify/notifypool.h createticket.o: ../../notify/notify.h ../../notify/notifypool.h
createticket.o: ../../templates/misc.h ../../templates/localefilter.h createticket.o: ../../templates/patterns.h ../../templates/locale.h
createticket.o: ../../templates/locale.h ../../../ezc/src/ezc.h createticket.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
createticket.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h createticket.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
createticket.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h createticket.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
createticket.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h createticket.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
createticket.o: ../../templates/htmltextstream.h ../../notify/notifythread.h createticket.o: ../../notify/notifythread.h ../../core/basethread.h
createticket.o: ../../core/basethread.h ../../core/synchro.h createticket.o: ../../core/synchro.h ../../notify/templatesnotify.h
createticket.o: ../../notify/templatesnotify.h ../../core/users.h createticket.o: ../../core/users.h ../../core/ugcontainer.h
createticket.o: ../../core/ugcontainer.h ../../core/lastcontainer.h createticket.o: ../../core/lastcontainer.h ../../templates/misc.h
createticket.o: ../../core/mounts.h ../../core/mountparser.h createticket.o: ../../templates/htmltextstream.h ../../core/mounts.h
createticket.o: ../../core/crypt.h ../../core/run.h ../../core/users.h createticket.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
createticket.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h createticket.o: ../../core/users.h ../../core/groups.h ../../core/group.h
createticket.o: ../../core/thumb.h ../../core/basethread.h createticket.o: ../../core/loadavg.h ../../core/thumb.h
createticket.o: ../../core/threadmanager.h ../../core/synchro.h ticketinfo.h createticket.o: ../../core/basethread.h ../../core/threadmanager.h
createticket.o: ticketparser.h ticketconf.h ../../functions/functions.h createticket.o: ../../core/synchro.h ticketinfo.h ticketparser.h ticketconf.h
createticket.o: ../../functions/functionbase.h createticket.o: ../../functions/functions.h ../../functions/functionbase.h
createticket.o: ../../functions/functionparser.h ../../core/cur.h createticket.o: ../../functions/functionparser.h ../../core/cur.h
createticket.o: ../../functions/adduser.h ../../functions/cat.h createticket.o: ../../functions/adduser.h ../../functions/cat.h
createticket.o: ../../functions/chmod.h ../../functions/privchanger.h createticket.o: ../../functions/chmod.h ../../functions/privchanger.h
@ -71,16 +71,17 @@ editticket.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
editticket.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h editticket.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
editticket.o: ../../core/rebus.h ../../core/mount.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: ../../core/confparser.h ../../notify/notify.h
editticket.o: ../../notify/notifypool.h ../../templates/misc.h editticket.o: ../../notify/notifypool.h ../../templates/patterns.h
editticket.o: ../../templates/localefilter.h ../../templates/locale.h editticket.o: ../../templates/locale.h ../../templates/localefilter.h
editticket.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h editticket.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h
editticket.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h editticket.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
editticket.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h editticket.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
editticket.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h editticket.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
editticket.o: ../../notify/notifythread.h ../../core/basethread.h editticket.o: ../../core/basethread.h ../../core/synchro.h
editticket.o: ../../core/synchro.h ../../notify/templatesnotify.h editticket.o: ../../notify/templatesnotify.h ../../core/config.h
editticket.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h editticket.o: ../../core/users.h ../../core/ugcontainer.h
editticket.o: ../../core/lastcontainer.h ../../core/mounts.h editticket.o: ../../core/lastcontainer.h ../../templates/misc.h
editticket.o: ../../templates/htmltextstream.h ../../core/mounts.h
editticket.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.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/users.h ../../core/groups.h ../../core/group.h
editticket.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h editticket.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h
@ -123,16 +124,17 @@ funticket.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
funticket.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h funticket.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
funticket.o: ../../core/rebus.h ../../core/mount.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: ../../core/confparser.h ../../notify/notify.h
funticket.o: ../../notify/notifypool.h ../../templates/misc.h funticket.o: ../../notify/notifypool.h ../../templates/patterns.h
funticket.o: ../../templates/localefilter.h ../../templates/locale.h funticket.o: ../../templates/locale.h ../../templates/localefilter.h
funticket.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h funticket.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h
funticket.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h funticket.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
funticket.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h funticket.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
funticket.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h funticket.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
funticket.o: ../../notify/notifythread.h ../../core/basethread.h funticket.o: ../../core/basethread.h ../../core/synchro.h
funticket.o: ../../core/synchro.h ../../notify/templatesnotify.h funticket.o: ../../notify/templatesnotify.h ../../core/config.h
funticket.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h funticket.o: ../../core/users.h ../../core/ugcontainer.h
funticket.o: ../../core/lastcontainer.h ../../core/mounts.h funticket.o: ../../core/lastcontainer.h ../../templates/misc.h
funticket.o: ../../templates/htmltextstream.h ../../core/mounts.h
funticket.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.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/users.h ../../core/groups.h ../../core/group.h
funticket.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h funticket.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h
@ -160,7 +162,8 @@ funticket.o: ../../functions/functionbase.h ../../core/synchro.h
funticket.o: ../../core/plugin.h pluginmsg.h ../../core/system.h funticket.o: ../../core/plugin.h pluginmsg.h ../../core/system.h
funticket.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h funticket.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
funticket.o: ../../templates/templates.h ../../templates/patterncacher.h funticket.o: ../../templates/templates.h ../../templates/patterncacher.h
funticket.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h funticket.o: ../../templates/indexpatterns.h ../../templates/patterns.h
funticket.o: ../../templates/changepatterns.h ../../core/sessionmanager.h
funticket.o: ../../plugins/thread/pluginmsg.h funticket.o: ../../plugins/thread/pluginmsg.h
init.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.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: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
@ -177,22 +180,23 @@ init.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
init.o: ../../core/session.h ../../core/user.h ../../core/plugindata.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/rebus.h ../../core/mount.h ../../templates/locale.h
init.o: ../../core/confparser.h ../../notify/notify.h init.o: ../../core/confparser.h ../../notify/notify.h
init.o: ../../notify/notifypool.h ../../templates/misc.h init.o: ../../notify/notifypool.h ../../templates/patterns.h
init.o: ../../templates/localefilter.h ../../templates/locale.h init.o: ../../templates/locale.h ../../templates/localefilter.h
init.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.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/generator.h ../../../ezc/src/pattern.h
init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
init.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h init.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
init.o: ../../notify/notifythread.h ../../core/basethread.h init.o: ../../core/basethread.h ../../core/synchro.h
init.o: ../../core/synchro.h ../../notify/templatesnotify.h init.o: ../../notify/templatesnotify.h ../../core/config.h ../../core/users.h
init.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
init.o: ../../core/lastcontainer.h ../../core/mounts.h init.o: ../../templates/misc.h ../../templates/htmltextstream.h
init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h init.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h
init.o: ../../core/users.h ../../core/groups.h ../../core/group.h init.o: ../../core/run.h ../../core/users.h ../../core/groups.h
init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h init.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h
init.o: ../../core/threadmanager.h ../../functions/functions.h init.o: ../../core/basethread.h ../../core/threadmanager.h
init.o: ../../functions/functionbase.h ../../functions/functionparser.h init.o: ../../functions/functions.h ../../functions/functionbase.h
init.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h init.o: ../../functions/functionparser.h ../../core/cur.h
init.o: ../../functions/adduser.h ../../functions/cat.h
init.o: ../../functions/chmod.h ../../functions/privchanger.h init.o: ../../functions/chmod.h ../../functions/privchanger.h
init.o: ../../core/request.h ../../functions/chown.h init.o: ../../core/request.h ../../functions/chown.h
init.o: ../../functions/ckeditor.h ../../functions/cp.h init.o: ../../functions/ckeditor.h ../../functions/cp.h
@ -213,6 +217,7 @@ init.o: createticket.h showtickets.h ../../core/log.h ../../core/plugin.h
init.o: pluginmsg.h ../../core/system.h ../../core/sessionmanager.h init.o: pluginmsg.h ../../core/system.h ../../core/sessionmanager.h
init.o: ../../core/sessioncontainer.h ../../templates/templates.h init.o: ../../core/sessioncontainer.h ../../templates/templates.h
init.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h init.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h
init.o: ../../templates/patterns.h ../../templates/changepatterns.h
init.o: ../../core/sessionmanager.h sessiondata.h ../../core/plugindata.h init.o: ../../core/sessionmanager.h sessiondata.h ../../core/plugindata.h
init.o: ../../functions/rm.h ../../plugins/thread/showthreads.h init.o: ../../functions/rm.h ../../plugins/thread/showthreads.h
init.o: ../../plugins/thread/threadinfo.h ../../plugins/thread/thread.h init.o: ../../plugins/thread/threadinfo.h ../../plugins/thread/thread.h
@ -236,22 +241,22 @@ showtickets.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
showtickets.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h showtickets.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
showtickets.o: ../../core/rebus.h ../../core/mount.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: ../../core/confparser.h ../../notify/notify.h
showtickets.o: ../../notify/notifypool.h ../../templates/misc.h showtickets.o: ../../notify/notifypool.h ../../templates/patterns.h
showtickets.o: ../../templates/localefilter.h ../../templates/locale.h showtickets.o: ../../templates/locale.h ../../templates/localefilter.h
showtickets.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h showtickets.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h
showtickets.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h showtickets.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
showtickets.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h showtickets.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
showtickets.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h showtickets.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
showtickets.o: ../../notify/notifythread.h ../../core/basethread.h showtickets.o: ../../core/basethread.h ../../core/synchro.h
showtickets.o: ../../core/synchro.h ../../notify/templatesnotify.h showtickets.o: ../../notify/templatesnotify.h ../../core/config.h
showtickets.o: ../../core/config.h ../../core/users.h showtickets.o: ../../core/users.h ../../core/ugcontainer.h
showtickets.o: ../../core/ugcontainer.h ../../core/lastcontainer.h showtickets.o: ../../core/lastcontainer.h ../../templates/misc.h
showtickets.o: ../../core/mounts.h ../../core/mountparser.h showtickets.o: ../../templates/htmltextstream.h ../../core/mounts.h
showtickets.o: ../../core/crypt.h ../../core/run.h ../../core/users.h showtickets.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
showtickets.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h showtickets.o: ../../core/users.h ../../core/groups.h ../../core/group.h
showtickets.o: ../../core/thumb.h ../../core/basethread.h showtickets.o: ../../core/loadavg.h ../../core/thumb.h
showtickets.o: ../../core/threadmanager.h ../../functions/functions.h showtickets.o: ../../core/basethread.h ../../core/threadmanager.h
showtickets.o: ../../functions/functionbase.h showtickets.o: ../../functions/functions.h ../../functions/functionbase.h
showtickets.o: ../../functions/functionparser.h ../../core/cur.h showtickets.o: ../../functions/functionparser.h ../../core/cur.h
showtickets.o: ../../functions/adduser.h ../../functions/cat.h showtickets.o: ../../functions/adduser.h ../../functions/cat.h
showtickets.o: ../../functions/chmod.h ../../functions/privchanger.h showtickets.o: ../../functions/chmod.h ../../functions/privchanger.h
@ -276,7 +281,8 @@ showtickets.o: pluginmsg.h ../../plugins/thread/pluginmsg.h
showtickets.o: ../../core/plugin.h ../../core/system.h showtickets.o: ../../core/plugin.h ../../core/system.h
showtickets.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h showtickets.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
showtickets.o: ../../templates/templates.h ../../templates/patterncacher.h showtickets.o: ../../templates/templates.h ../../templates/patterncacher.h
showtickets.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h showtickets.o: ../../templates/indexpatterns.h ../../templates/patterns.h
showtickets.o: ../../templates/changepatterns.h ../../core/sessionmanager.h
tdb.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.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: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
tdb.o: ../../core/item.h ../../core/requesttypes.h ../../core/error.h tdb.o: ../../core/item.h ../../core/requesttypes.h ../../core/error.h
@ -300,12 +306,13 @@ templates.o: ../../core/misc.h ../../core/session.h ../../core/user.h
templates.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h templates.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h
templates.o: ../../templates/locale.h ../../core/confparser.h templates.o: ../../templates/locale.h ../../core/confparser.h
templates.o: ../../notify/notify.h ../../notify/notifypool.h templates.o: ../../notify/notify.h ../../notify/notifypool.h
templates.o: ../../templates/misc.h ../../templates/localefilter.h templates.o: ../../templates/patterns.h ../../templates/locale.h
templates.o: ../../templates/locale.h ../../templates/htmltextstream.h templates.o: ../../templates/localefilter.h ../../notify/notifythread.h
templates.o: ../../notify/notifythread.h ../../core/basethread.h templates.o: ../../core/basethread.h ../../core/synchro.h
templates.o: ../../core/synchro.h ../../notify/templatesnotify.h templates.o: ../../notify/templatesnotify.h ../../core/config.h
templates.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h templates.o: ../../core/users.h ../../core/ugcontainer.h
templates.o: ../../core/lastcontainer.h ../../core/mounts.h templates.o: ../../core/lastcontainer.h ../../templates/misc.h
templates.o: ../../templates/htmltextstream.h ../../core/mounts.h
templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.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/users.h ../../core/groups.h ../../core/group.h
templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h
@ -335,7 +342,8 @@ templates.o: ../../core/synchro.h createticket.h ../../core/misc.h
templates.o: ../../core/plugin.h pluginmsg.h ../../core/system.h templates.o: ../../core/plugin.h pluginmsg.h ../../core/system.h
templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
templates.o: ../../templates/templates.h ../../templates/patterncacher.h templates.o: ../../templates/templates.h ../../templates/patterncacher.h
templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h templates.o: ../../templates/indexpatterns.h ../../templates/patterns.h
templates.o: ../../templates/changepatterns.h ../../core/sessionmanager.h
templates.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h templates.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h
templates.o: ../../plugins/thread/pluginmsg.h templates.o: ../../plugins/thread/pluginmsg.h
ticketconf.o: ticketconf.h ticketconf.o: ticketconf.h
@ -354,16 +362,17 @@ ticketinfo.o: ../../core/textstream.h ../../core/misc.h ../../core/session.h
ticketinfo.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h ticketinfo.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h
ticketinfo.o: ../../core/mount.h ../../templates/locale.h ticketinfo.o: ../../core/mount.h ../../templates/locale.h
ticketinfo.o: ../../core/confparser.h ../../notify/notify.h ticketinfo.o: ../../core/confparser.h ../../notify/notify.h
ticketinfo.o: ../../notify/notifypool.h ../../templates/misc.h ticketinfo.o: ../../notify/notifypool.h ../../templates/patterns.h
ticketinfo.o: ../../templates/localefilter.h ../../templates/locale.h ticketinfo.o: ../../templates/locale.h ../../templates/localefilter.h
ticketinfo.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.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/generator.h ../../../ezc/src/pattern.h
ticketinfo.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h ticketinfo.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
ticketinfo.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h ticketinfo.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
ticketinfo.o: ../../notify/notifythread.h ../../core/basethread.h ticketinfo.o: ../../core/basethread.h ../../core/synchro.h
ticketinfo.o: ../../core/synchro.h ../../notify/templatesnotify.h ticketinfo.o: ../../notify/templatesnotify.h ../../core/config.h
ticketinfo.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h ticketinfo.o: ../../core/users.h ../../core/ugcontainer.h
ticketinfo.o: ../../core/lastcontainer.h ../../core/mounts.h ticketinfo.o: ../../core/lastcontainer.h ../../templates/misc.h
ticketinfo.o: ../../templates/htmltextstream.h ../../core/mounts.h
ticketinfo.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.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/users.h ../../core/groups.h ../../core/group.h
ticketinfo.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h ticketinfo.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h

3
plugins/ticket/ticketparser.cpp
View File

@ -142,6 +142,9 @@ bool TicketParser::ReadItemType()
if( type == L"string" ) if( type == L"string" )
item.type = TicketConf::TicketItem::TypeString; item.type = TicketConf::TicketItem::TypeString;
else else
if( type == L"multistring" ) // !! nie skonczone jeszcze?
item.type = TicketConf::TicketItem::TypeMultistring;
else
if( type == L"images" ) if( type == L"images" )
item.type = TicketConf::TicketItem::TypeImages; item.type = TicketConf::TicketItem::TypeImages;
else else

706
templates/Makefile.dep
View File

@ -5,34 +5,41 @@ adduser.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
adduser.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h adduser.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
adduser.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h adduser.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
adduser.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h adduser.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
adduser.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h adduser.o: ../core/textstream.h patterncacher.h ../core/item.h
adduser.o: indexpatterns.h ../core/config.h ../core/confparser.h adduser.o: indexpatterns.h patterns.h changepatterns.h ../core/config.h
adduser.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h adduser.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h
adduser.o: ../core/requesttypes.h ../core/error.h ../core/config.h adduser.o: ../core/request.h ../core/requesttypes.h ../core/error.h
adduser.o: ../core/textstream.h ../templates/htmltextstream.h adduser.o: ../core/config.h ../core/textstream.h
adduser.o: ../core/session.h ../core/user.h ../core/plugindata.h adduser.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
adduser.o: ../core/rebus.h ../core/mount.h ../core/system.h ../core/dirs.h adduser.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h
adduser.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h adduser.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
adduser.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h adduser.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
adduser.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h adduser.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
adduser.o: ../core/ugcontainer.h ../core/log.h ../core/logmanipulators.h adduser.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
adduser.o: ../core/slog.h ../core/cur.h ../templates/locale.h adduser.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h
adduser.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h adduser.o: ../core/cur.h ../templates/locale.h ../notify/notify.h
adduser.o: ../notify/notifypool.h ../templates/patterns.h
adduser.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.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: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
adduser.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h adduser.o: ../core/lastcontainer.h ../templates/misc.h ../core/mounts.h
adduser.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h adduser.o: ../core/mountparser.h ../core/crypt.h ../core/run.h
adduser.o: ../core/group.h ../core/loadavg.h ../core/thumb.h adduser.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
adduser.o: ../core/basethread.h ../core/threadmanager.h adduser.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h
adduser.o: ../core/sessionmanager.h ../core/sessioncontainer.h adduser.o: ../core/sessionmanager.h ../core/sessioncontainer.h
adduser.o: ../core/system.h ../core/htmlfilter.h ../core/request.h adduser.o: ../core/system.h ../core/htmlfilter.h ../core/request.h
changepatterns.o: changepatterns.h patterns.h locale.h ../core/confparser.h
changepatterns.o: localefilter.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
changepatterns.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
changepatterns.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
changepatterns.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
changepatterns.o: htmltextstream.h ../core/textstream.h
config.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h config.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
config.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h config.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
config.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h config.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
config.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h config.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
config.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h config.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
config.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h config.o: ../core/textstream.h patterncacher.h ../core/item.h indexpatterns.h
config.o: indexpatterns.h ../core/config.h ../core/confparser.h config.o: patterns.h changepatterns.h ../core/config.h ../core/confparser.h
config.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h config.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
config.o: ../core/requesttypes.h ../core/error.h ../core/config.h config.o: ../core/requesttypes.h ../core/error.h ../core/config.h
config.o: ../core/textstream.h ../templates/htmltextstream.h config.o: ../core/textstream.h ../templates/htmltextstream.h
@ -40,13 +47,14 @@ config.o: ../core/session.h ../core/user.h ../core/plugindata.h
config.o: ../core/rebus.h ../core/mount.h ../core/system.h ../core/dirs.h config.o: ../core/rebus.h ../core/mount.h ../core/system.h ../core/dirs.h
config.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h config.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
config.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h config.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
config.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h config.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
config.o: ../core/ugcontainer.h ../core/log.h ../core/logmanipulators.h config.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
config.o: ../core/slog.h ../core/cur.h ../templates/locale.h config.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
config.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h config.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
config.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h config.o: ../templates/patterns.h ../notify/notifythread.h
config.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h config.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
config.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h config.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
config.o: ../templates/misc.h ../core/mounts.h ../core/mountparser.h
config.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h config.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
config.o: ../core/group.h ../core/loadavg.h ../core/thumb.h config.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
config.o: ../core/basethread.h ../core/threadmanager.h config.o: ../core/basethread.h ../core/threadmanager.h
@ -57,86 +65,89 @@ dir.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
dir.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h dir.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
dir.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h dir.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h
dir.o: ../core/confparser.h htmltextstream.h ../core/textstream.h dir.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
dir.o: ../core/user.h patterncacher.h ../core/item.h indexpatterns.h dir.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
dir.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h dir.o: changepatterns.h ../core/config.h ../core/confparser.h
dir.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h dir.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
dir.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h dir.o: ../core/requesttypes.h ../core/error.h ../core/config.h
dir.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h dir.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
dir.o: ../core/mount.h ../core/system.h ../core/dirs.h ../core/dircontainer.h dir.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
dir.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h dir.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
dir.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h dir.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
dir.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
dir.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h dir.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
dir.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h dir.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h
dir.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h dir.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
dir.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h dir.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h
dir.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h dir.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h
dir.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h dir.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h
dir.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h dir.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h
dir.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h dir.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
dir.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h dir.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h
dir.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h dir.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
dir.o: ../core/misc.h ../functions/functions.h ../functions/functionbase.h dir.o: ../core/htmlfilter.h ../core/misc.h ../functions/functions.h
dir.o: ../core/request.h ../core/synchro.h ../functions/functionparser.h dir.o: ../functions/functionbase.h ../core/request.h ../core/synchro.h
dir.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h dir.o: ../functions/functionparser.h ../functions/adduser.h
dir.o: ../functions/privchanger.h ../functions/chown.h dir.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
dir.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h dir.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
dir.o: ../functions/download.h ../functions/emacs.h ../functions/last.h dir.o: ../functions/default.h ../functions/download.h ../functions/emacs.h
dir.o: ../functions/login.h ../functions/logout.h ../functions/ln.h dir.o: ../functions/last.h ../functions/login.h ../functions/logout.h
dir.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h dir.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h
dir.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.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/passwd.h ../functions/priv.h ../functions/reload.h
dir.o: ../functions/sort.h ../functions/specialdefault.h ../functions/stat.h dir.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h
dir.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h dir.o: ../functions/stat.h ../functions/subject.h ../functions/template.h
dir.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h dir.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
dir.o: ../functions/who.h ../functions/vim.h dir.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
doc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.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/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
doc.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h doc.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
doc.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h doc.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h
doc.o: ../core/confparser.h htmltextstream.h ../core/textstream.h doc.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
doc.o: ../core/user.h patterncacher.h ../core/item.h indexpatterns.h doc.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
doc.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h doc.o: changepatterns.h ../core/config.h ../core/confparser.h
doc.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h doc.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
doc.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h doc.o: ../core/requesttypes.h ../core/error.h ../core/config.h
doc.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h doc.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
doc.o: ../core/mount.h ../core/system.h ../core/dirs.h ../core/dircontainer.h doc.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
doc.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h doc.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
doc.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h doc.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
doc.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
doc.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h doc.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
doc.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h doc.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h
doc.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h doc.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
doc.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h doc.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h
doc.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h doc.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h
doc.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h doc.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h
doc.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h doc.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h
doc.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h doc.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
doc.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h doc.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h
doc.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h doc.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
doc.o: ../core/request.h ../core/misc.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: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
filters.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h filters.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
filters.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h filters.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
filters.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h filters.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
filters.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h filters.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
filters.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h filters.o: ../core/textstream.h patterncacher.h ../core/item.h
filters.o: indexpatterns.h ../core/config.h ../core/confparser.h filters.o: indexpatterns.h patterns.h changepatterns.h ../core/config.h
filters.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h filters.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h
filters.o: ../core/requesttypes.h ../core/error.h ../core/config.h filters.o: ../core/request.h ../core/requesttypes.h ../core/error.h
filters.o: ../core/textstream.h ../templates/htmltextstream.h filters.o: ../core/config.h ../core/textstream.h
filters.o: ../core/session.h ../core/user.h ../core/plugindata.h filters.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
filters.o: ../core/rebus.h ../core/mount.h ../core/system.h ../core/dirs.h filters.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h
filters.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h filters.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
filters.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h filters.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
filters.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h filters.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
filters.o: ../core/ugcontainer.h ../core/log.h ../core/logmanipulators.h filters.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
filters.o: ../core/slog.h ../core/cur.h ../templates/locale.h filters.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h
filters.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h filters.o: ../core/cur.h ../templates/locale.h ../notify/notify.h
filters.o: ../notify/notifypool.h ../templates/patterns.h
filters.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.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: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
filters.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h filters.o: ../core/lastcontainer.h ../templates/misc.h ../core/mounts.h
filters.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h filters.o: ../core/mountparser.h ../core/crypt.h ../core/run.h
filters.o: ../core/group.h ../core/loadavg.h ../core/thumb.h filters.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
filters.o: ../core/basethread.h ../core/threadmanager.h filters.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h
filters.o: ../core/sessionmanager.h ../core/sessioncontainer.h filters.o: ../core/sessionmanager.h ../core/sessioncontainer.h
filters.o: ../core/system.h ../core/htmlfilter.h ../core/misc.h filters.o: ../core/system.h ../core/htmlfilter.h ../core/misc.h
htmltextstream.o: htmltextstream.h ../core/textstream.h misc.h localefilter.h htmltextstream.o: htmltextstream.h ../core/textstream.h misc.h localefilter.h
@ -144,23 +155,22 @@ htmltextstream.o: locale.h ../core/confparser.h ../../ezc/src/ezc.h
htmltextstream.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h htmltextstream.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
htmltextstream.o: ../../ezc/src/pattern.h ../../ezc/src/item.h htmltextstream.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
htmltextstream.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h htmltextstream.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
htmltextstream.o: ../../ezc/src/stringconv.h ../core/user.h htmltextstream.o: ../../ezc/src/stringconv.h
indexpatterns.o: indexpatterns.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h indexpatterns.o: indexpatterns.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
indexpatterns.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h indexpatterns.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
indexpatterns.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h indexpatterns.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
indexpatterns.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h indexpatterns.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
indexpatterns.o: localefilter.h locale.h ../core/confparser.h indexpatterns.o: patterns.h locale.h ../core/confparser.h localefilter.h
indexpatterns.o: htmltextstream.h ../core/textstream.h ../core/user.h indexpatterns.o: misc.h htmltextstream.h ../core/textstream.h ../core/log.h
indexpatterns.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h indexpatterns.o: ../core/textstream.h ../core/logmanipulators.h
indexpatterns.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h
indexpatterns.o: ../core/slog.h ../core/cur.h ../templates/locale.h indexpatterns.o: ../core/slog.h ../core/cur.h ../templates/locale.h
insert.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h insert.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
insert.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h insert.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
insert.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h insert.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
insert.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h insert.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
insert.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h insert.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
insert.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h insert.o: ../core/textstream.h patterncacher.h ../core/item.h indexpatterns.h
insert.o: indexpatterns.h ../core/config.h ../core/confparser.h insert.o: patterns.h changepatterns.h ../core/config.h ../core/confparser.h
insert.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h insert.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
insert.o: ../core/requesttypes.h ../core/error.h ../core/config.h insert.o: ../core/requesttypes.h ../core/error.h ../core/config.h
insert.o: ../core/textstream.h ../templates/htmltextstream.h insert.o: ../core/textstream.h ../templates/htmltextstream.h
@ -168,13 +178,14 @@ insert.o: ../core/session.h ../core/user.h ../core/plugindata.h
insert.o: ../core/rebus.h ../core/mount.h ../core/system.h ../core/dirs.h insert.o: ../core/rebus.h ../core/mount.h ../core/system.h ../core/dirs.h
insert.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h insert.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
insert.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h insert.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
insert.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h insert.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
insert.o: ../core/ugcontainer.h ../core/log.h ../core/logmanipulators.h insert.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
insert.o: ../core/slog.h ../core/cur.h ../templates/locale.h insert.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
insert.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h insert.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
insert.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h insert.o: ../templates/patterns.h ../notify/notifythread.h
insert.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h insert.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
insert.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h insert.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
insert.o: ../templates/misc.h ../core/mounts.h ../core/mountparser.h
insert.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h insert.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
insert.o: ../core/group.h ../core/loadavg.h ../core/thumb.h insert.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
insert.o: ../core/basethread.h ../core/threadmanager.h insert.o: ../core/basethread.h ../core/threadmanager.h
@ -186,51 +197,53 @@ item.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
item.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h item.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
item.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h item.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
item.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h item.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
item.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h item.o: ../core/textstream.h patterncacher.h ../core/item.h indexpatterns.h
item.o: indexpatterns.h ../core/config.h ../core/confparser.h item.o: patterns.h changepatterns.h ../core/config.h ../core/confparser.h
item.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h item.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
item.o: ../core/requesttypes.h ../core/error.h ../core/config.h item.o: ../core/requesttypes.h ../core/error.h ../core/config.h
item.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h item.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
item.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h item.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
item.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.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 item.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
item.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h item.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
item.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h item.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
item.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h item.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h
item.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h item.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
item.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h item.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h
item.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h item.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h
item.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h item.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h
item.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h item.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h
item.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h item.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
item.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h item.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h
item.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h item.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
item.o: ../core/request.h ../core/misc.h ../core/bbcodeparser.h item.o: ../core/htmlfilter.h ../core/request.h ../core/misc.h
item.o: ../core/bbcodeparser.h
last.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h last.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
last.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h last.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
last.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h last.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
last.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h last.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
last.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h last.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
last.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h last.o: ../core/textstream.h patterncacher.h ../core/item.h indexpatterns.h
last.o: indexpatterns.h ../core/config.h ../core/confparser.h last.o: patterns.h changepatterns.h ../core/config.h ../core/confparser.h
last.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h last.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
last.o: ../core/requesttypes.h ../core/error.h ../core/config.h last.o: ../core/requesttypes.h ../core/error.h ../core/config.h
last.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h last.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
last.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h last.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
last.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.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 last.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
last.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h last.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
last.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h last.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
last.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h last.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h
last.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h last.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
last.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h last.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h
last.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h last.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h
last.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h last.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h
last.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h last.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h
last.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h last.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
last.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h last.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h
last.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h last.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
last.o: ../core/lastcontainer.h ../core/request.h ../core/misc.h last.o: ../core/htmlfilter.h ../core/lastcontainer.h ../core/request.h
last.o: ../core/misc.h
locale.o: locale.h ../core/confparser.h ../core/log.h ../core/textstream.h locale.o: locale.h ../core/confparser.h ../core/log.h ../core/textstream.h
locale.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h locale.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
locale.o: ../templates/locale.h ../../ezc/src/utf8.h locale.o: ../templates/locale.h ../../ezc/src/utf8.h
@ -245,23 +258,24 @@ login.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
login.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h login.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
login.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h login.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
login.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h login.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
login.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h login.o: ../core/textstream.h patterncacher.h ../core/item.h indexpatterns.h
login.o: indexpatterns.h ../core/config.h ../core/confparser.h login.o: patterns.h changepatterns.h ../core/config.h ../core/confparser.h
login.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h login.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
login.o: ../core/requesttypes.h ../core/error.h ../core/config.h login.o: ../core/requesttypes.h ../core/error.h ../core/config.h
login.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h login.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
login.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h login.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
login.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h login.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
login.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h login.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
login.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h login.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
login.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h login.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
login.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h login.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h
login.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h login.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
login.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h login.o: ../templates/patterns.h ../notify/notifythread.h
login.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h login.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
login.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h login.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
login.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h login.o: ../templates/misc.h ../core/mounts.h ../core/mountparser.h
login.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h login.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
login.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
login.o: ../core/basethread.h ../core/threadmanager.h login.o: ../core/basethread.h ../core/threadmanager.h
login.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h login.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
login.o: ../core/htmlfilter.h login.o: ../core/htmlfilter.h
@ -270,72 +284,74 @@ ls.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
ls.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h ls.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
ls.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h ls.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h
ls.o: ../core/confparser.h htmltextstream.h ../core/textstream.h ls.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
ls.o: ../core/user.h patterncacher.h ../core/item.h indexpatterns.h ls.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
ls.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h ls.o: changepatterns.h ../core/config.h ../core/confparser.h
ls.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h ls.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
ls.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h ls.o: ../core/requesttypes.h ../core/error.h ../core/config.h
ls.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h ls.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
ls.o: ../core/mount.h ../core/system.h ../core/dirs.h ../core/dircontainer.h ls.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
ls.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ls.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
ls.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h ls.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.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/group.h ../core/dircontainer.h ../core/ugcontainer.h
ls.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h ls.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h
ls.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h ls.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
ls.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h ls.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h
ls.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h ls.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h
ls.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h ls.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h
ls.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h ls.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h
ls.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h ls.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
ls.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h ls.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h
ls.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h ls.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
ls.o: ../core/request.h ls.o: ../core/htmlfilter.h ../core/request.h
misc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h misc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
misc.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h misc.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
misc.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h misc.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
misc.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h misc.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
misc.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h misc.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
misc.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h misc.o: ../core/textstream.h patterncacher.h ../core/item.h indexpatterns.h
misc.o: indexpatterns.h ../core/config.h ../core/confparser.h misc.o: patterns.h changepatterns.h ../core/config.h ../core/confparser.h
misc.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h misc.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
misc.o: ../core/requesttypes.h ../core/error.h ../core/config.h misc.o: ../core/requesttypes.h ../core/error.h ../core/config.h
misc.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h misc.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
misc.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h misc.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
misc.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.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 misc.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
misc.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h misc.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
misc.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h misc.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
misc.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h misc.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h
misc.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h misc.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
misc.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h misc.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h
misc.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h misc.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h
misc.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h misc.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h
misc.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h misc.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h
misc.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h misc.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
misc.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h misc.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h
misc.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h misc.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
misc.o: ../core/misc.h ../core/request.h misc.o: ../core/htmlfilter.h ../core/misc.h ../core/request.h
mount.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h mount.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
mount.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h mount.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
mount.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h mount.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
mount.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h mount.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
mount.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h mount.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
mount.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h mount.o: ../core/textstream.h patterncacher.h ../core/item.h indexpatterns.h
mount.o: indexpatterns.h ../core/config.h ../core/confparser.h mount.o: patterns.h changepatterns.h ../core/config.h ../core/confparser.h
mount.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h mount.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
mount.o: ../core/requesttypes.h ../core/error.h ../core/config.h mount.o: ../core/requesttypes.h ../core/error.h ../core/config.h
mount.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h mount.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
mount.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h mount.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
mount.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.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 mount.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
mount.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h mount.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
mount.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h mount.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
mount.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h mount.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h
mount.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h mount.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
mount.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h mount.o: ../templates/patterns.h ../notify/notifythread.h
mount.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h mount.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
mount.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h mount.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
mount.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h mount.o: ../templates/misc.h ../core/mounts.h ../core/mountparser.h
mount.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.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/threadmanager.h mount.o: ../core/basethread.h ../core/threadmanager.h
mount.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h mount.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
mount.o: ../core/htmlfilter.h ../core/misc.h ../core/mounts.h mount.o: ../core/htmlfilter.h ../core/misc.h ../core/mounts.h
@ -345,69 +361,79 @@ patterncacher.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
patterncacher.o: ../../ezc/src/pattern.h ../../ezc/src/item.h patterncacher.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
patterncacher.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h patterncacher.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
patterncacher.o: ../../ezc/src/stringconv.h htmltextstream.h patterncacher.o: ../../ezc/src/stringconv.h htmltextstream.h
patterncacher.o: ../core/textstream.h ../core/user.h ../core/log.h patterncacher.o: ../core/textstream.h ../core/log.h ../core/textstream.h
patterncacher.o: ../core/textstream.h ../core/logmanipulators.h patterncacher.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
patterncacher.o: ../core/slog.h ../core/cur.h ../templates/locale.h patterncacher.o: ../templates/locale.h
patterns.o: patterns.h locale.h ../core/confparser.h localefilter.h
patterns.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h
patterns.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
patterns.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
patterns.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
patterns.o: htmltextstream.h ../core/textstream.h ../core/log.h
patterns.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h
patterns.o: ../core/cur.h ../templates/locale.h
priv.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.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/generator.h ../../ezc/src/pattern.h
priv.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h priv.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
priv.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h priv.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
priv.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h priv.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
priv.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h priv.o: ../core/textstream.h patterncacher.h ../core/item.h indexpatterns.h
priv.o: indexpatterns.h ../core/config.h ../core/confparser.h priv.o: patterns.h changepatterns.h ../core/config.h ../core/confparser.h
priv.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h priv.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
priv.o: ../core/requesttypes.h ../core/error.h ../core/config.h priv.o: ../core/requesttypes.h ../core/error.h ../core/config.h
priv.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h priv.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
priv.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h priv.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
priv.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.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 priv.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
priv.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h priv.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
priv.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h priv.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
priv.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h priv.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h
priv.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h priv.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
priv.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h priv.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h
priv.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h priv.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h
priv.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h priv.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h
priv.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h priv.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h
priv.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h priv.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
priv.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h priv.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h
priv.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h priv.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
priv.o: ../core/request.h ../core/misc.h ../functions/functions.h priv.o: ../core/htmlfilter.h ../core/request.h ../core/misc.h
priv.o: ../functions/functionbase.h ../core/synchro.h priv.o: ../functions/functions.h ../functions/functionbase.h
priv.o: ../functions/functionparser.h ../functions/adduser.h priv.o: ../core/synchro.h ../functions/functionparser.h
priv.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h priv.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
priv.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h priv.o: ../functions/privchanger.h ../functions/chown.h
priv.o: ../functions/default.h ../functions/download.h ../functions/emacs.h priv.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h
priv.o: ../functions/last.h ../functions/login.h ../functions/logout.h priv.o: ../functions/download.h ../functions/emacs.h ../functions/last.h
priv.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h priv.o: ../functions/login.h ../functions/logout.h ../functions/ln.h
priv.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h priv.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
priv.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h priv.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h
priv.o: ../functions/rm.h ../functions/sort.h ../functions/specialdefault.h priv.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
priv.o: ../functions/stat.h ../functions/subject.h ../functions/template.h priv.o: ../functions/sort.h ../functions/specialdefault.h ../functions/stat.h
priv.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h priv.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h
priv.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h priv.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
priv.o: ../functions/who.h ../functions/vim.h
rebus.o: ../core/request.h templates.h ../../ezc/src/ezc.h rebus.o: ../core/request.h templates.h ../../ezc/src/ezc.h
rebus.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h rebus.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
rebus.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h rebus.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
rebus.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h rebus.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
rebus.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h rebus.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
rebus.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h rebus.o: ../core/textstream.h patterncacher.h ../core/item.h indexpatterns.h
rebus.o: indexpatterns.h ../core/config.h ../core/confparser.h rebus.o: patterns.h changepatterns.h ../core/config.h ../core/confparser.h
rebus.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h rebus.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
rebus.o: ../core/requesttypes.h ../core/error.h ../core/config.h rebus.o: ../core/requesttypes.h ../core/error.h ../core/config.h
rebus.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h rebus.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
rebus.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h rebus.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
rebus.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.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 rebus.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
rebus.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h rebus.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
rebus.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h rebus.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
rebus.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h rebus.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h
rebus.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h rebus.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
rebus.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h rebus.o: ../templates/patterns.h ../notify/notifythread.h
rebus.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h rebus.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
rebus.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h rebus.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
rebus.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h rebus.o: ../templates/misc.h ../core/mounts.h ../core/mountparser.h
rebus.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.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/threadmanager.h rebus.o: ../core/basethread.h ../core/threadmanager.h
rebus.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h rebus.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
rebus.o: ../core/htmlfilter.h rebus.o: ../core/htmlfilter.h
@ -417,20 +443,21 @@ slog.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
slog.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h slog.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
slog.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h slog.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
slog.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h slog.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
slog.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h slog.o: ../core/textstream.h patterncacher.h ../core/item.h indexpatterns.h
slog.o: indexpatterns.h ../core/config.h ../core/confparser.h slog.o: patterns.h changepatterns.h ../core/config.h ../core/confparser.h
slog.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h slog.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
slog.o: ../core/requesttypes.h ../core/error.h ../core/config.h slog.o: ../core/requesttypes.h ../core/error.h ../core/config.h
slog.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h slog.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
slog.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h slog.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
slog.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h slog.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
slog.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h slog.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
slog.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h slog.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
slog.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h slog.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
slog.o: ../core/slog.h ../notify/notify.h ../notify/notifypool.h slog.o: ../core/log.h ../core/slog.h ../notify/notify.h
slog.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h slog.o: ../notify/notifypool.h ../templates/patterns.h
slog.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h slog.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
slog.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h slog.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
slog.o: ../core/lastcontainer.h ../templates/misc.h ../core/mounts.h
slog.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.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/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
slog.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h slog.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h
@ -440,52 +467,53 @@ stat.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
stat.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h stat.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
stat.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h stat.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
stat.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h stat.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
stat.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h stat.o: ../core/textstream.h patterncacher.h ../core/item.h indexpatterns.h
stat.o: indexpatterns.h ../core/config.h ../core/confparser.h stat.o: patterns.h changepatterns.h ../core/config.h ../core/confparser.h
stat.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h stat.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
stat.o: ../core/requesttypes.h ../core/error.h ../core/config.h stat.o: ../core/requesttypes.h ../core/error.h ../core/config.h
stat.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h stat.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
stat.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h stat.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
stat.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.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 stat.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
stat.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h stat.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
stat.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h stat.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
stat.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h stat.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h
stat.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h stat.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
stat.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h stat.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h
stat.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h stat.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h
stat.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h stat.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h
stat.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h stat.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h
stat.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h stat.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
stat.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h stat.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h
stat.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h stat.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
stat.o: ../core/request.h ../core/misc.h stat.o: ../core/htmlfilter.h ../core/request.h ../core/misc.h
sys.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h sys.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
sys.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h sys.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
sys.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h sys.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
sys.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h sys.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h
sys.o: ../core/confparser.h htmltextstream.h ../core/textstream.h sys.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
sys.o: ../core/user.h patterncacher.h ../core/item.h indexpatterns.h sys.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
sys.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h sys.o: changepatterns.h ../core/config.h ../core/confparser.h
sys.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h sys.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
sys.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h sys.o: ../core/requesttypes.h ../core/error.h ../core/config.h
sys.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h sys.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
sys.o: ../core/mount.h ../core/system.h ../core/dirs.h ../core/dircontainer.h sys.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
sys.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h sys.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
sys.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h sys.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
sys.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
sys.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h sys.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
sys.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h sys.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h
sys.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h sys.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
sys.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h sys.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h
sys.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h sys.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h
sys.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h sys.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h
sys.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h sys.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h
sys.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h sys.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
sys.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h sys.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h
sys.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h sys.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
sys.o: ../core/request.h ../core/version.h ../core/plugin.h sys.o: ../core/htmlfilter.h ../core/request.h ../core/version.h
sys.o: ../core/pluginmsg.h ../core/sessionmanager.h ../functions/functions.h sys.o: ../core/plugin.h ../core/pluginmsg.h ../core/sessionmanager.h
sys.o: ../functions/functionbase.h ../core/synchro.h sys.o: ../functions/functions.h ../functions/functionbase.h ../core/synchro.h
sys.o: ../functions/functionparser.h ../functions/adduser.h sys.o: ../functions/functionparser.h ../functions/adduser.h
sys.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h sys.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
sys.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h sys.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
@ -504,8 +532,8 @@ template.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
template.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h template.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
template.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h template.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
template.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h template.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
template.o: ../core/textstream.h ../core/user.h patterncacher.h template.o: ../core/textstream.h patterncacher.h ../core/item.h
template.o: ../core/item.h indexpatterns.h ../core/config.h template.o: indexpatterns.h patterns.h changepatterns.h ../core/config.h
template.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h template.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h
template.o: ../core/request.h ../core/requesttypes.h ../core/error.h template.o: ../core/request.h ../core/requesttypes.h ../core/error.h
template.o: ../core/config.h ../core/textstream.h template.o: ../core/config.h ../core/textstream.h
@ -514,25 +542,26 @@ template.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h
template.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h template.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
template.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h template.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
template.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h template.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h
template.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h template.o: ../core/user.h ../core/group.h ../core/dircontainer.h
template.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h template.o: ../core/ugcontainer.h ../core/log.h ../core/logmanipulators.h
template.o: ../core/cur.h ../templates/locale.h ../notify/notify.h template.o: ../core/slog.h ../core/cur.h ../templates/locale.h
template.o: ../notify/notifypool.h ../templates/misc.h template.o: ../notify/notify.h ../notify/notifypool.h ../templates/patterns.h
template.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.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: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
template.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h template.o: ../core/lastcontainer.h ../templates/misc.h ../core/mounts.h
template.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h template.o: ../core/mountparser.h ../core/crypt.h ../core/run.h
template.o: ../core/group.h ../core/loadavg.h ../core/thumb.h template.o: ../core/users.h ../core/groups.h ../core/group.h
template.o: ../core/basethread.h ../core/threadmanager.h template.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h
template.o: ../core/sessionmanager.h ../core/sessioncontainer.h template.o: ../core/threadmanager.h ../core/sessionmanager.h
template.o: ../core/system.h ../core/htmlfilter.h ../core/misc.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: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
templates.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h templates.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
templates.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h templates.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
templates.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h templates.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
templates.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h templates.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
templates.o: ../core/textstream.h ../core/user.h patterncacher.h templates.o: ../core/textstream.h patterncacher.h ../core/item.h
templates.o: ../core/item.h indexpatterns.h ../core/config.h templates.o: indexpatterns.h patterns.h changepatterns.h ../core/config.h
templates.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h templates.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h
templates.o: ../core/request.h ../core/requesttypes.h ../core/error.h templates.o: ../core/request.h ../core/requesttypes.h ../core/error.h
templates.o: ../core/config.h ../core/textstream.h templates.o: ../core/config.h ../core/textstream.h
@ -541,21 +570,23 @@ templates.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h
templates.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h templates.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
templates.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h templates.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
templates.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h templates.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h
templates.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h templates.o: ../core/user.h ../core/group.h ../core/dircontainer.h
templates.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h templates.o: ../core/ugcontainer.h ../core/log.h ../core/logmanipulators.h
templates.o: ../core/cur.h ../templates/locale.h ../notify/notify.h templates.o: ../core/slog.h ../core/cur.h ../templates/locale.h
templates.o: ../notify/notifypool.h ../templates/misc.h templates.o: ../notify/notify.h ../notify/notifypool.h
templates.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h templates.o: ../templates/patterns.h ../notify/notifythread.h
templates.o: ../core/basethread.h ../core/synchro.h
templates.o: ../notify/templatesnotify.h ../core/users.h templates.o: ../notify/templatesnotify.h ../core/users.h
templates.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h templates.o: ../core/ugcontainer.h ../core/lastcontainer.h
templates.o: ../core/mountparser.h ../core/crypt.h ../core/run.h templates.o: ../templates/misc.h ../core/mounts.h ../core/mountparser.h
templates.o: ../core/users.h ../core/groups.h ../core/group.h templates.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h
templates.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h templates.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
templates.o: ../core/threadmanager.h ../core/sessionmanager.h templates.o: ../core/basethread.h ../core/threadmanager.h
templates.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h templates.o: ../core/sessionmanager.h ../core/sessioncontainer.h
templates.o: ../core/misc.h ../core/plugin.h ../core/pluginmsg.h templates.o: ../core/system.h ../core/htmlfilter.h ../core/misc.h
templates.o: ../core/sessionmanager.h ../functions/functions.h templates.o: ../core/plugin.h ../core/pluginmsg.h ../core/sessionmanager.h
templates.o: ../functions/functionbase.h ../core/request.h ../core/synchro.h templates.o: ../functions/functions.h ../functions/functionbase.h
templates.o: ../core/request.h ../core/synchro.h
templates.o: ../functions/functionparser.h ../functions/adduser.h templates.o: ../functions/functionparser.h ../functions/adduser.h
templates.o: ../functions/cat.h ../functions/chmod.h templates.o: ../functions/cat.h ../functions/chmod.h
templates.o: ../functions/privchanger.h ../functions/chown.h templates.o: ../functions/privchanger.h ../functions/chown.h
@ -576,23 +607,25 @@ upload.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
upload.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h upload.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
upload.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h upload.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h
upload.o: ../core/confparser.h htmltextstream.h ../core/textstream.h upload.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
upload.o: ../core/user.h patterncacher.h ../core/item.h indexpatterns.h upload.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
upload.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h upload.o: changepatterns.h ../core/config.h ../core/confparser.h
upload.o: ../core/cur.h ../core/request.h ../core/requesttypes.h upload.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
upload.o: ../core/error.h ../core/config.h ../core/textstream.h upload.o: ../core/requesttypes.h ../core/error.h ../core/config.h
upload.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h upload.o: ../core/textstream.h ../templates/htmltextstream.h
upload.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h upload.o: ../core/session.h ../core/user.h ../core/plugindata.h
upload.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h upload.o: ../core/rebus.h ../core/mount.h ../core/system.h ../core/dirs.h
upload.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h upload.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
upload.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h upload.o: ../db/dbtextstream.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/dircontainer.h ../core/ugcontainer.h ../core/log.h
upload.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h upload.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
upload.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h upload.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
upload.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h upload.o: ../templates/patterns.h ../notify/notifythread.h
upload.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h upload.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
upload.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h upload.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
upload.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h upload.o: ../templates/misc.h ../core/mounts.h ../core/mountparser.h
upload.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.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/threadmanager.h upload.o: ../core/basethread.h ../core/threadmanager.h
upload.o: ../core/sessionmanager.h ../core/sessioncontainer.h upload.o: ../core/sessionmanager.h ../core/sessioncontainer.h
upload.o: ../core/system.h ../core/htmlfilter.h upload.o: ../core/system.h ../core/htmlfilter.h
@ -601,8 +634,8 @@ uptime.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
uptime.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h uptime.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
uptime.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h uptime.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
uptime.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h uptime.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
uptime.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h uptime.o: ../core/textstream.h patterncacher.h ../core/item.h indexpatterns.h
uptime.o: indexpatterns.h ../core/config.h ../core/confparser.h uptime.o: patterns.h changepatterns.h ../core/config.h ../core/confparser.h
uptime.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h uptime.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
uptime.o: ../core/requesttypes.h ../core/error.h ../core/config.h uptime.o: ../core/requesttypes.h ../core/error.h ../core/config.h
uptime.o: ../core/textstream.h ../templates/htmltextstream.h uptime.o: ../core/textstream.h ../templates/htmltextstream.h
@ -610,13 +643,14 @@ uptime.o: ../core/session.h ../core/user.h ../core/plugindata.h
uptime.o: ../core/rebus.h ../core/mount.h ../core/system.h ../core/dirs.h uptime.o: ../core/rebus.h ../core/mount.h ../core/system.h ../core/dirs.h
uptime.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.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/dbtextstream.h ../core/error.h ../db/dbitemquery.h
uptime.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h uptime.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
uptime.o: ../core/ugcontainer.h ../core/log.h ../core/logmanipulators.h uptime.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h
uptime.o: ../core/slog.h ../core/cur.h ../templates/locale.h uptime.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h
uptime.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h uptime.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
uptime.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h uptime.o: ../templates/patterns.h ../notify/notifythread.h
uptime.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h uptime.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
uptime.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h uptime.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
uptime.o: ../templates/misc.h ../core/mounts.h ../core/mountparser.h
uptime.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.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/group.h ../core/loadavg.h ../core/thumb.h
uptime.o: ../core/basethread.h ../core/threadmanager.h uptime.o: ../core/basethread.h ../core/threadmanager.h
@ -627,72 +661,74 @@ user.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
user.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h user.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
user.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h user.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
user.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h user.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
user.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h user.o: ../core/textstream.h patterncacher.h ../core/item.h indexpatterns.h
user.o: indexpatterns.h ../core/config.h ../core/confparser.h user.o: patterns.h changepatterns.h ../core/config.h ../core/confparser.h
user.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h user.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
user.o: ../core/requesttypes.h ../core/error.h ../core/config.h user.o: ../core/requesttypes.h ../core/error.h ../core/config.h
user.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h user.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
user.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h user.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
user.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.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 user.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
user.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h user.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
user.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h user.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
user.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h user.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h
user.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h user.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
user.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h user.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h
user.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h user.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h
user.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h user.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h
user.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h user.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h
user.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h user.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
user.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h user.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h
user.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h user.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
user.o: ../core/request.h ../core/misc.h user.o: ../core/htmlfilter.h ../core/request.h ../core/misc.h
who.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h who.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
who.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h who.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
who.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h who.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
who.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h who.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h
who.o: ../core/confparser.h htmltextstream.h ../core/textstream.h who.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
who.o: ../core/user.h patterncacher.h ../core/item.h indexpatterns.h who.o: patterncacher.h ../core/item.h indexpatterns.h patterns.h
who.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h who.o: changepatterns.h ../core/config.h ../core/confparser.h
who.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h who.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
who.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h who.o: ../core/requesttypes.h ../core/error.h ../core/config.h
who.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h who.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
who.o: ../core/mount.h ../core/system.h ../core/dirs.h ../core/dircontainer.h who.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
who.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h who.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
who.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h who.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.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/group.h ../core/dircontainer.h ../core/ugcontainer.h
who.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h who.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h
who.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h who.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
who.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h who.o: ../templates/patterns.h ../notify/notifythread.h ../core/basethread.h
who.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h who.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h
who.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h who.o: ../core/ugcontainer.h ../core/lastcontainer.h ../templates/misc.h
who.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h who.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/run.h
who.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h who.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
who.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h who.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h
who.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h who.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
who.o: ../core/request.h ../core/misc.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: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
winix.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h winix.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
winix.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h winix.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
winix.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h winix.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
winix.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h winix.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
winix.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h winix.o: ../core/textstream.h patterncacher.h ../core/item.h indexpatterns.h
winix.o: indexpatterns.h ../core/config.h ../core/confparser.h winix.o: patterns.h changepatterns.h ../core/config.h ../core/confparser.h
winix.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h winix.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h
winix.o: ../core/requesttypes.h ../core/error.h ../core/config.h winix.o: ../core/requesttypes.h ../core/error.h ../core/config.h
winix.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h winix.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h
winix.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h winix.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h
winix.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.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 winix.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
winix.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h winix.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
winix.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h winix.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
winix.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h winix.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h
winix.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h winix.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h
winix.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h winix.o: ../templates/patterns.h ../notify/notifythread.h
winix.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h winix.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
winix.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h winix.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
winix.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h winix.o: ../templates/misc.h ../core/mounts.h ../core/mountparser.h
winix.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.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/threadmanager.h winix.o: ../core/basethread.h ../core/threadmanager.h
winix.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h winix.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
winix.o: ../core/htmlfilter.h ../core/request.h ../core/plugin.h winix.o: ../core/htmlfilter.h ../core/request.h ../core/plugin.h

2
templates/Makefile.o.dep
View File

@ -1 +1 @@
o = adduser.o config.o dir.o doc.o filters.o htmltextstream.o indexpatterns.o insert.o item.o last.o locale.o localefilter.o login.o ls.o misc.o mount.o patterncacher.o priv.o rebus.o slog.o stat.o sys.o template.o templates.o upload.o uptime.o user.o who.o winix.o o = adduser.o changepatterns.o config.o dir.o doc.o filters.o htmltextstream.o indexpatterns.o insert.o item.o last.o locale.o localefilter.o login.o ls.o misc.o mount.o patterncacher.o patterns.o priv.o rebus.o slog.o stat.o sys.o template.o templates.o upload.o uptime.o user.o who.o winix.o

102
templates/changepatterns.cpp Executable file
View File

@ -0,0 +1,102 @@
/*
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2011, Tomasz Sowa
* All rights reserved.
*
*/
#include "changepatterns.h"
void ChangePatterns::SetPatterns(Patterns * ppatterns)
{
patterns = ppatterns;
}
void ChangePatterns::Add(long mount_dir_id, const std::wstring & old_pattern_name, const std::wstring & new_pattern_name)
{
Value & value = pat_tab[mount_dir_id];
std::pair<Value::iterator, bool> res = value.insert(std::make_pair(old_pattern_name, Template()));
Template & tmpl = res.first->second;
tmpl.to_delete = false;
if( res.second || new_pattern_name != patterns->GetFileName(tmpl.index) )
tmpl.index = patterns->Add(new_pattern_name);
}
Ezc::Pattern * ChangePatterns::Get(long mount_dir_id, const std::wstring & old_pattern_name, size_t locale_index)
{
PatTab::iterator i = pat_tab.find(mount_dir_id);
if( i == pat_tab.end() )
return 0;
Value & value = i->second;
Value::iterator v = value.find(old_pattern_name);
if( v == value.end() )
return 0;
Template & tmpl = v->second;
log << log4 << "ChangePatterns: changing " << old_pattern_name
<< " to " << patterns->GetFileName(tmpl.index) << logend;
return patterns->Get(tmpl.index, locale_index);
}
void ChangePatterns::MarkAllToDelete()
{
PatTab::iterator i;
Value::iterator v;
for(i=pat_tab.begin() ; i != pat_tab.end() ; ++i)
{
Value & value = i->second;
for(v=value.begin() ; v != value.end() ; ++v)
v->second.to_delete = true;
}
}
void ChangePatterns::DeleteMarked()
{
PatTab::iterator i;
Value::iterator v, next;
for(i=pat_tab.begin() ; i != pat_tab.end() ; ++i)
{
Value & value = i->second;
for(v=value.begin() ; v != value.end() ; )
{
next = v;
++next;
if( v->second.to_delete )
{
patterns->Erase(v->second.index);
value.erase(v);
}
v = next;
}
}
}

69
templates/changepatterns.h Executable file
View File

@ -0,0 +1,69 @@
/*
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2011, Tomasz Sowa
* All rights reserved.
*
*/
#ifndef headerfile_winix_templates_changepatterns
#define headerfile_winix_templates_changepatterns
#include <map>
#include "patterns.h"
class ChangePatterns
{
public:
void SetPatterns(Patterns * ppatterns);
/*
adding a new pattern
if such a pattern exists the method only unmarks the pattern from deleting
*/
void Add(long mount_dir_id, const std::wstring & old_pattern_name, const std::wstring & new_pattern_name);
/*
returning a pattern (if exists)
can return a null pointer
*/
Ezc::Pattern * Get(long mount_dir_id, const std::wstring & old_pattern_name, size_t locale_index);
/*
marking all patterns as ready to delete
*/
void MarkAllToDelete();
/*
delete marked patterns
if you have called Add() then such a pattern is not deleted
*/
void DeleteMarked();
private:
Patterns * patterns;
struct Template
{
bool to_delete;
size_t index; // pattern index in 'patterns' object
};
typedef std::map<std::wstring, Template> Value;
typedef std::map<long, Value> PatTab;
PatTab pat_tab;
};
#endif

96
templates/indexpatterns.cpp
View File

@ -2,7 +2,7 @@
* This file is a part of Winix * This file is a part of Winix
* and is not publicly distributed * and is not publicly distributed
* *
* Copyright (c) 2010, Tomasz Sowa * Copyright (c) 2010-2011, Tomasz Sowa
* All rights reserved. * All rights reserved.
* *
*/ */
@ -11,102 +11,38 @@
#include "core/log.h" #include "core/log.h"
IndexPatterns::IndexPatterns()
void IndexPatterns::SetPatterns(Patterns * ppatterns)
{ {
config = 0; patterns = ppatterns;
ezc_fun = 0;
} }
void IndexPatterns::SetConfig(Config * pconfig)
{
config = pconfig;
}
Ezc::Pattern * IndexPatterns::Get(const std::wstring & file, size_t lang)
void IndexPatterns::SetEzcFunctions(TemplatesFunctions::EzcFun * fun)
{
ezc_fun = fun;
}
Ezc::Pattern * IndexPatterns::GetPattern(const std::wstring & file, size_t lang)
{ {
Tab::iterator i = tab.find(file); Tab::iterator i = tab.find(file);
if( i == tab.end() ) if( i == tab.end() )
return 0; return 0;
if( lang >= i->second.patterns.size() ) return patterns->Get(i->second.index, lang);
{
log << log1 << "IndexPatterns: there is no a pattern: " << file << ", for lang: " << lang << logend;
return 0;
}
return &i->second.patterns[lang];
} }
void IndexPatterns::AddPattern(const std::wstring & file, Locale & locale, LocaleFilter & locale_filter, bool delete_white) void IndexPatterns::Add(const std::wstring & file)
{ {
std::pair<Tab::iterator, bool> ins = tab.insert( std::make_pair(file, Template()) ); std::pair<Tab::iterator, bool> res = tab.insert( std::make_pair(file, Template()) );
Tab::iterator i = ins.first;
i->second.to_delete = false; Template & tmpl = res.first->second;
ReadPattern(i, locale, locale_filter, delete_white);
}
// mark the pattern to not delete
tmpl.to_delete = false;
void IndexPatterns::AddPatternIfNotExists(const std::wstring & file, Locale & locale, LocaleFilter & locale_filter, bool delete_white) if( res.second )
{ tmpl.index = patterns->Add(file);
Tab::iterator i = tab.find(file);
if( i != tab.end() )
{
i->second.to_delete = false;
return;
}
AddPattern(file, locale, locale_filter, delete_white);
}
void IndexPatterns::AddFileName(const std::wstring & file)
{
tab.insert( std::make_pair(file, Template()) );
}
void IndexPatterns::ReadPattern(Tab::iterator & iter, Locale & locale, LocaleFilter & locale_filter, bool delete_white)
{
size_t i;
size_t len = locale.Size();
Template & templ = iter->second;
templ.patterns.resize(len);
for(i=0 ; i<len ; ++i)
{
templ.patterns[i].UTF8(config->utf8);
templ.patterns[i].DeleteWhiteTextItems(delete_white);
templ.patterns[i].Directory(config->templates_dir, config->templates_dir_default);
templ.patterns[i].ParseFile(iter->first);
if( ezc_fun )
templ.patterns[i].CacheFunctions(*ezc_fun);
locale_filter.Filter(templ.patterns[i], locale, i);
}
}
void IndexPatterns::ReloadPatterns(Locale & locale, LocaleFilter & locale_filter, bool delete_white)
{
Tab::iterator i;
for(i=tab.begin() ; i!=tab.end() ; ++i)
ReadPattern(i, locale, locale_filter, delete_white);
} }
@ -120,6 +56,7 @@ Tab::iterator i;
} }
void IndexPatterns::DeleteMarked() void IndexPatterns::DeleteMarked()
{ {
Tab::iterator i = tab.begin(); Tab::iterator i = tab.begin();
@ -131,7 +68,10 @@ Tab::iterator next;
++next; ++next;
if( i->second.to_delete ) if( i->second.to_delete )
{
patterns->Erase(i->second.index);
tab.erase(i); tab.erase(i);
}
i = next; i = next;
} }

54
templates/indexpatterns.h
View File

@ -2,7 +2,7 @@
* This file is a part of Winix * This file is a part of Winix
* and is not publicly distributed * and is not publicly distributed
* *
* Copyright (c) 2010, Tomasz Sowa * Copyright (c) 2010-2011, Tomasz Sowa
* All rights reserved. * All rights reserved.
* *
*/ */
@ -14,10 +14,7 @@
#include <vector> #include <vector>
#include <map> #include <map>
#include "ezc.h" #include "ezc.h"
#include "misc.h" #include "patterns.h"
#include "localefilter.h"
#include "locale.h"
#include "core/config.h"
@ -25,43 +22,50 @@ class IndexPatterns
{ {
public: public:
IndexPatterns(); void SetPatterns(Patterns * ppatterns);
void SetConfig(Config * pconfig);
void SetEzcFunctions(TemplatesFunctions::EzcFun * fun);
// can return null pointer if there is not such a pattern
Ezc::Pattern * GetPattern(const std::wstring & file, size_t lang);
void AddPattern(const std::wstring & file, Locale & locale, LocaleFilter & locale_filter, bool delete_white);
void AddPatternIfNotExists(const std::wstring & file, Locale & locale, LocaleFilter & locale_filter, bool delete_white);
// adding a file name without reading the pattern /*
// the pattern will be read during ReloadPatterns() adding a new pattern
void AddFileName(const std::wstring & file); if such a pattern exists the method only unmarks the pattern from deleting
*/
void Add(const std::wstring & file);
void ReloadPatterns(Locale & locale, LocaleFilter & locale_filter, bool delete_white);
/*
returning a pattern
can return null pointer if there is not such a pattern
*/
Ezc::Pattern * Get(const std::wstring & file, size_t lang);
/*
marking all patterns as ready to delete
*/
void MarkAllToDelete(); void MarkAllToDelete();
/*
delete marked patterns
if you have called Add(pattern_name) then such a pattern is not deleted
*/
void DeleteMarked(); void DeleteMarked();
private: private:
Config * config; Patterns * patterns;
// can be null (not set directly)
TemplatesFunctions::EzcFun * ezc_fun;
struct Template struct Template
{ {
bool to_delete; bool to_delete;
size_t index;
// table[lang]
std::vector<Ezc::Pattern> patterns;
}; };
typedef std::map<std::wstring, Template> Tab; typedef std::map<std::wstring, Template> Tab;
Tab tab; Tab tab;
void ReadPattern(Tab::iterator & i, Locale & locale, LocaleFilter & locale_filter, bool delete_white);
}; };

58
templates/misc.cpp
View File

@ -12,59 +12,14 @@
#include "misc.h" #include "misc.h"
#include "core/misc.h" #include "core/misc.h"
#include "core/request.h" #include "core/request.h"
#include "core/user.h"
namespace TemplatesFunctions namespace TemplatesFunctions
{ {
/*
bool HtmlTryChar(TextStream<std::wstring> & out, wchar_t c)
{
if( c == '<' )
{
out << L"&lt;";
return true;
}
else
if( c == '>' )
{
out << L"&gt;";
return true;
}
else
if( c == '&' )
{
out << L"&amp;";
return true;
}
return false;
}
void HtmlEscape(TextStream<std::wstring> & out, const std::wstring & in)
{
std::wstring::const_iterator i;
for(i = in.begin() ; i != in.end() ; ++i)
{
if( !HtmlTryChar(out, *i) )
out << *i;
}
}
std::wstring HtmlEscape(const std::wstring & in)
{
TextStream<std::wstring> out;
HtmlEscape(out, in);
return out.Str();
}
*/
void HtmlEscapeFormTxt(HtmlTextStream & out, const std::wstring & in) void HtmlEscapeFormTxt(HtmlTextStream & out, const std::wstring & in)
{ {
std::wstring::const_iterator i; std::wstring::const_iterator i;
@ -104,16 +59,7 @@ int was_enter = 0; // how many enteres there were before
out << R("</p>\n"); out << R("</p>\n");
} }
/*
std::wstring HtmlEscapeFormTxt(const std::wstring & in)
{
TextStream<std::wstring> out;
HtmlEscapeFormTxt(out, in);
return out.Str();
}
*/
void print_date_nice(Info & i, const tm & rtm) void print_date_nice(Info & i, const tm & rtm)

46
templates/misc.h
View File

@ -16,11 +16,14 @@
#include "localefilter.h" #include "localefilter.h"
#include "ezc.h" #include "ezc.h"
#include "htmltextstream.h" #include "htmltextstream.h"
#include "core/user.h"
class User;
namespace TemplatesFunctions namespace TemplatesFunctions
{ {
typedef Ezc::Functions<HtmlTextStream> EzcFun; typedef Ezc::Functions<HtmlTextStream> EzcFun;
typedef Ezc::Generator<HtmlTextStream> EzcGen; typedef Ezc::Generator<HtmlTextStream> EzcGen;
typedef Ezc::FunInfo<HtmlTextStream> Info; typedef Ezc::FunInfo<HtmlTextStream> Info;
@ -32,54 +35,13 @@ HtmlTextStream::RawText<RawType> R(const RawType & par)
} }
//void HtmlEscape(TextStream<std::wstring> & out, const std::wstring & in);
void HtmlEscapeFormTxt(HtmlTextStream & out, const std::wstring & in); void HtmlEscapeFormTxt(HtmlTextStream & out, const std::wstring & in);
//std::wstring HtmlEscape(const std::wstring & in);
//std::wstring HtmlEscapeFormTxt(const std::wstring & in);
// table: [language][file]
typedef std::vector<std::vector<Ezc::Pattern> > Patterns;
void print_date_nice(Info & i, const tm & rtm); void print_date_nice(Info & i, const tm & rtm);
void print_user_name(Info & i, const User * puser, const std::wstring & guest_name); void print_user_name(Info & i, const User * puser, const std::wstring & guest_name);
// those functions from here are used in the second thread too
template<class StreamType>
void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & locale_filter,
Ezc::Functions<StreamType> & ezc_fun, const wchar_t * file, bool read_file_as_utf8,
const std::wstring & templates_dir, const std::wstring & templates_dir_default,
bool delete_white = false)
{
size_t i;
size_t len = patterns.size();
for(i=0 ; i<len ; ++i)
{
if( pat < patterns[i].size() )
{
patterns[i][pat].UTF8(read_file_as_utf8);
patterns[i][pat].DeleteWhiteTextItems(delete_white);
patterns[i][pat].Directory(templates_dir, templates_dir_default);
patterns[i][pat].ParseFile(file);
patterns[i][pat].CacheFunctions(ezc_fun);
locale_filter.Filter(patterns[i][pat], locale, i);
}
}
}
} // namespace TemplatesFunctions } // namespace TemplatesFunctions
#endif #endif

174
templates/patterns.cpp Executable file
View File

@ -0,0 +1,174 @@
/*
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2011, Tomasz Sowa
* All rights reserved.
*
*/
#include "patterns.h"
#include "core/log.h"
Patterns::Patterns()
{
utf8 = false;
del_white_items = false;
ezc_fun = 0;
locale = 0;
locale_filter = 0;
}
void Patterns::SetUTF8(bool _utf8)
{
utf8 = _utf8;
}
void Patterns::SetDeleteWhiteItems(bool del_white)
{
del_white_items = del_white;
}
void Patterns::SetDirectories(const std::wstring & tmpl_dir, const std::wstring & tmpl_dir_def)
{
templates_dir = tmpl_dir;
templates_dir_def = tmpl_dir_def;
}
void Patterns::SetLocale(Locale * plocale)
{
locale = plocale;
}
void Patterns::SetLocaleFilter(LocaleFilter * plocale_filter)
{
locale_filter = plocale_filter;
}
void Patterns::SetEzcFunctions(TemplatesFunctions::EzcFun * fun)
{
ezc_fun = fun;
}
size_t Patterns::Add(const wchar_t * file_name, bool read_pattern)
{
for(size_t i=0 ; i<pat_tab.size() ; ++i)
{
if( pat_tab[i].references > 0 && pat_tab[i].file_name == file_name )
{
pat_tab[i].references += 1;
return i;
}
}
template_temp.to_delete = false;
template_temp.file_name = file_name;
template_temp.references = 1;
template_temp.patterns.clear();
pat_tab.push_back(template_temp);
if( read_pattern )
ReadPatterns(pat_tab.back());
return pat_tab.size()-1;
}
size_t Patterns::Add(const std::wstring & file_name, bool read_pattern)
{
return Add(file_name.c_str(), read_pattern);
}
void Patterns::ReadPatterns(Template & templ)
{
size_t len = locale->Size();
templ.patterns.resize(len);
for(size_t i=0 ; i<len ; ++i)
{
templ.patterns[i].UTF8(utf8);
templ.patterns[i].DeleteWhiteTextItems(del_white_items);
templ.patterns[i].Directory(templates_dir, templates_dir_def);
templ.patterns[i].ParseFile(templ.file_name);
if( ezc_fun )
templ.patterns[i].CacheFunctions(*ezc_fun);
locale_filter->Filter(templ.patterns[i], *locale, i);
}
}
Ezc::Pattern * Patterns::Get(size_t index, size_t lang)
{
if( index >= pat_tab.size() || pat_tab[index].references == 0 || lang >= pat_tab[index].patterns.size() )
return 0;
return &pat_tab[index].patterns[lang];
}
const std::wstring & Patterns::GetFileName(size_t index)
{
if( index >= pat_tab.size() || pat_tab[index].references == 0 )
return empty_str;
return pat_tab[index].file_name;
}
void Patterns::Reload()
{
for(size_t i=0 ; i<pat_tab.size() ; ++i)
if( pat_tab[i].references > 0 )
ReadPatterns(pat_tab[i]);
}
void Patterns::Clear()
{
pat_tab.clear();
}
void Patterns::Erase(size_t index)
{
if( index < pat_tab.size() )
{
pat_tab[index].references -= 1;
if( pat_tab[index].references == 0 )
{
log << log3 << "Patterns: removing pattern: " << pat_tab[index].file_name << logend;
pat_tab[index].file_name.clear();
pat_tab[index].patterns.clear();
// don't erase pat_tab.erase() here
// because indexes would be invalidated
// those gaps will be cleared when Clear() method is called
// normally in reload/templates winix function
}
}
}
size_t Patterns::Size()
{
return pat_tab.size();
}

127
templates/patterns.h Executable file
View File

@ -0,0 +1,127 @@
/*
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2011, Tomasz Sowa
* All rights reserved.
*
*/
#ifndef headerfile_winix_templates_patterns
#define headerfile_winix_templates_patterns
#include <vector>
#include "locale.h"
#include "localefilter.h"
#include "misc.h"
class Patterns
{
public:
Patterns();
void SetUTF8(bool _utf8);
void SetDeleteWhiteItems(bool del_white);
void SetDirectories(const std::wstring & tmpl_dir, const std::wstring & tmpl_dir_def);
/*
setting locale and locale_filter
this method should always be called on the beginning
*/
void SetLocale(Locale * plocale);
void SetLocaleFilter(LocaleFilter * plocale_filter);
/*
setting ezc functions
you don't have to call this method
(in such a case functions will be search with O(log) by the Generator)
*/
void SetEzcFunctions(TemplatesFunctions::EzcFun * fun);
/*
adding a new pattern and returning its index
if the pattern already exists the method returns its index only
and increment internal reference counter for such pattern
if read_pattern is false then the pattern is not read,
it will be read when you call Reload() method
*/
size_t Add(const wchar_t * file_name, bool read_pattern = true);
size_t Add(const std::wstring & file_name, bool read_pattern = true);
/*
returning a pattern (if exists)
if the pattern does not exist return a null pointer
*/
Ezc::Pattern * Get(size_t index, size_t lang);
/*
returning a file name of a pattern
or an empty string if the pattern does not exist
*/
const std::wstring & GetFileName(size_t index);
/*
deleting all patterns
*/
void Clear();
/*
decrementing internal reference counter and if zero then deletes the pattern
*/
void Erase(size_t index);
/*
reloading all patterns
*/
void Reload();
/*
returning how many patterns do we have
remember that we have one pattern for each language
so the real number of patterns is: locale->Size() * Size()
*/
size_t Size();
private:
bool utf8;
bool del_white_items;
std::wstring templates_dir, templates_dir_def;
Locale * locale;
LocaleFilter * locale_filter;
// can be null (not set directly)
TemplatesFunctions::EzcFun * ezc_fun;
struct Template
{
bool to_delete;
std::wstring file_name;
size_t references; // starts from 1 (zero means the pattern was deleted)
std::vector<Ezc::Pattern> patterns; // table[lang]
};
typedef std::vector<Template> PatTab;
PatTab pat_tab;
Template template_temp;
// non-const for default assignment operator to be created
std::wstring empty_str;
void ReadPatterns(Template & templ);
};
#endif

294
templates/templates.cpp
View File

@ -18,15 +18,23 @@
namespace TemplatesFunctions namespace TemplatesFunctions
{ {
size_t pat_index;
size_t pat_err_404;
size_t pat_err_per_denied;
Patterns patterns; // all html patterns
IndexPatterns index_patterns; // patterns for main index template (those from mountpoint) IndexPatterns index_patterns; // patterns for main index template (those from mountpoint)
Patterns patterns; // those patterns from enum Pat // index_atterns uses patterns as a storage
Patterns patterns_fun; // patterns for winix functions ChangePatterns change_patterns; // patterns for change_template mount option (storage is in 'patterns' too)
PatternCacher pattern_cacher; // patterns for user items (files with an executable bit set) PatternCacher pattern_cacher; // patterns for user items (files with an executable bit set)
Locale locale; Locale locale;
EzcFun ezc_functions; EzcFun ezc_functions;
LocaleFilter locale_filter; LocaleFilter locale_filter;
HTMLFilter html_filter; HTMLFilter html_filter;
// used by GenerateRunRaw() // used by GenerateRunRaw()
std::vector<std::wstring> empty_pars; std::vector<std::wstring> empty_pars;
const std::wstring empty_string; const std::wstring empty_string;
@ -46,24 +54,26 @@ static EzcGen content_gen;
Ezc::Pattern * content_for_function() Ezc::Pattern * GetPatternForFunction()
{ {
static std::wstring fun_file;
if( !cur->request->function ) if( !cur->request->function )
{ {
log << log1 << "Templates: no function" << logend; log << log1 << "Templates: cannot get a template for a function (there is not a function)" << logend;
return 0; return 0;
} }
const size_t loc_index = locale.GetLang(); fun_file = config->templates_fun_prefix;
const size_t fun_id = static_cast<size_t>(cur->request->function->id); fun_file += cur->request->function->fun.url;
fun_file += config->templates_fun_postfix;
if( loc_index >= patterns_fun.size() || fun_id >= patterns_fun[loc_index].size() ) Ezc::Pattern * p = change_patterns.Get(cur->mount->dir_id, fun_file, locale.GetLang());
{
log << log1 << "Templates: incorrect function index" << logend;
return 0;
}
return &patterns_fun[loc_index][fun_id]; if( p )
return p;
return patterns.Get(cur->request->function->template_index, locale.GetLang());
} }
@ -72,13 +82,6 @@ void content(Info & i)
{ {
Ezc::Pattern * p = 0; Ezc::Pattern * p = 0;
if( locale.GetLang() >= patterns.size() )
{
log << log1 << "Templates: there is no such a language in patterns" << logend;
return;
}
switch( cur->request->status ) switch( cur->request->status )
{ {
//case WINIX_ERR_NO_ITEM: !! we need something like 'error::item_required' //case WINIX_ERR_NO_ITEM: !! we need something like 'error::item_required'
@ -92,14 +95,14 @@ Ezc::Pattern * p = 0;
case WINIX_ERR_CANT_CHANGE_GROUP: case WINIX_ERR_CANT_CHANGE_GROUP:
case WINIX_ERR_CANT_CHANGE_PRIVILEGES: case WINIX_ERR_CANT_CHANGE_PRIVILEGES:
// !! locale.GetLang() bedzie brane indywidualnie dla kazdego uzytkownika // !! locale.GetLang() bedzie brane indywidualnie dla kazdego uzytkownika
p = &patterns[locale.GetLang()][pat_err_per_denied]; p = patterns.Get(pat_err_per_denied, locale.GetLang());
break; break;
case WINIX_ERR_NO_ITEM: case WINIX_ERR_NO_ITEM:
case WINIX_ERR_NO_FUNCTION: case WINIX_ERR_NO_FUNCTION:
case WINIX_ERR_UNKNOWN_PARAM: case WINIX_ERR_UNKNOWN_PARAM:
// !! locale.GetLang() bedzie brane indywidualnie dla kazdego uzytkownika // !! locale.GetLang() bedzie brane indywidualnie dla kazdego uzytkownika
p = &patterns[locale.GetLang()][pat_err_404]; p = patterns.Get(pat_err_404, locale.GetLang());
break; break;
//default: //default:
@ -111,7 +114,7 @@ Ezc::Pattern * p = 0;
//case WINIX_ERR_SPAM: //case WINIX_ERR_SPAM:
//case WINIX_ERR_INCORRECT_REBUS: //case WINIX_ERR_INCORRECT_REBUS:
default: default:
p = content_for_function(); p = GetPatternForFunction();
break; break;
} }
@ -119,7 +122,7 @@ Ezc::Pattern * p = 0;
if( p ) if( p )
content_gen.Generate(i.out, *p); content_gen.Generate(i.out, *p);
else else
i.out << "<!-- there are not any patterns -->"; log << log1 << "Templates: content: there are not any patterns";
} }
@ -522,25 +525,9 @@ void Templates::CreateFunctions()
void Templates::ReadFile(TemplatesFunctions::Pat pat, const wchar_t * file)
{
using namespace TemplatesFunctions;
Read(patterns, static_cast<size_t>(pat), locale, locale_filter, ezc_functions, file, config->utf8,
config->templates_dir, config->templates_dir_default);
}
void Templates::ReadFileFun(size_t index, const wchar_t * file) void Templates::ReadLocale()
{
using namespace TemplatesFunctions;
Read(patterns_fun, index, locale, locale_filter, ezc_functions, file, config->utf8,
config->templates_dir, config->templates_dir_default);
}
void Templates::SetLocale()
{ {
using namespace TemplatesFunctions; using namespace TemplatesFunctions;
@ -550,10 +537,12 @@ using namespace TemplatesFunctions;
locale.SetLang(config->locale_default_index); // !! w przyszlosci locale beda ustawiane dla kazdego uzytkownika osobno locale.SetLang(config->locale_default_index); // !! w przyszlosci locale beda ustawiane dla kazdego uzytkownika osobno
locale.SetLangDef(config->locale_default_index); locale.SetLangDef(config->locale_default_index);
locale.Read(config->locale_dir, config->locale_dir_default); locale.Read(config->locale_dir, config->locale_dir_default);
log << log3 << "Templates: there are " << locale.Size() << " locales" << logend;
} }
void Templates::ReadFunctionsTemplates() void Templates::ReadTemplatesForFunctions()
{ {
using namespace TemplatesFunctions; using namespace TemplatesFunctions;
@ -562,24 +551,58 @@ using namespace TemplatesFunctions;
for(; i != functions->End() ; ++i) for(; i != functions->End() ; ++i)
{ {
const std::wstring & fun_name = i->first; const std::wstring & fun_name = i->first;
const size_t index = i->second->id;
if( index < functions->FunctionsSize() ) fun_file = config->templates_fun_prefix;
fun_file += fun_name;
fun_file += config->templates_fun_postfix;
i->second->template_index = patterns.Add(fun_file);
}
}
void Templates::ReadIndexTemplates()
{
using namespace TemplatesFunctions;
Mounts::MountTab::const_iterator i;
const Mounts::MountTab * pmount_tab = TemplatesFunctions::system->mounts.GetMountTab();
const size_t html_id = (size_t)TemplatesFunctions::system->mounts.MountParHtmlTemplate();
// loop through all mount points
for(i=pmount_tab->begin() ; i!=pmount_tab->end() ; ++i)
{
const Mount & mount = i->second;
if( html_id < mount.param.size() && mount.param[html_id].defined )
{ {
fun_file = config->templates_fun_prefix; size_t len = mount.param[html_id].arg.size();
fun_file += fun_name;
fun_file += config->templates_fun_postfix; // loop through all html_templates() values
ReadFileFun(index, fun_file.c_str()); for(size_t a=0 ; a<len ; ++a)
} index_patterns.Add(mount.param[html_id].arg[a]);
else
{
log << log1 << "Templates: function index too large, fun: "
<< fun_name << ", index: " << index << logend;
} }
} }
} }
/*
reading only new index templates
those which are exists are not touched
the rest are deleted
*/
void Templates::ReadNewIndexTemplates()
{
using namespace TemplatesFunctions;
index_patterns.MarkAllToDelete();
ReadIndexTemplates();
index_patterns.DeleteMarked();
}
void Templates::SetHtmlFilter() void Templates::SetHtmlFilter()
{ {
using namespace TemplatesFunctions; using namespace TemplatesFunctions;
@ -608,117 +631,88 @@ using namespace TemplatesFunctions;
void Templates::ReadTemplates() void Templates::ReadChangeTemplates()
{
using namespace TemplatesFunctions;
SetLocale();
ClearPatterns();
ReadFile(pat_index, config->templates_index.c_str());
ReadFile(pat_err_404, L"err_404.html");
ReadFile(pat_err_per_denied, L"err_per_denied.html");
ReadFunctionsTemplates();
index_patterns.ReloadPatterns(locale, locale_filter, false);
SetHtmlFilter();
}
// reading only new index templates (with parsing)
// those which are exists are not touched
// the rest are deleted
void Templates::ReadNewIndexTemplates()
{
using namespace TemplatesFunctions;
index_patterns.MarkAllToDelete();
ReadIndexFileNames(true);
index_patterns.DeleteMarked();
}
// if add_pattern is true then pattern will be read (parsed)
// if add_pattern is false then only file_name of the pattern will be remembered
// you can next call ReadTemplates() to read those patterns
void Templates::ReadIndexFileNames(bool add_pattern)
{ {
using namespace TemplatesFunctions; using namespace TemplatesFunctions;
Mounts::MountTab::const_iterator i; Mounts::MountTab::const_iterator i;
const Mounts::MountTab * pmount_tab = TemplatesFunctions::system->mounts.GetMountTab(); const Mounts::MountTab * pmount_tab = TemplatesFunctions::system->mounts.GetMountTab();
const size_t change_id = (size_t)TemplatesFunctions::system->mounts.MountParChangeTemplate();
// loop through all mount points // loop through all mount points
for(i=pmount_tab->begin() ; i!=pmount_tab->end() ; ++i) for(i=pmount_tab->begin() ; i!=pmount_tab->end() ; ++i)
{ {
const Mount & mount = i->second; const Mount & mount = i->second;
int html_id = TemplatesFunctions::system->mounts.MountParHtmlTemplate();
if( size_t(html_id) >= mount.param.size() ) if( change_id < mount.param.size() && mount.param[change_id].defined )
{ {
log << log1 << "Templates: something wrong in mount points, there is no" const std::vector<std::wstring> & arg = mount.param[change_id].arg;
<< " html template parameter" << logend;
}
else
if( mount.param[html_id].defined )
{
size_t len = mount.param[html_id].arg.size();
size_t a;
// loop through all html_templates() values for(size_t a=0 ; a+1 < arg.size() ; a += 2)
for(a=0 ; a<len ; ++a) change_patterns.Add(mount.dir_id, arg[a], arg[a+1]);
{
const std::wstring & file_name = mount.param[html_id].arg[a];
if( add_pattern )
index_patterns.AddPatternIfNotExists(file_name, locale, locale_filter, false); // file pattern will be unmarked
else
index_patterns.AddFileName(file_name);
}
} }
} }
} }
void Templates::ClearPatterns(TemplatesFunctions::Patterns & patterns, size_t len) /*
reading only new 'change' templates
those which are exists are not touched
the rest are deleted
*/
void Templates::ReadNewChangeTemplates()
{ {
using namespace TemplatesFunctions; using namespace TemplatesFunctions;
size_t loc, pat;
patterns.resize(locale.Size()); change_patterns.MarkAllToDelete();
ReadChangeTemplates();
for(loc=0 ; loc < patterns.size() ; ++loc) change_patterns.DeleteMarked();
{
patterns[loc].resize(len);
for(pat=0 ; pat<len ; ++pat)
patterns[loc][pat].Clear();
}
} }
void Templates::ReadTemplates()
{
using namespace TemplatesFunctions;
ReadLocale();
patterns.Clear();
pat_index = patterns.Add(config->templates_index);
pat_err_404 = patterns.Add(L"err_404.html");
pat_err_per_denied = patterns.Add(L"err_per_denied.html");
ReadTemplatesForFunctions();
ReadIndexTemplates();
ReadChangeTemplates();
SetHtmlFilter();
log << log3 << "Templates: there are " << patterns.Size() << " patterns"
<< " (" << (locale.Size() * patterns.Size()) << " for all locales)" << logend;
}
void Templates::Init() void Templates::Init()
{ {
using namespace TemplatesFunctions; using namespace TemplatesFunctions;
patterns.SetUTF8(config->utf8);
patterns.SetDirectories(config->templates_dir, config->templates_dir_default);
pattern_cacher.SetWhenDelete(config->pattern_cacher_when_delete, config->pattern_cacher_how_many_delete); pattern_cacher.SetWhenDelete(config->pattern_cacher_when_delete, config->pattern_cacher_how_many_delete);
CreateFunctions(); // create functions first (functions will be cached by patterns) CreateFunctions(); // create functions first (functions will be cached by patterns)
ReadIndexFileNames();
ReadTemplates(); ReadTemplates();
} }
// index_patterns and patterns for items are not cleared here
void Templates::ClearPatterns()
{
using namespace TemplatesFunctions;
ClearPatterns(patterns, pat_last);
ClearPatterns(patterns_fun, functions->FunctionsSize());
}
// clearing at the end of a request // clearing at the end of a request
@ -734,44 +728,35 @@ using namespace TemplatesFunctions;
void Templates::Generate() void Templates::Generate()
{ {
using namespace TemplatesFunctions; using namespace TemplatesFunctions;
// !! locale beda w zaleznosci od uzytkownika
if( locale.GetLang() >= patterns.size() )
return;
Ezc::Pattern * index = 0; Ezc::Pattern * index = 0;
const std::wstring * index_file_local = 0; const std::wstring * index_file_local = 0;
if( cur->request->is_item ) if( !cur->request->last_item->html_template.empty() )
{ index_file_local = &cur->request->last_item->html_template;
if( !cur->request->item.html_template.empty() )
index_file_local = &cur->request->item.html_template;
}
else
{
if( !cur->request->dir_tab.back()->html_template.empty() )
index_file_local = &cur->request->dir_tab.back()->html_template;
}
if( !index_file_local ) if( !index_file_local )
{ {
const std::wstring & temp = TemplatesFunctions::system->mounts.pmount->FirstArg( Mounts & mounts = TemplatesFunctions::system->mounts;
TemplatesFunctions::system->mounts.MountParHtmlTemplate() ); const std::wstring & temp = cur->mount->FirstArg(mounts.MountParHtmlTemplate());
if( !temp.empty() ) if( !temp.empty() )
index_file_local = &temp; index_file_local = &temp;
} }
if( index_file_local && *index_file_local != config->templates_index ) if( index_file_local && *index_file_local != config->templates_index )
index = index_patterns.GetPattern(*index_file_local, locale.GetLang()); index = index_patterns.Get(*index_file_local, locale.GetLang());
if( !index ) if( !index )
index = &patterns[locale.GetLang()][pat_index]; index = change_patterns.Get(cur->mount->dir_id, config->templates_index, locale.GetLang());
generator.Generate(cur->request->page, *index); if( !index )
index = patterns.Get(pat_index, locale.GetLang());;
if( index )
generator.Generate(cur->request->page, *index);
else
log << log1 << "Templates: I cannot find an index template" << logend;
} }
@ -804,7 +789,6 @@ using namespace TemplatesFunctions;
void Templates::SetConfig(Config * pconfig) void Templates::SetConfig(Config * pconfig)
{ {
TemplatesFunctions::config = pconfig; TemplatesFunctions::config = pconfig;
TemplatesFunctions::index_patterns.SetConfig(pconfig);
} }
@ -842,8 +826,14 @@ void Templates::SetSessionManager(SessionManager * psession_manager)
Templates::Templates() Templates::Templates()
{ {
using namespace TemplatesFunctions; using namespace TemplatesFunctions;
index_patterns.SetEzcFunctions(&ezc_functions);
patterns.SetEzcFunctions(&ezc_functions);
patterns.SetLocale(&locale);
patterns.SetLocaleFilter(&locale_filter);
index_patterns.SetPatterns(&patterns);
change_patterns.SetPatterns(&patterns);
pattern_cacher.SetEzcFunctions(&ezc_functions); pattern_cacher.SetEzcFunctions(&ezc_functions);
} }

33
templates/templates.h
View File

@ -17,6 +17,8 @@
#include "patterncacher.h" #include "patterncacher.h"
#include "indexpatterns.h" #include "indexpatterns.h"
#include "locale.h" #include "locale.h"
#include "patterns.h"
#include "changepatterns.h"
#include "htmltextstream.h" #include "htmltextstream.h"
#include "localefilter.h" #include "localefilter.h"
#include "core/config.h" #include "core/config.h"
@ -34,19 +36,14 @@ class Functions;
namespace TemplatesFunctions namespace TemplatesFunctions
{ {
extern size_t pat_index;
extern size_t pat_err_404;
extern size_t pat_err_per_denied;
enum Pat extern Patterns patterns;
{ extern IndexPatterns index_patterns;
pat_index = 0, // first should be zero extern ChangePatterns change_patterns;
pat_err_404, extern PatternCacher pattern_cacher;
pat_err_per_denied,
pat_last // should be last
};
extern IndexPatterns index_patterns; // patterns for main index template
extern Patterns patterns; // those patterns from enum Pat
extern Patterns patterns_fun; // patterns for winix functions
extern PatternCacher pattern_cacher; // patterns for user items (files with an executable bit set)
extern Locale locale; extern Locale locale;
extern EzcFun ezc_functions; extern EzcFun ezc_functions;
extern LocaleFilter locale_filter; extern LocaleFilter locale_filter;
@ -462,23 +459,21 @@ public:
void SetSessionManager(SessionManager * psession_manager); void SetSessionManager(SessionManager * psession_manager);
void Init(); void Init();
void ClearPatterns();
void RequestEnd(); void RequestEnd();
void ReadTemplates(); void ReadTemplates();
void ReadNewIndexTemplates(); void ReadNewIndexTemplates();
void ReadIndexFileNames(bool add_pattern = false); void ReadNewChangeTemplates();
void Generate(); void Generate();
void GenerateRunRaw(); void GenerateRunRaw();
void Generate(Ezc::Pattern & pattern); void Generate(Ezc::Pattern & pattern);
private: private:
void ReadFile(TemplatesFunctions::Pat pat, const wchar_t * file); void ReadTemplatesForFunctions();
void ReadFileFun(size_t index, const wchar_t * file); void ReadIndexTemplates();
void ReadFunctionsTemplates(); void ReadChangeTemplates();
void SetLocale(); void ReadLocale();
void SetHtmlFilter(); void SetHtmlFilter();
void ClearPatterns(TemplatesFunctions::Patterns & patterns, size_t len);
void CreateFunctions(); // should be called before reading patterns (patterns will cache ezc functions) void CreateFunctions(); // should be called before reading patterns (patterns will cache ezc functions)
TemplatesFunctions::EzcGen generator; TemplatesFunctions::EzcGen generator;