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:
2011-08-25 23:53:49 +00:00
parent ee6500ac65
commit 5b8a9c0108
46 changed files with 2896 additions and 1715 deletions

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

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

View File

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

View File

@@ -2,7 +2,7 @@
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2010, Tomasz Sowa
* Copyright (c) 2010-2011, Tomasz Sowa
* All rights reserved.
*
*/
@@ -14,10 +14,7 @@
#include <vector>
#include <map>
#include "ezc.h"
#include "misc.h"
#include "localefilter.h"
#include "locale.h"
#include "core/config.h"
#include "patterns.h"
@@ -25,43 +22,50 @@ class IndexPatterns
{
public:
IndexPatterns();
void SetConfig(Config * pconfig);
void SetEzcFunctions(TemplatesFunctions::EzcFun * fun);
void SetPatterns(Patterns * ppatterns);
// 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()
void AddFileName(const std::wstring & file);
/*
adding a new pattern
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();
/*
delete marked patterns
if you have called Add(pattern_name) then such a pattern is not deleted
*/
void DeleteMarked();
private:
Config * config;
// can be null (not set directly)
TemplatesFunctions::EzcFun * ezc_fun;
Patterns * patterns;
struct Template
{
bool to_delete;
// table[lang]
std::vector<Ezc::Pattern> patterns;
size_t index;
};
typedef std::map<std::wstring, Template> Tab;
Tab tab;
void ReadPattern(Tab::iterator & i, Locale & locale, LocaleFilter & locale_filter, bool delete_white);
};

View File

@@ -12,59 +12,14 @@
#include "misc.h"
#include "core/misc.h"
#include "core/request.h"
#include "core/user.h"
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)
{
std::wstring::const_iterator i;
@@ -104,16 +59,7 @@ int was_enter = 0; // how many enteres there were before
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)

View File

@@ -16,11 +16,14 @@
#include "localefilter.h"
#include "ezc.h"
#include "htmltextstream.h"
#include "core/user.h"
class User;
namespace TemplatesFunctions
{
typedef Ezc::Functions<HtmlTextStream> EzcFun;
typedef Ezc::Generator<HtmlTextStream> EzcGen;
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);
//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_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
#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

View File

@@ -18,15 +18,23 @@
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)
Patterns patterns; // those patterns from enum Pat
Patterns patterns_fun; // patterns for winix functions
// index_atterns uses patterns as a storage
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)
Locale locale;
EzcFun ezc_functions;
LocaleFilter locale_filter;
HTMLFilter html_filter;
// used by GenerateRunRaw()
std::vector<std::wstring> empty_pars;
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 )
{
log << log1 << "Templates: no function" << logend;
log << log1 << "Templates: cannot get a template for a function (there is not a function)" << logend;
return 0;
}
const size_t loc_index = locale.GetLang();
const size_t fun_id = static_cast<size_t>(cur->request->function->id);
fun_file = config->templates_fun_prefix;
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() )
{
log << log1 << "Templates: incorrect function index" << logend;
return 0;
}
Ezc::Pattern * p = change_patterns.Get(cur->mount->dir_id, fun_file, locale.GetLang());
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;
if( locale.GetLang() >= patterns.size() )
{
log << log1 << "Templates: there is no such a language in patterns" << logend;
return;
}
switch( cur->request->status )
{
//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_PRIVILEGES:
// !! 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;
case WINIX_ERR_NO_ITEM:
case WINIX_ERR_NO_FUNCTION:
case WINIX_ERR_UNKNOWN_PARAM:
// !! locale.GetLang() bedzie brane indywidualnie dla kazdego uzytkownika
p = &patterns[locale.GetLang()][pat_err_404];
p = patterns.Get(pat_err_404, locale.GetLang());
break;
//default:
@@ -111,7 +114,7 @@ Ezc::Pattern * p = 0;
//case WINIX_ERR_SPAM:
//case WINIX_ERR_INCORRECT_REBUS:
default:
p = content_for_function();
p = GetPatternForFunction();
break;
}
@@ -119,7 +122,7 @@ Ezc::Pattern * p = 0;
if( p )
content_gen.Generate(i.out, *p);
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)
{
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()
void Templates::ReadLocale()
{
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.SetLangDef(config->locale_default_index);
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;
@@ -562,24 +551,58 @@ using namespace TemplatesFunctions;
for(; i != functions->End() ; ++i)
{
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;
fun_file += fun_name;
fun_file += config->templates_fun_postfix;
ReadFileFun(index, fun_file.c_str());
}
else
{
log << log1 << "Templates: function index too large, fun: "
<< fun_name << ", index: " << index << logend;
size_t len = mount.param[html_id].arg.size();
// loop through all html_templates() values
for(size_t a=0 ; a<len ; ++a)
index_patterns.Add(mount.param[html_id].arg[a]);
}
}
}
/*
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()
{
using namespace TemplatesFunctions;
@@ -608,117 +631,88 @@ using namespace TemplatesFunctions;
void Templates::ReadTemplates()
{
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)
void Templates::ReadChangeTemplates()
{
using namespace TemplatesFunctions;
Mounts::MountTab::const_iterator i;
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
for(i=pmount_tab->begin() ; i!=pmount_tab->end() ; ++i)
{
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"
<< " html template parameter" << logend;
}
else
if( mount.param[html_id].defined )
{
size_t len = mount.param[html_id].arg.size();
size_t a;
const std::vector<std::wstring> & arg = mount.param[change_id].arg;
// loop through all html_templates() values
for(a=0 ; a<len ; ++a)
{
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);
}
for(size_t a=0 ; a+1 < arg.size() ; a += 2)
change_patterns.Add(mount.dir_id, arg[a], arg[a+1]);
}
}
}
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;
size_t loc, pat;
patterns.resize(locale.Size());
for(loc=0 ; loc < patterns.size() ; ++loc)
{
patterns[loc].resize(len);
for(pat=0 ; pat<len ; ++pat)
patterns[loc][pat].Clear();
}
change_patterns.MarkAllToDelete();
ReadChangeTemplates();
change_patterns.DeleteMarked();
}
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()
{
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);
CreateFunctions(); // create functions first (functions will be cached by patterns)
ReadIndexFileNames();
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
@@ -734,44 +728,35 @@ using namespace TemplatesFunctions;
void Templates::Generate()
{
using namespace TemplatesFunctions;
// !! locale beda w zaleznosci od uzytkownika
if( locale.GetLang() >= patterns.size() )
return;
Ezc::Pattern * index = 0;
const std::wstring * index_file_local = 0;
if( cur->request->is_item )
{
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( !cur->request->last_item->html_template.empty() )
index_file_local = &cur->request->last_item->html_template;
if( !index_file_local )
{
const std::wstring & temp = TemplatesFunctions::system->mounts.pmount->FirstArg(
TemplatesFunctions::system->mounts.MountParHtmlTemplate() );
Mounts & mounts = TemplatesFunctions::system->mounts;
const std::wstring & temp = cur->mount->FirstArg(mounts.MountParHtmlTemplate());
if( !temp.empty() )
index_file_local = &temp;
}
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 )
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)
{
TemplatesFunctions::config = pconfig;
TemplatesFunctions::index_patterns.SetConfig(pconfig);
}
@@ -842,8 +826,14 @@ void Templates::SetSessionManager(SessionManager * psession_manager)
Templates::Templates()
{
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);
}

View File

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