added support for UTF-8

now the UTF-8 is a default charset


git-svn-id: svn://ttmath.org/publicrep/winix/trunk@677 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2010-11-21 00:19:17 +00:00
parent f1f0fa34cb
commit 8e72a820dd
153 changed files with 4270 additions and 2784 deletions

View File

@@ -1,15 +1,18 @@
# DO NOT DELETE
adduser.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
adduser.o: ../core/locale.h ../core/confparser.h ../core/user.h
adduser.o: patterncacher.h ../core/item.h ckeditorgetparser.h
adduser.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
adduser.o: ../core/locale.h ../core/config.h ../core/htmlfilter.h ../db/db.h
adduser.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
adduser.o: ../core/textstream.h ../core/error.h ../core/log.h
adduser.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
adduser.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
adduser.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
adduser.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
adduser.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
adduser.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
adduser.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
adduser.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
adduser.o: ../core/textstream.h patterncacher.h ../core/item.h
adduser.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
adduser.o: ../core/textstream.h indexpatterns.h ../core/config.h
adduser.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h
adduser.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
adduser.o: ../core/log.h ../db/dbitemquery.h ../core/item.h
adduser.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
adduser.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
adduser.o: ../core/requesttypes.h ../core/session.h ../core/error.h
adduser.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
adduser.o: ../core/config.h ../core/system.h ../core/dirs.h
@@ -18,23 +21,27 @@ adduser.o: ../core/mount.h ../core/mountparser.h ../core/users.h
adduser.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
adduser.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
adduser.o: ../core/sessioncontainer.h ../core/system.h
dir.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h ../core/locale.h
dir.o: ../core/confparser.h ../core/user.h patterncacher.h ../core/item.h
dir.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
dir.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/htmlfilter.h
dir.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
dir.o: ../core/textstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h
dir.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
dir.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
dir.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h
dir.o: ../../ezc/src/funinfo.h misc.h localefilter.h locale.h
dir.o: ../core/confparser.h ../core/user.h ../core/textstream.h
dir.o: patterncacher.h ../core/item.h ckeditorgetparser.h
dir.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h
dir.o: indexpatterns.h ../core/config.h ../core/confparser.h
dir.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
dir.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h
dir.o: ../core/item.h ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
dir.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
dir.o: ../core/request.h ../core/requesttypes.h ../core/session.h
dir.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
dir.o: ../core/config.h ../core/system.h ../core/dirs.h
dir.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
dir.o: ../core/mount.h ../core/mountparser.h ../core/users.h
dir.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
dir.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
dir.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
dir.o: ../functions/functions.h ../functions/functionbase.h ../core/notify.h
dir.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
dir.o: ../core/requesttypes.h ../core/session.h ../core/error.h
dir.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
dir.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
dir.o: ../core/request.h ../core/mounts.h ../core/mount.h
dir.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
dir.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
dir.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
dir.o: ../core/system.h ../core/misc.h ../functions/functions.h
dir.o: ../functions/functionbase.h ../core/notify.h
dir.o: ../templatesnotify/templatesnotify.h ../core/mount.h
dir.o: ../templates/misc.h ../functions/functionparser.h
dir.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
@@ -49,128 +56,162 @@ dir.o: ../functions/subject.h ../functions/funthread.h
dir.o: ../functions/template.h ../functions/tinymce.h ../functions/uname.h
dir.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h
dir.o: ../functions/vim.h ../core/htmlfilter.h
doc.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h ../core/locale.h
doc.o: ../core/confparser.h ../core/user.h patterncacher.h ../core/item.h
doc.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
doc.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/htmlfilter.h
doc.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
doc.o: ../core/textstream.h ../core/error.h ../core/log.h ../db/dbitemquery.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/stringconv.h ../../ezc/src/functions.h
doc.o: ../../ezc/src/funinfo.h misc.h localefilter.h locale.h
doc.o: ../core/confparser.h ../core/user.h ../core/textstream.h
doc.o: patterncacher.h ../core/item.h ckeditorgetparser.h
doc.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h
doc.o: indexpatterns.h ../core/config.h ../core/confparser.h
doc.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
doc.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h
doc.o: ../core/item.h ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
doc.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
doc.o: ../core/request.h ../core/requesttypes.h ../core/session.h
doc.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
doc.o: ../core/config.h ../core/system.h ../core/dirs.h
doc.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
doc.o: ../core/mount.h ../core/mountparser.h ../core/users.h
doc.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
doc.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
doc.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
doc.o: ../core/misc.h
indexpatterns.o: indexpatterns.h ../../ezc/src/ezc.h localefilter.h
indexpatterns.o: ../core/locale.h ../core/confparser.h ../core/locale.h
indexpatterns.o: ../core/config.h ../core/htmlfilter.h ../core/log.h
item.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
item.o: ../core/locale.h ../core/confparser.h ../core/user.h patterncacher.h
item.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
item.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
item.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
item.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h
item.o: ../core/log.h ../db/dbitemquery.h ../core/item.h
item.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
item.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
item.o: ../core/request.h ../core/requesttypes.h ../core/session.h
item.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
item.o: ../core/config.h ../core/system.h ../core/dirs.h
doc.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
doc.o: ../core/requesttypes.h ../core/session.h ../core/error.h
doc.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
doc.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
doc.o: ../core/request.h ../core/mounts.h ../core/mount.h
doc.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
doc.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
doc.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
doc.o: ../core/system.h ../core/request.h ../core/misc.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/stringconv.h
indexpatterns.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
indexpatterns.o: localefilter.h locale.h ../core/confparser.h
indexpatterns.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
indexpatterns.o: ../core/log.h ../core/textstream.h
item.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
item.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
item.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
item.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
item.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
item.o: ../core/textstream.h patterncacher.h ../core/item.h
item.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
item.o: ../core/textstream.h indexpatterns.h ../core/config.h
item.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
item.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
item.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
item.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
item.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
item.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h
item.o: ../core/rebus.h ../core/config.h ../core/system.h ../core/dirs.h
item.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
item.o: ../core/mount.h ../core/mountparser.h ../core/users.h
item.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
item.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
item.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
item.o: ../core/misc.h ../core/bbcodeparser.h
last.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
last.o: ../core/locale.h ../core/confparser.h ../core/user.h patterncacher.h
last.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
last.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
last.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
last.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h
last.o: ../core/log.h ../db/dbitemquery.h ../core/item.h
last.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
last.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
last.o: ../core/request.h ../core/requesttypes.h ../core/session.h
last.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
last.o: ../core/config.h ../core/system.h ../core/dirs.h
item.o: ../core/sessioncontainer.h ../core/system.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/stringconv.h
last.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
last.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
last.o: ../core/textstream.h patterncacher.h ../core/item.h
last.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
last.o: ../core/textstream.h indexpatterns.h ../core/config.h
last.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
last.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
last.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
last.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
last.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
last.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h
last.o: ../core/rebus.h ../core/config.h ../core/system.h ../core/dirs.h
last.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
last.o: ../core/mount.h ../core/mountparser.h ../core/users.h
last.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
last.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
last.o: ../core/sessioncontainer.h ../core/system.h ../core/lastcontainer.h
last.o: ../core/request.h ../core/misc.h
localefilter.o: localefilter.h ../core/locale.h ../core/confparser.h
localefilter.o: ../../ezc/src/ezc.h ../core/misc.h ../core/item.h
ls.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h ../core/locale.h
ls.o: ../core/confparser.h ../core/user.h patterncacher.h ../core/item.h
ls.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
ls.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/htmlfilter.h
ls.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
ls.o: ../core/textstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h
locale.o: locale.h ../core/confparser.h ../core/log.h ../core/textstream.h
localefilter.o: localefilter.h locale.h ../core/confparser.h
localefilter.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h
localefilter.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
localefilter.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
localefilter.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
localefilter.o: ../core/misc.h
ls.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
ls.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
ls.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h
ls.o: ../../ezc/src/funinfo.h misc.h localefilter.h locale.h
ls.o: ../core/confparser.h ../core/user.h ../core/textstream.h
ls.o: patterncacher.h ../core/item.h ckeditorgetparser.h
ls.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h
ls.o: indexpatterns.h ../core/config.h ../core/confparser.h
ls.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
ls.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h
ls.o: ../core/item.h ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
ls.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
ls.o: ../core/request.h ../core/requesttypes.h ../core/session.h
ls.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
ls.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/dircontainer.h
ls.o: ../core/request.h ../core/mounts.h ../core/mount.h
ls.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
ls.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
ls.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
ls.o: ../core/system.h ../core/request.h
misc.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
misc.o: ../core/locale.h ../core/confparser.h ../core/user.h patterncacher.h
misc.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
misc.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
misc.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
misc.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h
misc.o: ../core/log.h ../db/dbitemquery.h ../core/item.h
misc.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
misc.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
misc.o: ../core/request.h ../core/requesttypes.h ../core/session.h
misc.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
misc.o: ../core/config.h ../core/system.h ../core/dirs.h
ls.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
ls.o: ../core/requesttypes.h ../core/session.h ../core/error.h ../core/user.h
ls.o: ../core/plugindata.h ../core/rebus.h ../core/config.h ../core/system.h
ls.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
ls.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h ../core/users.h
ls.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
ls.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
ls.o: ../core/sessioncontainer.h ../core/system.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/stringconv.h
misc.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
misc.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
misc.o: ../core/textstream.h patterncacher.h ../core/item.h
misc.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
misc.o: ../core/textstream.h indexpatterns.h ../core/config.h
misc.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
misc.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
misc.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
misc.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
misc.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
misc.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h
misc.o: ../core/rebus.h ../core/config.h ../core/system.h ../core/dirs.h
misc.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
misc.o: ../core/mount.h ../core/mountparser.h ../core/users.h
misc.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
misc.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
misc.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
mount.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
mount.o: ../core/locale.h ../core/confparser.h ../core/user.h patterncacher.h
mount.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
mount.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
mount.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
mount.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h
mount.o: ../core/log.h ../db/dbitemquery.h ../core/item.h
mount.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
mount.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
mount.o: ../core/request.h ../core/requesttypes.h ../core/session.h
mount.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
mount.o: ../core/config.h ../core/system.h ../core/dirs.h
mount.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
mount.o: ../core/mount.h ../core/mountparser.h ../core/users.h
mount.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
mount.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.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/stringconv.h
mount.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
mount.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
mount.o: ../core/textstream.h patterncacher.h ../core/item.h
mount.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
mount.o: ../core/textstream.h indexpatterns.h ../core/config.h
mount.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
mount.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
mount.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
mount.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
mount.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
mount.o: ../core/session.h ../core/error.h ../core/user.h
mount.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
mount.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
mount.o: ../core/request.h ../core/mounts.h ../core/mount.h
mount.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
mount.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
mount.o: ../core/loadavg.h ../core/sessionmanager.h
mount.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
patterncacher.o: patterncacher.h ../core/item.h ../../ezc/src/ezc.h
patterncacher.o: ../core/log.h
priv.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
priv.o: ../core/locale.h ../core/confparser.h ../core/user.h patterncacher.h
priv.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
priv.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
priv.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
priv.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h
priv.o: ../core/log.h ../db/dbitemquery.h ../core/item.h
priv.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
priv.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
priv.o: ../core/request.h ../core/requesttypes.h ../core/session.h
priv.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
priv.o: ../core/config.h ../core/system.h ../core/dirs.h
patterncacher.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
patterncacher.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
patterncacher.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h
patterncacher.o: ../../ezc/src/funinfo.h ../core/log.h ../core/textstream.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/stringconv.h
priv.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
priv.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
priv.o: ../core/textstream.h patterncacher.h ../core/item.h
priv.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
priv.o: ../core/textstream.h indexpatterns.h ../core/config.h
priv.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
priv.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
priv.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
priv.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
priv.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
priv.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h
priv.o: ../core/rebus.h ../core/config.h ../core/system.h ../core/dirs.h
priv.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
priv.o: ../core/mount.h ../core/mountparser.h ../core/users.h
priv.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
@@ -191,68 +232,81 @@ priv.o: ../functions/subject.h ../functions/funthread.h
priv.o: ../functions/template.h ../functions/tinymce.h ../functions/uname.h
priv.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h
priv.o: ../functions/vim.h ../core/htmlfilter.h
rebus.o: ../core/request.h templates.h ../../ezc/src/ezc.h misc.h
rebus.o: localefilter.h ../core/locale.h ../core/confparser.h ../core/user.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
rebus.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h
rebus.o: ../../ezc/src/funinfo.h misc.h localefilter.h locale.h
rebus.o: ../core/confparser.h ../core/user.h ../core/textstream.h
rebus.o: patterncacher.h ../core/item.h ckeditorgetparser.h
rebus.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
rebus.o: ../core/locale.h ../core/config.h ../core/htmlfilter.h ../db/db.h
rebus.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
rebus.o: ../core/textstream.h ../core/error.h ../core/log.h
rebus.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h
rebus.o: indexpatterns.h ../core/config.h ../core/confparser.h
rebus.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
rebus.o: ../db/dbtextstream.h ../core/error.h ../core/log.h
rebus.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
rebus.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
rebus.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
rebus.o: ../core/requesttypes.h ../core/session.h ../core/error.h
rebus.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
rebus.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
rebus.o: ../core/session.h ../core/error.h ../core/user.h
rebus.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
rebus.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
rebus.o: ../core/request.h ../core/mounts.h ../core/mount.h
rebus.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
rebus.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
rebus.o: ../core/loadavg.h ../core/sessionmanager.h
rebus.o: ../core/sessioncontainer.h ../core/system.h
stat.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
stat.o: ../core/locale.h ../core/confparser.h ../core/user.h patterncacher.h
stat.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
stat.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
stat.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
stat.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h
stat.o: ../core/log.h ../db/dbitemquery.h ../core/item.h
stat.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
stat.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
stat.o: ../core/request.h ../core/requesttypes.h ../core/session.h
stat.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
stat.o: ../core/config.h ../core/system.h ../core/dirs.h
stat.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
stat.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
stat.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
stat.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
stat.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
stat.o: ../core/textstream.h patterncacher.h ../core/item.h
stat.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
stat.o: ../core/textstream.h indexpatterns.h ../core/config.h
stat.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
stat.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
stat.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
stat.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
stat.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
stat.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h
stat.o: ../core/rebus.h ../core/config.h ../core/system.h ../core/dirs.h
stat.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
stat.o: ../core/mount.h ../core/mountparser.h ../core/users.h
stat.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
stat.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
stat.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
sys.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h ../core/locale.h
sys.o: ../core/confparser.h ../core/user.h patterncacher.h ../core/item.h
sys.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
sys.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/htmlfilter.h
sys.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
sys.o: ../core/textstream.h ../core/error.h ../core/log.h ../db/dbitemquery.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/stringconv.h ../../ezc/src/functions.h
sys.o: ../../ezc/src/funinfo.h misc.h localefilter.h locale.h
sys.o: ../core/confparser.h ../core/user.h ../core/textstream.h
sys.o: patterncacher.h ../core/item.h ckeditorgetparser.h
sys.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h
sys.o: indexpatterns.h ../core/config.h ../core/confparser.h
sys.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
sys.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h
sys.o: ../core/item.h ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
sys.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
sys.o: ../core/request.h ../core/requesttypes.h ../core/session.h
sys.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
sys.o: ../core/config.h ../core/system.h ../core/dirs.h
sys.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
sys.o: ../core/mount.h ../core/mountparser.h ../core/users.h
sys.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
sys.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
sys.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
sys.o: ../core/version.h
template.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
template.o: ../core/locale.h ../core/confparser.h ../core/user.h
template.o: patterncacher.h ../core/item.h ckeditorgetparser.h
template.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
template.o: ../core/locale.h ../core/config.h ../core/htmlfilter.h ../db/db.h
sys.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
sys.o: ../core/requesttypes.h ../core/session.h ../core/error.h
sys.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
sys.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
sys.o: ../core/request.h ../core/mounts.h ../core/mount.h
sys.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
sys.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
sys.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
sys.o: ../core/system.h ../core/request.h ../core/version.h
template.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
template.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
template.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
template.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
template.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
template.o: ../core/textstream.h patterncacher.h ../core/item.h
template.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
template.o: ../core/textstream.h indexpatterns.h ../core/config.h
template.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h
template.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
template.o: ../core/textstream.h ../core/error.h ../core/log.h
template.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
template.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
template.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
template.o: ../core/error.h ../core/log.h ../db/dbitemquery.h ../core/item.h
template.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
template.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
template.o: ../core/requesttypes.h ../core/session.h ../core/error.h
template.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
template.o: ../core/config.h ../core/system.h ../core/dirs.h
@@ -261,16 +315,19 @@ template.o: ../core/mount.h ../core/mountparser.h ../core/users.h
template.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
template.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
template.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
templates.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
templates.o: ../core/locale.h ../core/confparser.h ../core/user.h
templates.o: patterncacher.h ../core/item.h ckeditorgetparser.h
templates.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
templates.o: ../core/locale.h ../core/config.h ../core/htmlfilter.h
templates.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
templates.o: ../core/textstream.h ../core/error.h ../core/log.h
templates.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
templates.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
templates.o: ../core/item.h ../core/ugcontainer.h ../core/request.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/stringconv.h
templates.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
templates.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
templates.o: ../core/textstream.h patterncacher.h ../core/item.h
templates.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
templates.o: ../core/textstream.h indexpatterns.h ../core/config.h
templates.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h
templates.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
templates.o: ../core/error.h ../core/log.h ../db/dbitemquery.h ../core/item.h
templates.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
templates.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
templates.o: ../core/requesttypes.h ../core/session.h ../core/error.h
templates.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
templates.o: ../core/config.h ../core/system.h ../core/dirs.h
@@ -297,23 +354,26 @@ templates.o: ../functions/funthread.h ../functions/template.h
templates.o: ../functions/tinymce.h ../functions/uname.h
templates.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h
templates.o: ../functions/vim.h ../core/htmlfilter.h ../templates/templates.h
thread.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
thread.o: ../core/locale.h ../core/confparser.h ../core/user.h
thread.o: patterncacher.h ../core/item.h ckeditorgetparser.h
thread.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
thread.o: ../core/locale.h ../core/config.h ../core/htmlfilter.h ../db/db.h
thread.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
thread.o: ../core/textstream.h ../core/error.h ../core/log.h
thread.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
thread.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
thread.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
thread.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
thread.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
thread.o: ../core/textstream.h patterncacher.h ../core/item.h
thread.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
thread.o: ../core/textstream.h indexpatterns.h ../core/config.h
thread.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
thread.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
thread.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
thread.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
thread.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
thread.o: ../core/requesttypes.h ../core/session.h ../core/error.h
thread.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
thread.o: ../core/config.h ../core/system.h ../core/dirs.h
thread.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
thread.o: ../core/mount.h ../core/mountparser.h ../core/users.h
thread.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
thread.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
thread.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
thread.o: ../core/session.h ../core/error.h ../core/user.h
thread.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
thread.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
thread.o: ../core/request.h ../core/mounts.h ../core/mount.h
thread.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
thread.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
thread.o: ../core/loadavg.h ../core/sessionmanager.h
thread.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
thread.o: ../functions/functions.h ../functions/functionbase.h
thread.o: ../core/notify.h ../templatesnotify/templatesnotify.h
@@ -331,92 +391,109 @@ thread.o: ../functions/funthread.h ../functions/template.h
thread.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
thread.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
thread.o: ../core/htmlfilter.h
upload.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
upload.o: ../core/locale.h ../core/confparser.h ../core/user.h
upload.o: patterncacher.h ../core/item.h ckeditorgetparser.h
upload.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
upload.o: ../core/locale.h ../core/config.h ../core/htmlfilter.h ../db/db.h
upload.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
upload.o: ../core/textstream.h ../core/error.h ../core/log.h
upload.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
upload.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
upload.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
upload.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
upload.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
upload.o: ../core/textstream.h patterncacher.h ../core/item.h
upload.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
upload.o: ../core/textstream.h indexpatterns.h ../core/config.h
upload.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
upload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
upload.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
upload.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
upload.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
upload.o: ../core/requesttypes.h ../core/session.h ../core/error.h
upload.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
upload.o: ../core/config.h ../core/system.h ../core/dirs.h
upload.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
upload.o: ../core/mount.h ../core/mountparser.h ../core/users.h
upload.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
upload.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
upload.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
upload.o: ../core/session.h ../core/error.h ../core/user.h
upload.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
upload.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
upload.o: ../core/request.h ../core/mounts.h ../core/mount.h
upload.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
upload.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
upload.o: ../core/loadavg.h ../core/sessionmanager.h
upload.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
uptime.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
uptime.o: ../core/locale.h ../core/confparser.h ../core/user.h
uptime.o: patterncacher.h ../core/item.h ckeditorgetparser.h
uptime.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
uptime.o: ../core/locale.h ../core/config.h ../core/htmlfilter.h ../db/db.h
uptime.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
uptime.o: ../core/textstream.h ../core/error.h ../core/log.h
uptime.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
uptime.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
uptime.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
uptime.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
uptime.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
uptime.o: ../core/textstream.h patterncacher.h ../core/item.h
uptime.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
uptime.o: ../core/textstream.h indexpatterns.h ../core/config.h
uptime.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
uptime.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
uptime.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
uptime.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
uptime.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
uptime.o: ../core/requesttypes.h ../core/session.h ../core/error.h
uptime.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
uptime.o: ../core/config.h ../core/system.h ../core/dirs.h
uptime.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
uptime.o: ../core/mount.h ../core/mountparser.h ../core/users.h
uptime.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
uptime.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
uptime.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
uptime.o: ../core/session.h ../core/error.h ../core/user.h
uptime.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
uptime.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
uptime.o: ../core/request.h ../core/mounts.h ../core/mount.h
uptime.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
uptime.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
uptime.o: ../core/loadavg.h ../core/sessionmanager.h
uptime.o: ../core/sessioncontainer.h ../core/system.h
user.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
user.o: ../core/locale.h ../core/confparser.h ../core/user.h patterncacher.h
user.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
user.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
user.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
user.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h
user.o: ../core/log.h ../db/dbitemquery.h ../core/item.h
user.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
user.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
user.o: ../core/request.h ../core/requesttypes.h ../core/session.h
user.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
user.o: ../core/config.h ../core/system.h ../core/dirs.h
user.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
user.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
user.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
user.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
user.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
user.o: ../core/textstream.h patterncacher.h ../core/item.h
user.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
user.o: ../core/textstream.h indexpatterns.h ../core/config.h
user.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
user.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
user.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
user.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
user.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
user.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h
user.o: ../core/rebus.h ../core/config.h ../core/system.h ../core/dirs.h
user.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
user.o: ../core/mount.h ../core/mountparser.h ../core/users.h
user.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
user.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
user.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
user.o: ../core/misc.h
who.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h ../core/locale.h
who.o: ../core/confparser.h ../core/user.h patterncacher.h ../core/item.h
who.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
who.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/htmlfilter.h
who.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
who.o: ../core/textstream.h ../core/error.h ../core/log.h ../db/dbitemquery.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/stringconv.h ../../ezc/src/functions.h
who.o: ../../ezc/src/funinfo.h misc.h localefilter.h locale.h
who.o: ../core/confparser.h ../core/user.h ../core/textstream.h
who.o: patterncacher.h ../core/item.h ckeditorgetparser.h
who.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h
who.o: indexpatterns.h ../core/config.h ../core/confparser.h
who.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
who.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h
who.o: ../core/item.h ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
who.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
who.o: ../core/request.h ../core/requesttypes.h ../core/session.h
who.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
who.o: ../core/config.h ../core/system.h ../core/dirs.h
who.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
who.o: ../core/mount.h ../core/mountparser.h ../core/users.h
who.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
who.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
who.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
winix.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
winix.o: ../core/locale.h ../core/confparser.h ../core/user.h patterncacher.h
winix.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
winix.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
winix.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
winix.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h
winix.o: ../core/log.h ../db/dbitemquery.h ../core/item.h
winix.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
winix.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
winix.o: ../core/request.h ../core/requesttypes.h ../core/session.h
winix.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
winix.o: ../core/config.h ../core/system.h ../core/dirs.h
winix.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
winix.o: ../core/mount.h ../core/mountparser.h ../core/users.h
winix.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
winix.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
who.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
who.o: ../core/requesttypes.h ../core/session.h ../core/error.h
who.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
who.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
who.o: ../core/request.h ../core/mounts.h ../core/mount.h
who.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
who.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
who.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
who.o: ../core/system.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/stringconv.h
winix.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
winix.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
winix.o: ../core/textstream.h patterncacher.h ../core/item.h
winix.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
winix.o: ../core/textstream.h indexpatterns.h ../core/config.h
winix.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
winix.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
winix.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
winix.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
winix.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
winix.o: ../core/session.h ../core/error.h ../core/user.h
winix.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
winix.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
winix.o: ../core/request.h ../core/mounts.h ../core/mount.h
winix.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
winix.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
winix.o: ../core/loadavg.h ../core/sessionmanager.h
winix.o: ../core/sessioncontainer.h ../core/system.h ../core/plugin.h
winix.o: ../core/pluginmsg.h ../core/sessionmanager.h
winix.o: ../functions/functions.h ../functions/functionbase.h

View File

@@ -1 +1 @@
o = adduser.o dir.o doc.o indexpatterns.o item.o last.o localefilter.o ls.o misc.o mount.o patterncacher.o priv.o rebus.o stat.o sys.o template.o templates.o thread.o upload.o uptime.o user.o who.o winix.o
o = adduser.o dir.o doc.o indexpatterns.o item.o last.o locale.o localefilter.o ls.o misc.o mount.o patterncacher.o priv.o rebus.o stat.o sys.o template.o templates.o thread.o upload.o uptime.o user.o who.o winix.o

View File

@@ -17,13 +17,13 @@ namespace TemplatesFunctions
void adduser_last_login(Info & i)
{
i.out << request->PostVar("login");
i.out << request->PostVar(L"login");
}
void adduser_last_email(Info & i)
{
i.out << request->PostVar("email");
i.out << request->PostVar(L"email");
}

View File

@@ -148,7 +148,7 @@ void dir_childs_tab(Info & i)
if( !request->dir_tab.empty() )
{
if( request->dir_tab.size() >= 2 && i.par == "with_parent")
if( request->dir_tab.size() >= 2 && i.par == L"with_parent")
{
Item * dir_up = request->dir_tab[request->dir_tab.size()-2];
dir_childs_table.push_back(dir_up);
@@ -182,9 +182,7 @@ void dir_childs_tab_url(Info & i)
void dir_childs_tab_privileges(Info & i)
{
if( dir_childs_index < dir_childs_table.size() )
i.out << "0" << std::setbase(8)
<< dir_childs_table[dir_childs_index]->privileges
<< std::setbase(10);
i.out << "0" << Itoa(dir_childs_table[dir_childs_index]->privileges, 8);
}
@@ -296,7 +294,7 @@ void dir_last_default_item_dir(Info & i)
{
dir_last_default_item_init();
std::string path;
std::wstring path;
if( dir_last_default_item.parent_id != -1 )
if( system->dirs.MakePath(dir_last_default_item.parent_id, path) )

View File

@@ -18,7 +18,7 @@ void IndexPatterns::SetConfig(Config * pconfig)
}
Ezc::Pattern * IndexPatterns::GetPattern(const std::string & file, Locale::Lang lang)
Ezc::Pattern * IndexPatterns::GetPattern(const std::wstring & file, Locale::Lang lang)
{
Tab::iterator i = tab.find(file);
@@ -38,7 +38,7 @@ return &i->second.patterns[index];
void IndexPatterns::AddPattern(const std::string & file, Locale & locale, LocaleFilter & locale_filter, bool delete_white)
void IndexPatterns::AddPattern(const std::wstring & file, Locale & locale, LocaleFilter & locale_filter, bool delete_white)
{
std::pair<Tab::iterator, bool> ins = tab.insert( std::make_pair(file, Template()) );
Tab::iterator i = ins.first;
@@ -48,7 +48,7 @@ void IndexPatterns::AddPattern(const std::string & file, Locale & locale, Locale
}
void IndexPatterns::AddPatternIfNotExists(const std::string & file, Locale & locale, LocaleFilter & locale_filter, bool delete_white)
void IndexPatterns::AddPatternIfNotExists(const std::wstring & file, Locale & locale, LocaleFilter & locale_filter, bool delete_white)
{
Tab::iterator i = tab.find(file);
@@ -62,7 +62,7 @@ void IndexPatterns::AddPatternIfNotExists(const std::string & file, Locale & loc
}
void IndexPatterns::AddFileName(const std::string & file)
void IndexPatterns::AddFileName(const std::wstring & file)
{
tab.insert( std::make_pair(file, Template()) );
}
@@ -78,6 +78,7 @@ void IndexPatterns::ReadPattern(Tab::iterator & iter, Locale & locale, LocaleFil
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);

View File

@@ -15,7 +15,7 @@
#include <map>
#include "ezc.h"
#include "localefilter.h"
#include "core/locale.h"
#include "locale.h"
#include "core/config.h"
@@ -27,13 +27,13 @@ public:
void SetConfig(Config * pconfig);
// can return null pointer if there is not such a pattern
Ezc::Pattern * GetPattern(const std::string & file, Locale::Lang lang);
void AddPattern(const std::string & file, Locale & locale, LocaleFilter & locale_filter, bool delete_white);
void AddPatternIfNotExists(const std::string & file, Locale & locale, LocaleFilter & locale_filter, bool delete_white);
Ezc::Pattern * GetPattern(const std::wstring & file, Locale::Lang 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::string & file);
void AddFileName(const std::wstring & file);
void ReloadPatterns(Locale & locale, LocaleFilter & locale_filter, bool delete_white);
void MarkAllToDelete();
@@ -51,7 +51,7 @@ private:
std::vector<Ezc::Pattern> patterns;
};
typedef std::map<std::string, Template> Tab;
typedef std::map<std::wstring, Template> Tab;
Tab tab;
void ReadPattern(Tab::iterator & i, Locale & locale, LocaleFilter & locale_filter, bool delete_white);

View File

@@ -9,10 +9,10 @@
#include "templates.h"
#include "misc.h"
#include "../core/request.h"
#include "../core/misc.h"
#include "../core/bbcodeparser.h"
#include "core/request.h"
#include "core/misc.h"
#include "core/bbcodeparser.h"
#include "core/textstream.h"
@@ -68,19 +68,19 @@ void item_content_type_is(Item & item, Info & i)
{
i.res = false;
if( item.content_type == Item::ct_text && i.par == "text" )
if( item.content_type == Item::ct_text && i.par == L"text" )
i.res = true;
else
if( item.content_type == Item::ct_formatted_text && i.par == "formatted text" )
if( item.content_type == Item::ct_formatted_text && i.par == L"formatted text" )
i.res = true;
else
if( item.content_type == Item::ct_html && i.par == "html" )
if( item.content_type == Item::ct_html && i.par == L"html" )
i.res = true;
else
if( item.content_type == Item::ct_bbcode && i.par == "bbcode" )
if( item.content_type == Item::ct_bbcode && i.par == L"bbcode" )
i.res = true;
else
if( item.content_type == Item::ct_raw && i.par == "raw" )
if( item.content_type == Item::ct_raw && i.par == L"raw" )
i.res = true;
}
@@ -91,7 +91,7 @@ void item_content_type_is(Info & i)
}
void item_print_content(std::ostringstream & out, const std::string & content, Item::ContentType content_type)
void item_print_content(TextStream<std::wstring> & out, const std::wstring & content, Item::ContentType content_type)
{
if( content_type == Item::ct_text )
{
@@ -110,7 +110,7 @@ void item_print_content(std::ostringstream & out, const std::string & content, I
else
if( content_type == Item::ct_bbcode )
{
static std::string out_temp;
static std::wstring out_temp;
out_temp.clear();
out_temp.reserve(content.size()*2);
@@ -134,7 +134,7 @@ void item_print_content(Info & i)
void item_privileges(Info & i)
{
i.out << std::setbase(8) << request->item.privileges << std::setbase(10);
i.out << Itoa(request->item.privileges, 8);
}
@@ -278,12 +278,12 @@ void item_run(Info & i)
}
Ezc::Pattern * p = pattern_cacher.GetPattern(request->item);
std::ostringstream item_run_content;
TextStream<std::wstring> item_run_content;
Ezc::Generator gen(item_run_content, *p, ezc_functions);
Ezc::Generator<TextStream<std::wstring> > gen(item_run_content, *p, ezc_functions);
gen.Generate();
item_print_content(i.out, item_run_content.str(), request->item.content_type);
item_print_content(i.out, item_run_content.Str(), request->item.content_type);
}
@@ -359,7 +359,7 @@ void item_tab_print_content(Info & i)
if( item_index >= request->item_tab.size() )
return;
std::string & content = request->item_tab[item_index].content;
std::wstring & content = request->item_tab[item_index].content;
Item::ContentType type = request->item_tab[item_index].content_type;
item_print_content(i.out, content, type);
@@ -369,7 +369,7 @@ void item_tab_print_content(Info & i)
void item_tab_privileges(Info & i)
{
if( item_index < request->item_tab.size() )
i.out << "0" << std::setbase(8) << request->item_tab[item_index].privileges << std::setbase(10);
i.out << "0" << Itoa(request->item_tab[item_index].privileges, 8);
}
@@ -378,7 +378,7 @@ void item_tab_dir(Info & i)
{
if( item_index < request->item_tab.size() )
{
std::string path;
std::wstring path;
if( system->dirs.MakePath(request->item_tab[item_index].parent_id, path) )
HtmlEscape(i.out, path);
@@ -551,8 +551,12 @@ void item_tab_run(Info & i)
}
Ezc::Pattern * p = pattern_cacher.GetPattern(request->item_tab[item_index]);
Ezc::Generator gen(i.out, *p, ezc_functions);
TextStream<std::wstring> item_run_content;
Ezc::Generator<TextStream<std::wstring> > gen(item_run_content, *p, ezc_functions);
gen.Generate();
item_print_content(i.out, item_run_content.Str(), request->item_tab[item_index].content_type);
}
}

331
templates/locale.cpp Executable file
View File

@@ -0,0 +1,331 @@
/*
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2010, Tomasz Sowa
* All rights reserved.
*
*/
#include "locale.h"
#include "core/log.h"
Locale::Locale()
{
loc_tab.resize(lang_unknown);
default_lang = lang_en;
current_lang = lang_en;
input_as_utf8 = false;
}
void Locale::AddLocale(Lang lang)
{
ConfParser::TableSingle::iterator i = loc_parser.table_single.begin();
for( ; i != loc_parser.table_single.end() ; ++i)
loc_tab[lang][i->first] = i->second;
}
void Locale::ReadFile(const char * dir, const char * dir_def, Lang lang, const char * file)
{
if( static_cast<size_t>(lang) >= loc_tab.size() )
{
// ops, something wrong
return;
}
loc_tab[lang].clear();
bool read = false;
if( dir_def && ReadFile(dir_def, lang, file) )
read = true;
if( dir && ReadFile(dir, lang, file) )
read = true;
if( !read )
log << log1 << "Locale: can't open locale's file: " << file << logend;
}
bool Locale::ReadFile(const char * dir, Lang lang, const char * file)
{
bool read = false;
file_name = dir;
file_name += '/';
file_name += file;
loc_parser.SplitSingle(true);
loc_parser.UTF8(input_as_utf8);
if( loc_parser.Parse(file_name) == ConfParser::ok )
{
read = true;
AddLocale(lang);
log << log3 << "Locale: read locale from: " << file_name << logend;
}
return read;
}
void Locale::ReadSubstTable(const char * dir, const char * dir_def)
{
bool read = false;
subst_original.clear();
subst_changeto.clear();
if( dir_def && ReadSubstTable(dir_def) )
read = true;
if( dir && ReadSubstTable(dir) )
read = true;
if( !read )
log << log1 << "Locale: can't open file for characters substitution" << logend;
}
bool Locale::ReadSubstTable(const char * dir)
{
bool read = false;
file_name = dir;
file_name += '/';
file_name += "substitute";
loc_parser.SplitSingle(true);
loc_parser.UTF8(input_as_utf8);
if( loc_parser.Parse(file_name) == ConfParser::ok )
{
read = true;
subst_original = loc_parser.table_single[L"original"];
subst_changeto = loc_parser.table_single[L"changeto"];
log << log3 << "Locale: read characters substitution tables from: " << file_name << logend;
}
return read;
}
void Locale::Read(const char * dir, const char * dir_def)
{
ReadFile(dir, dir_def, lang_pl, "pl");
ReadFile(dir, dir_def, lang_en, "en");
ReadSubstTable(dir, dir_def);
if( subst_original.size() != subst_changeto.size() )
log << log1 << "Locale: substitution tables have different sizes" << logend;
}
void Locale::Read(const std::string & dir, const std::string & dir_def)
{
if( dir_def.empty() )
Read(dir.c_str());
else
Read(dir.c_str(), dir_def.c_str());
}
void Locale::Read(const wchar_t * dir, const wchar_t * dir_def)
{
AssignString(dir, adir1);
if( !dir_def )
{
Read(adir1.c_str());
}
else
{
AssignString(dir_def, adir2);
Read(adir1.c_str(), adir2.c_str());
}
}
void Locale::Read(const std::wstring & dir, const std::wstring & dir_def)
{
Read(dir.c_str(), dir_def.c_str());
}
void Locale::SetLang(Lang lang)
{
current_lang = lang;
}
Locale::Lang Locale::GetLang()
{
return current_lang;
}
void Locale::SetLangDef(Lang lang)
{
default_lang = lang_en;
}
bool Locale::IsKey(const std::wstring & key) const
{
return IsKey(key, current_lang);
}
bool Locale::IsKey(const std::wstring & key, Lang lang) const
{
if( static_cast<size_t>(lang) >= loc_tab.size() )
{
// ops, something wrong
return false;
}
// looking in the lang language
ConfParser::TableSingle::const_iterator i = loc_tab[lang].find(key);
if( i != loc_tab[lang].end() )
return true;
if( lang == default_lang )
return false;
if( static_cast<size_t>(default_lang) >= loc_tab.size() )
{
// ops, something wrong
return false;
}
// looking in a default language
i = loc_tab[default_lang].find(key);
if( i != loc_tab[default_lang].end() )
return true;
// there is no such a key
return false;
}
const std::wstring & Locale::Get(const std::wstring & key) const
{
return Get(key, current_lang);
}
const std::wstring & Locale::Get(const std::wstring & key, Lang lang) const
{
if( static_cast<size_t>(lang) >= loc_tab.size() )
{
// ops, something wrong
return empty;
}
// looking in the lang language
ConfParser::TableSingle::const_iterator i = loc_tab[lang].find(key);
if( i != loc_tab[lang].end() )
return i->second;
if( lang == default_lang )
return empty;
if( static_cast<size_t>(default_lang) >= loc_tab.size() )
{
// ops, something wrong
return empty;
}
// looking in a default language
i = loc_tab[default_lang].find(key);
if( i != loc_tab[default_lang].end() )
return i->second;
// there is no such a key
return empty;
}
Locale::Lang Locale::StrToLang(const std::wstring & str)
{
if( str == L"en" )
return lang_en;
else
if( str == L"pl" )
return lang_pl;
return lang_unknown;
}
const wchar_t * Locale::LangToStr(Lang lang)
{
static wchar_t buffer[30];
size_t buffer_len = sizeof(buffer) / sizeof(wchar_t);
switch(lang)
{
case lang_en:
swprintf(buffer, buffer_len, L"en");
break;
case lang_pl:
swprintf(buffer, buffer_len, L"pl");
break;
default:
swprintf(buffer, buffer_len, L"unknown");
}
return buffer;
}
size_t Locale::Size()
{
return loc_tab.size();
}
void Locale::UTF8(bool utf)
{
input_as_utf8 = utf;
}
wchar_t Locale::Subst(wchar_t c)
{
size_t i = subst_original.find(c);
if( i == std::wstring::npos || i >= subst_changeto.size() )
return c;
return subst_changeto[i];
}
void Locale::Subst(std::wstring & str)
{
for(size_t i=0 ; i<str.size() ; ++i)
str[i] = Subst(str[i]);
}

90
templates/locale.h Executable file
View File

@@ -0,0 +1,90 @@
/*
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2010, Tomasz Sowa
* All rights reserved.
*
*/
#ifndef headerfilecmslucorelocale
#define headerfilecmslucorelocale
#include <vector>
#include <string>
#include "core/confparser.h"
class Locale
{
public:
// !! pozbyc sie tego enuma
// niech wybieranie ilosci locali (ile jezykow) bedzie w pliku konfiguracyjnym
enum Lang
{
lang_en = 0,
lang_pl,
lang_unknown // should be last
};
Locale();
void Read(const char * dir, const char * dir_def = 0);
void Read(const std::string & dir, const std::string & dir_def);
void Read(const wchar_t * dir, const wchar_t * dir_def = 0);
void Read(const std::wstring & dir, const std::wstring & dir_def);
bool IsKey(const std::wstring & key) const;
bool IsKey(const std::wstring & key, Lang lang) const;
const std::wstring & Get(const std::wstring & key) const;
const std::wstring & Get(const std::wstring & key, Lang lang) const;
// default is english
void SetLang(Lang lang);
Lang GetLang();
// which language is used instead if there is no a key in an other language
// default: lang_en
void SetLangDef(Lang lang);
static Lang StrToLang(const std::wstring & str);
static const wchar_t * LangToStr(Lang lang);
size_t Size();
void UTF8(bool utf);
wchar_t Subst(wchar_t c);
void Subst(std::wstring & str);
private:
void AddLocale(Lang lang);
void ReadFile(const char * dir, const char * dir_def, Lang lang, const char * file);
bool ReadFile(const char * dir, Lang lang, const char * file);
void ReadSubstTable(const char * dir, const char * dir_def);
bool ReadSubstTable(const char * dir);
// messages vector<via Lang>
std::vector<ConfParser::TableSingle> loc_tab;
// these tables are used to change url characters
std::wstring subst_original;
std::wstring subst_changeto;
ConfParser loc_parser;
std::string file_name;
std::wstring empty;
std::string adir1, adir2;
Lang default_lang;
Lang current_lang;
bool input_as_utf8;
};
#endif

View File

@@ -35,10 +35,10 @@ void LocaleFilter::ReadKey()
}
std::string & LocaleFilter::FilterValue(const std::string & in)
std::wstring & LocaleFilter::FilterValue(const std::wstring & in)
{
value.clear();
const char * p = in.c_str();
const wchar_t * p = in.c_str();
while( *p )
{
@@ -65,7 +65,7 @@ return value;
void LocaleFilter::Parse(std::string & str)
void LocaleFilter::Parse(std::wstring & str)
{
res.clear();
pchar = str.c_str();
@@ -97,12 +97,12 @@ void LocaleFilter::Parse(std::string & str)
void LocaleFilter::FilterText(Ezc::Pattern::Item & item)
void LocaleFilter::FilterText(Ezc::Item & item)
{
if( !item.text.empty() )
Parse(item.text);
std::vector<Ezc::Pattern::Item*>::iterator i = item.item_tab.begin();
std::vector<Ezc::Item*>::iterator i = item.item_tab.begin();
for( ; i != item.item_tab.end() ; ++i )
FilterText(**i);

View File

@@ -11,7 +11,7 @@
#define headerfilecmslutemplateslocalefilter
#include "../core/locale.h"
#include "locale.h"
#include "ezc.h"
@@ -25,19 +25,19 @@ public:
private:
void ReadKey();
std::string & FilterValue(const std::string & in);
void FilterText(Ezc::Pattern::Item & item);
void Parse(std::string & str);
std::wstring & FilterValue(const std::wstring & in);
void FilterText(Ezc::Item & item);
void Parse(std::wstring & str);
char open_mark; // default '{'
char closing_mark; // default '}'
wchar_t open_mark; // default '{'
wchar_t closing_mark; // default '}'
const Locale * plocale;
Locale::Lang lang;
std::string res;
std::string key;
std::string value;
const char * pchar;
std::wstring res;
std::wstring key;
std::wstring value;
const wchar_t * pchar;
};

View File

@@ -18,7 +18,106 @@ namespace TemplatesFunctions
{
void print_date_nice(Ezc::Info & i, const tm & rtm)
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(TextStream<std::wstring> & out, const std::wstring & in)
{
std::wstring::const_iterator i;
int was_enter = 0; // how many enteres there were before
if( in.empty() )
return;
out << L"<p>"; // !! pozbyc sie wstawianie tego html tutaj (wrzucic w jakis sposob do szablonow)
// skipping first new line characters
for(i = in.begin() ; i != in.end() && (*i==13 || *i==10) ; ++i);
for( ; i != in.end() ; ++i )
{
if( *i == 13 ) // skipping stupid characters (\r\n\ in dos mode)
continue;
if( *i == 10 )
{
++was_enter;
}
else
{
if( was_enter == 1 )
out << L"<br>\n";
else
if( was_enter > 1 )
out << L"</p>\n<p>";
was_enter = 0;
}
if( !HtmlTryChar(out, *i) )
out << *i;
}
out << L"</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)
{
time_t t = Time(rtm);
time_t now = std::time(0);
@@ -33,7 +132,7 @@ void print_date_nice(Ezc::Info & i, const tm & rtm)
}
void print_user_name(Ezc::Info & i, const User * puser, const std::string & guest_name)
void print_user_name(Info & i, const User * puser, const std::wstring & guest_name)
{
if( puser )
{
@@ -62,8 +161,9 @@ int ParseCKeditorFun()
if( !request->get_tab[last].empty() )
{
const char * str = request->get_tab[last].c_str() + 1; // the first char is '?'
ckeditor_getparser.Parse(str);
static std::string get;
AssignString(request->get_tab[last], get);
ckeditor_getparser.Parse(get.c_str() + 1); // the first char is '?'
}
}
@@ -76,7 +176,7 @@ return ckeditor_getparser.fun_num;
// those functions from here are used in the second thread too
void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & locale_filter, const char * file, bool delete_white)
void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & locale_filter, const wchar_t * file, bool delete_white)
{
size_t i;
size_t len = patterns.size();
@@ -85,6 +185,7 @@ void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & local
{
if( pat < patterns[i].size() )
{
patterns[i][pat].UTF8(true); // !! powinno byc brane z konfiga
patterns[i][pat].DeleteWhiteTextItems(delete_white);
patterns[i][pat].Directory(config->templates_dir, config->templates_dir_default);
patterns[i][pat].ParseFile(file);

View File

@@ -16,23 +16,32 @@
#include "localefilter.h"
#include "ezc.h"
#include "core/user.h"
#include "core/textstream.h"
namespace TemplatesFunctions
{
typedef Ezc::FunInfo<TextStream<std::wstring> > Info;
void HtmlEscape(TextStream<std::wstring> & out, const std::wstring & in);
void HtmlEscapeFormTxt(TextStream<std::wstring> & 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(Ezc::Info & i, const tm & rtm);
void print_user_name(Ezc::Info & i, const User * puser, const std::string & guest_name);
void print_date_nice(Info & i, const tm & rtm);
void print_user_name(Info & i, const User * puser, const std::wstring & guest_name);
int ParseCKeditorFun();
// those functions from here are used in the second thread too
void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & locale_filter, const char * file, bool delete_white = false);
void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & locale_filter, const wchar_t * file, bool delete_white = false);
void ClearPatterns(Patterns & patterns, size_t len);

View File

@@ -245,35 +245,35 @@ void priv_group_tab_isdefault(Info & i)
void priv_privileges(Info & i)
{
if( request->is_item )
i.out << std::setbase(8) << request->item.privileges << std::setbase(10);
i.out << Itoa(request->item.privileges, 8);
else
i.out << std::setbase(8) << request->dir_tab.back()->privileges << std::setbase(10);
i.out << Itoa(request->dir_tab.back()->privileges, 8);
}
void priv_privileges_for_files(Info & i)
{
//!! bedzie uzyte umask
i.out << std::setbase(8) << (int)0644 << std::setbase(10);
i.out << Itoa((int)0644, 8);
}
void priv_privileges_for_dirs(Info & i)
{
//!! bedzie uzyte umask
i.out << std::setbase(8) << (int)0755 << std::setbase(10);
i.out << Itoa((int)0755, 8);
}
void priv_show_form_chown(Info & i)
{
i.res = (request->function->fun.url == "priv" || request->function->fun.url == "chown");
i.res = (request->function == &functions->fun_priv || request->function == &functions->fun_chown);
}
void priv_show_form_chmod(Info & i)
{
i.res = (request->function->fun.url == "priv" || request->function->fun.url == "chmod");
i.res = (request->function == &functions->fun_priv || request->function == &functions->fun_chmod);
}

View File

@@ -65,7 +65,7 @@ void stat_item_group(Info & i)
void stat_item_privileges(Info & i)
{
i.out << std::setbase(8) << request->last_item->privileges << std::setbase(10);
i.out << Itoa(request->last_item->privileges, 8);
}

View File

@@ -24,7 +24,7 @@ void template_index(Info & i)
}
static std::vector<std::string> temp_tab;
static std::vector<std::wstring> temp_tab;
static size_t temp_req_id = 0;
static size_t temp_def;
static size_t temp_index;
@@ -34,7 +34,7 @@ static size_t temp_index;
void template_set_def()
{
temp_def = (size_t)-1; // none
const std::string * html_file;
const std::wstring * html_file;
if( request->is_item )
html_file = &request->item.html_template;

View File

@@ -10,6 +10,7 @@
#include "templates.h"
#include "core/misc.h"
#include "core/plugin.h"
#include "core/textstream.h"
#include "localefilter.h"
#include "functions/functions.h"
@@ -21,15 +22,15 @@ namespace TemplatesFunctions
IndexPatterns index_patterns;
Patterns patterns;
Patterns patterns_fun;
Ezc::Functions ezc_functions;
Ezc::Functions<TextStream<std::wstring> > ezc_functions;
PatternCacher pattern_cacher;
Locale locale;
LocaleFilter locale_filter;
CKEditorGetParser ckeditor_getparser;
// used by GenerateRunRaw()
std::vector<std::string> empty_pars;
const std::string empty_string;
std::vector<std::wstring> empty_pars;
const std::wstring empty_string;
Config * config;
Request * request;
@@ -110,7 +111,7 @@ Ezc::Pattern * p = 0;
if( p )
{
Ezc::Generator gen(i.out, *p, ezc_functions);
Ezc::Generator<TextStream<std::wstring> > gen(i.out, *p, ezc_functions);
gen.Generate();
}
else
@@ -427,7 +428,7 @@ void Templates::CreateFunctions()
void Templates::ReadFile(TemplatesFunctions::Pat pat, const char * file)
void Templates::ReadFile(TemplatesFunctions::Pat pat, const wchar_t * file)
{
using namespace TemplatesFunctions;
@@ -435,7 +436,7 @@ using namespace TemplatesFunctions;
}
void Templates::ReadFileFun(size_t index, const char * file)
void Templates::ReadFileFun(size_t index, const wchar_t * file)
{
using namespace TemplatesFunctions;
@@ -454,6 +455,7 @@ using namespace TemplatesFunctions;
else
locale.SetLang(Locale::lang_en);
locale.UTF8(config->utf8);
locale.Read(config->locale_dir, config->locale_dir_default);
}
@@ -466,7 +468,7 @@ using namespace TemplatesFunctions;
for(; i != functions->End() ; ++i)
{
const std::string & fun_name = i->first;
const std::wstring & fun_name = i->first;
const size_t index = i->second->id;
if( index < functions->FunctionsSize() )
@@ -493,8 +495,8 @@ using namespace TemplatesFunctions;
ClearPatterns();
ReadFile(pat_index, config->templates_index.c_str());
ReadFile(pat_err_404, "err_404.html");
ReadFile(pat_err_per_denied, "err_per_denied.html");
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);
@@ -529,16 +531,17 @@ using namespace TemplatesFunctions;
for(i=pmount_tab->begin() ; i!=pmount_tab->end() ; ++i)
{
const Mount & mount = i->second;
int html_id = TemplatesFunctions::system->mounts.MountParHtmlTemplate();
if( mount.param[TemplatesFunctions::system->mounts.MountParHtmlTemplate()].defined )
if( mount.param[html_id].defined )
{
size_t len = mount.param[TemplatesFunctions::system->mounts.MountParHtmlTemplate()].arg.size();
size_t len = mount.param[html_id].arg.size();
size_t a;
// loop through all html_templates() values
for(a=0 ; a<len ; ++a)
{
const std::string & file_name = mount.param[TemplatesFunctions::system->mounts.MountParHtmlTemplate()].arg[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
@@ -569,7 +572,7 @@ using namespace TemplatesFunctions;
return;
Ezc::Pattern * index = 0;
const std::string * index_file_local = 0;
const std::wstring * index_file_local = 0;
if( request->is_item )
{
@@ -585,7 +588,7 @@ using namespace TemplatesFunctions;
if( !index_file_local )
{
const std::string & temp = TemplatesFunctions::system->mounts.pmount->FirstArg(
const std::wstring & temp = TemplatesFunctions::system->mounts.pmount->FirstArg(
TemplatesFunctions::system->mounts.MountParHtmlTemplate() );
if( !temp.empty() )
@@ -600,7 +603,7 @@ using namespace TemplatesFunctions;
if( !index )
index = &patterns[locale.GetLang()][pat_index];
Ezc::Generator generator(request->page, *index, ezc_functions);
Ezc::Generator<TextStream<std::wstring> > generator(request->page, *index, ezc_functions);
generator.Generate();
}
@@ -613,7 +616,7 @@ using namespace TemplatesFunctions;
if( !empty_pars.empty() )
empty_pars.clear();
Ezc::Info info(request->page, empty_pars, empty_string);
Info info(request->page, empty_pars, empty_string);
info.iter = 0;
info.res = false;

View File

@@ -17,11 +17,11 @@
#include "patterncacher.h"
#include "ckeditorgetparser.h"
#include "indexpatterns.h"
#include "locale.h"
#include "db/db.h"
#include "core/config.h"
#include "core/request.h"
#include "core/system.h"
#include "core/locale.h"
#include "core/sessionmanager.h"
@@ -32,7 +32,6 @@ class Functions;
namespace TemplatesFunctions
{
using Ezc::Info;
enum Pat
{
@@ -47,7 +46,7 @@ namespace TemplatesFunctions
extern Patterns patterns_fun;
extern PatternCacher pattern_cacher;
extern Locale locale;
extern Ezc::Functions ezc_functions;
extern Ezc::Functions<TextStream<std::wstring> > ezc_functions;
extern CKEditorGetParser ckeditor_getparser;
extern Config * config;
@@ -132,7 +131,7 @@ namespace TemplatesFunctions
void item_content_type_is(Item & item, Info & i);
void item_content_type_is(Info & i);
void item_content_is_empty(Info & i);
void item_print_content(std::ostringstream & out, const std::string & content, Item::ContentType content_type);
void item_print_content(TextStream<std::wstring> & out, const std::wstring & content, Item::ContentType content_type);
void item_print_content(Info & i);
void item_privileges(Info & i);
void item_dir(Info & i);
@@ -378,13 +377,13 @@ public:
private:
void ReadFile(TemplatesFunctions::Pat pat, const char * file);
void ReadFileFun(size_t index, const char * file);
void ReadFile(TemplatesFunctions::Pat pat, const wchar_t * file);
void ReadFileFun(size_t index, const wchar_t * file);
void ReadFunctionsTemplates();
void SetLocale();
std::string temp;
std::string fun_file;
std::wstring temp;
std::wstring fun_file;
};

View File

@@ -56,7 +56,7 @@ void winix_function_is(Info & i)
void winix_function_param_is(Info & i)
{
i.res = request->IsParam(i.par.c_str());
i.res = request->IsParam(i.par);
}
@@ -152,7 +152,7 @@ char buf[20];
void winix_err_is(Info & i)
{
int value = atoi( i.par.c_str() );
int value = Atoi(i.par);
i.res = (request->status == value);
}
@@ -164,14 +164,15 @@ void winix_err_code(Info & i)
static std::string winix_error_key;
static std::wstring winix_error_key;
void winix_is_err_in_locales(Info & i)
{
char buff[40];
wchar_t buff[40];
size_t buff_len = sizeof(buff) / sizeof(wchar_t);
sprintf(buff, "winix_err_%d", request->status);
swprintf(buff, buff_len, L"winix_err_%d", request->status);
winix_error_key = buff;
i.res = locale.IsKey(winix_error_key);
@@ -180,9 +181,10 @@ char buff[40];
void winix_err_msg_from_locales(Info & i)
{
char buff[40];
wchar_t buff[40];
size_t buff_len = sizeof(buff) / sizeof(wchar_t);
sprintf(buff, "winix_err_%d", request->status);
swprintf(buff, buff_len, L"winix_err_%d", request->status);
winix_error_key = buff;
i.out << locale.Get(winix_error_key);
@@ -192,7 +194,7 @@ char buff[40];
void winix_show_content_in_full_window(Info & i)
{
if( request->function )
i.res = (request->function->fun.url == "ckeditor" || request->function->fun.url == "tinymce");
i.res = (request->function == &functions->fun_ckeditor || request->function == &functions->fun_tinymce);
}