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

changed: updated to the new ezc api, this with O(1) when looking for a specific ezc function

Browse Source 
changed: sessions are deleted at the end of a request (and only a few sessions)
         other sessions will be deleted after a next request


git-svn-id: svn://ttmath.org/publicrep/winix/trunk@684 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2010-11-25 22:42:24 +00:00
parent 933c8841ff
commit 08e53919e2
25 changed files with 753 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

343
templates/Makefile.dep
View File

@@ -2,33 +2,34 @@
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: ../../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: ../core/textstream.h ../core/user.h ../core/log.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 ../db/dbitemcolumns.h
adduser.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
adduser.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
adduser.o: ../core/session.h ../core/error.h ../core/user.h
adduser.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
adduser.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h
adduser.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
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: indexpatterns.h ../core/config.h ../core/confparser.h
adduser.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
adduser.o: ../db/dbtextstream.h ../core/error.h ../core/log.h
adduser.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
adduser.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
adduser.o: ../core/request.h ../core/requesttypes.h ../core/session.h
adduser.o: ../core/error.h ../core/user.h ../core/plugindata.h
adduser.o: ../core/rebus.h ../core/config.h ../templates/htmltextstream.h
adduser.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
adduser.o: ../core/request.h ../core/mounts.h ../core/mount.h
adduser.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
adduser.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
adduser.o: ../core/loadavg.h ../core/sessionmanager.h
adduser.o: ../core/sessioncontainer.h ../core/system.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: ../../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 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/user.h ../core/log.h ../core/textstream.h patterncacher.h
dir.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
dir.o: ../core/log.h 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: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
@@ -58,12 +59,12 @@ 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 ../../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: ../../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 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/user.h ../core/log.h ../core/textstream.h patterncacher.h
doc.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
doc.o: ../core/log.h 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: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
@@ -81,25 +82,28 @@ htmltextstream.o: htmltextstream.h ../core/textstream.h misc.h localefilter.h
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/stringconv.h ../../ezc/src/functions.h
htmltextstream.o: ../../ezc/src/funinfo.h ../core/user.h
htmltextstream.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
htmltextstream.o: ../../ezc/src/stringconv.h ../core/user.h ../core/log.h
htmltextstream.o: ../core/textstream.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: ../../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: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
indexpatterns.o: ../core/log.h ../core/textstream.h
indexpatterns.o: htmltextstream.h ../core/textstream.h ../core/user.h
indexpatterns.o: ../core/log.h ../core/textstream.h ../core/config.h
indexpatterns.o: ../core/confparser.h ../core/htmlfilter.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: ../../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: ../core/textstream.h ../core/user.h ../core/log.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: indexpatterns.h ../core/config.h ../core/confparser.h
item.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
item.o: ../db/dbtextstream.h ../core/error.h ../core/log.h
item.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
item.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
item.o: ../core/request.h ../core/requesttypes.h ../core/session.h
@@ -113,14 +117,15 @@ item.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
item.o: ../core/misc.h ../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: ../../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: ../core/textstream.h ../core/user.h ../core/log.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: indexpatterns.h ../core/config.h ../core/confparser.h
last.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
last.o: ../db/dbtextstream.h ../core/error.h ../core/log.h
last.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
last.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
last.o: ../core/request.h ../core/requesttypes.h ../core/session.h
@@ -136,17 +141,17 @@ 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: ../../ezc/src/item.h ../../ezc/src/funinfo.h
localefilter.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.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: ../../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 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/user.h ../core/log.h ../core/textstream.h patterncacher.h
ls.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
ls.o: ../core/log.h 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: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
@@ -161,14 +166,15 @@ 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: ../../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: ../core/textstream.h ../core/user.h ../core/log.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: indexpatterns.h ../core/config.h ../core/confparser.h
misc.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
misc.o: ../db/dbtextstream.h ../core/error.h ../core/log.h
misc.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
misc.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
misc.o: ../core/request.h ../core/requesttypes.h ../core/session.h
@@ -182,14 +188,15 @@ misc.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
misc.o: ../core/misc.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: ../../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: ../core/textstream.h ../core/user.h ../core/log.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: indexpatterns.h ../core/config.h ../core/confparser.h
mount.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
mount.o: ../db/dbtextstream.h ../core/error.h ../core/log.h
mount.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
mount.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
mount.o: ../core/request.h ../core/requesttypes.h ../core/session.h
@@ -201,21 +208,25 @@ mount.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
mount.o: ../core/groups.h ../core/group.h ../core/loadavg.h
mount.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
mount.o: ../core/misc.h
patterncacher.o: patterncacher.h ../core/item.h ../../ezc/src/ezc.h
patterncacher.o: patterncacher.h ../core/item.h misc.h localefilter.h
patterncacher.o: locale.h ../core/confparser.h ../../ezc/src/ezc.h
patterncacher.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
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
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/log.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: ../../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: ../core/textstream.h ../core/user.h ../core/log.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: indexpatterns.h ../core/config.h ../core/confparser.h
priv.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
priv.o: ../db/dbtextstream.h ../core/error.h ../core/log.h
priv.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
priv.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
priv.o: ../core/request.h ../core/requesttypes.h ../core/session.h
@@ -243,12 +254,12 @@ 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
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 htmltextstream.h ../core/textstream.h
rebus.o: ../core/user.h patterncacher.h ../core/item.h ckeditorgetparser.h
rebus.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.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 ../core/log.h
rebus.o: ../core/textstream.h patterncacher.h ../core/item.h
rebus.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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
@@ -264,14 +275,15 @@ rebus.o: ../core/groups.h ../core/group.h ../core/loadavg.h
rebus.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.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: ../../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: ../core/textstream.h ../core/user.h ../core/log.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: indexpatterns.h ../core/config.h ../core/confparser.h
stat.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
stat.o: ../db/dbtextstream.h ../core/error.h ../core/log.h
stat.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
stat.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
stat.o: ../core/request.h ../core/requesttypes.h ../core/session.h
@@ -285,12 +297,12 @@ stat.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
stat.o: ../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/stringconv.h ../../ezc/src/functions.h
sys.o: ../../ezc/src/funinfo.h misc.h localefilter.h locale.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 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/user.h ../core/log.h ../core/textstream.h patterncacher.h
sys.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
sys.o: ../core/log.h 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: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
@@ -306,49 +318,49 @@ sys.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
sys.o: ../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: ../../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 ckeditorgetparser.h ../core/httpsimpleparser.h
template.o: ../core/log.h ../core/textstream.h indexpatterns.h
template.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
template.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
template.o: ../core/error.h ../core/log.h ../db/dbitemquery.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 ../templates/htmltextstream.h ../core/system.h
template.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
template.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
template.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
template.o: ../core/groups.h ../core/group.h ../core/loadavg.h
template.o: ../core/sessionmanager.h ../core/sessioncontainer.h
template.o: ../core/system.h ../core/misc.h
template.o: ../core/textstream.h ../core/user.h ../core/log.h
template.o: ../core/textstream.h patterncacher.h ../core/item.h
template.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
template.o: indexpatterns.h ../core/config.h ../core/confparser.h
template.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
template.o: ../db/dbtextstream.h ../core/error.h ../core/log.h
template.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
template.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
template.o: ../core/request.h ../core/requesttypes.h ../core/session.h
template.o: ../core/error.h ../core/user.h ../core/plugindata.h
template.o: ../core/rebus.h ../core/config.h ../templates/htmltextstream.h
template.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
template.o: ../core/request.h ../core/mounts.h ../core/mount.h
template.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
template.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
template.o: ../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 ../../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: ../../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 ckeditorgetparser.h ../core/httpsimpleparser.h
templates.o: ../core/log.h ../core/textstream.h indexpatterns.h
templates.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
templates.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
templates.o: ../core/error.h ../core/log.h ../db/dbitemquery.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 ../templates/htmltextstream.h ../core/system.h
templates.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
templates.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
templates.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
templates.o: ../core/groups.h ../core/group.h ../core/loadavg.h
templates.o: ../core/sessionmanager.h ../core/sessioncontainer.h
templates.o: ../core/system.h ../core/misc.h ../core/plugin.h
templates.o: ../core/pluginmsg.h ../core/sessionmanager.h
templates.o: ../core/textstream.h ../core/user.h ../core/log.h
templates.o: ../core/textstream.h patterncacher.h ../core/item.h
templates.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
templates.o: indexpatterns.h ../core/config.h ../core/confparser.h
templates.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
templates.o: ../db/dbtextstream.h ../core/error.h ../core/log.h
templates.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
templates.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
templates.o: ../core/request.h ../core/requesttypes.h ../core/session.h
templates.o: ../core/error.h ../core/user.h ../core/plugindata.h
templates.o: ../core/rebus.h ../core/config.h ../templates/htmltextstream.h
templates.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
templates.o: ../core/request.h ../core/mounts.h ../core/mount.h
templates.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
templates.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
templates.o: ../core/loadavg.h ../core/sessionmanager.h
templates.o: ../core/sessioncontainer.h ../core/system.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/notify.h ../templatesnotify/templatesnotify.h
templates.o: ../core/mount.h ../templates/misc.h
@@ -368,14 +380,15 @@ 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 ../../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: ../../ezc/src/item.h ../../ezc/src/funinfo.h
thread.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
thread.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
thread.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
thread.o: ../core/textstream.h ../core/user.h ../core/log.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: indexpatterns.h ../core/config.h ../core/confparser.h
thread.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
thread.o: ../db/dbtextstream.h ../core/error.h ../core/log.h
thread.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
thread.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
thread.o: ../core/request.h ../core/requesttypes.h ../core/session.h
@@ -405,14 +418,15 @@ thread.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
thread.o: ../core/htmlfilter.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: ../../ezc/src/item.h ../../ezc/src/funinfo.h
upload.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h
upload.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
upload.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
upload.o: ../core/textstream.h ../core/user.h ../core/log.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: indexpatterns.h ../core/config.h ../core/confparser.h
upload.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
upload.o: ../db/dbtextstream.h ../core/error.h ../core/log.h
upload.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
upload.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
upload.o: ../core/request.h ../core/requesttypes.h ../core/session.h
@@ -426,14 +440,15 @@ upload.o: ../core/sessionmanager.h ../core/sessioncontainer.h
upload.o: ../core/system.h ../core/request.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: ../../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: ../core/textstream.h ../core/user.h ../core/log.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: indexpatterns.h ../core/config.h ../core/confparser.h
uptime.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
uptime.o: ../db/dbtextstream.h ../core/error.h ../core/log.h
uptime.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
uptime.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
uptime.o: ../core/request.h ../core/requesttypes.h ../core/session.h
@@ -447,14 +462,15 @@ uptime.o: ../core/sessionmanager.h ../core/sessioncontainer.h
uptime.o: ../core/system.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: ../../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: ../core/textstream.h ../core/user.h ../core/log.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: indexpatterns.h ../core/config.h ../core/confparser.h
user.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
user.o: ../db/dbtextstream.h ../core/error.h ../core/log.h
user.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
user.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
user.o: ../core/request.h ../core/requesttypes.h ../core/session.h
@@ -468,12 +484,12 @@ user.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
user.o: ../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/stringconv.h ../../ezc/src/functions.h
who.o: ../../ezc/src/funinfo.h misc.h localefilter.h locale.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 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/user.h ../core/log.h ../core/textstream.h patterncacher.h
who.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
who.o: ../core/log.h 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: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
@@ -488,14 +504,15 @@ 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 ../../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: ../../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: ../core/textstream.h ../core/user.h ../core/log.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: indexpatterns.h ../core/config.h ../core/confparser.h
winix.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
winix.o: ../db/dbtextstream.h ../core/error.h ../core/log.h
winix.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
winix.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
winix.o: ../core/request.h ../core/requesttypes.h ../core/session.h

13
templates/indexpatterns.cpp
View File

@@ -11,12 +11,22 @@
#include "core/log.h"
IndexPatterns::IndexPatterns()
{
config = 0;
ezc_fun = 0;
}
void IndexPatterns::SetConfig(Config * pconfig)
{
config = pconfig;
}
void IndexPatterns::SetEzcFunctions(TemplatesFunctions::EzcFun * fun)
{
ezc_fun = fun;
}
Ezc::Pattern * IndexPatterns::GetPattern(const std::wstring & file, Locale::Lang lang)
{
@@ -83,6 +93,9 @@ void IndexPatterns::ReadPattern(Tab::iterator & iter, Locale & locale, LocaleFil
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, static_cast<Locale::Lang>(i));
}
}

6
templates/indexpatterns.h
View File

@@ -14,6 +14,7 @@
#include <vector>
#include <map>
#include "ezc.h"
#include "misc.h"
#include "localefilter.h"
#include "locale.h"
#include "core/config.h"
@@ -24,7 +25,9 @@ class IndexPatterns
{
public:
IndexPatterns();
void SetConfig(Config * pconfig);
void SetEzcFunctions(TemplatesFunctions::EzcFun * fun);
// can return null pointer if there is not such a pattern
Ezc::Pattern * GetPattern(const std::wstring & file, Locale::Lang lang);
@@ -43,6 +46,9 @@ private:
Config * config;
// can be null (not set directly)
TemplatesFunctions::EzcFun * ezc_fun;
struct Template
{
bool to_delete;

10
templates/item.cpp
View File

@@ -280,8 +280,9 @@ void item_run(Info & i)
Ezc::Pattern * p = pattern_cacher.GetPattern(request->item);
HtmlTextStream item_run_content; // !! zrobic static z tego i tu dac tylko clearowanie
EzcGen gen(item_run_content, *p, ezc_functions);
gen.Generate();
EzcGen gen;
//gen.Generate(item_run_content, *p, ezc_functions);
gen.Generate(item_run_content, *p);
item_print_content(i.out, item_run_content.Str(), request->item.content_type);
}
@@ -553,8 +554,9 @@ void item_tab_run(Info & i)
Ezc::Pattern * p = pattern_cacher.GetPattern(request->item_tab[item_index]);
HtmlTextStream item_run_content; // !! zrobic static z tego i tu dac tylko clearowanie
EzcGen gen(item_run_content, *p, ezc_functions);
gen.Generate();
EzcGen gen;
//gen.Generate(item_run_content, *p, ezc_functions);
gen.Generate(item_run_content, *p);
item_print_content(i.out, item_run_content.Str(), request->item_tab[item_index].content_type);
}

21
templates/misc.cpp
View File

@@ -175,27 +175,6 @@ 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 wchar_t * file, bool delete_white)
{
size_t i;
size_t len = patterns.size();
for(i=0 ; i<len ; ++i)
{
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);
locale_filter.Filter(patterns[i][pat], locale, static_cast<Locale::Lang>(i));
}
}
}
void ClearPatterns(Patterns & patterns, size_t len)
{
size_t loc, pat;

30
templates/misc.h
View File

@@ -18,6 +18,8 @@
#include "htmltextstream.h"
#include "core/user.h"
// !! usunac
#include "core/log.h"
namespace TemplatesFunctions
{
@@ -48,9 +50,35 @@ void print_user_name(Info & i, const User * puser, const std::wstring & guest_na
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 wchar_t * file, bool delete_white = false);
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, static_cast<Locale::Lang>(i));
}
}
}
void ClearPatterns(Patterns & patterns, size_t len);

15
templates/patterncacher.cpp
View File

@@ -17,9 +17,16 @@ PatternCacher::PatternCacher()
// !! tymczasowe wartosci dla testow
when_delete_patterns = 3; // 130
how_many_delete = 2; // 30
ezc_fun = 0;
}
void PatternCacher::SetEzcFunctions(TemplatesFunctions::EzcFun * fun)
{
ezc_fun = fun;
}
void PatternCacher::CheckTableSize()
{
@@ -52,11 +59,13 @@ void PatternCacher::CheckTableSize()
}
void PatternCacher::CreatePattern(const Item & item, Ezc::Pattern & pattern)
{
pattern.AllowInclude(false);
pattern.ParseString(item.content);
if( ezc_fun )
pattern.CacheFunctions(*ezc_fun);
}
@@ -100,6 +109,8 @@ PatternTab::iterator i;
void PatternCacher::UpdatePattern(const Item & item)
{
PatternTab::iterator i;
@@ -108,7 +119,7 @@ PatternTab::iterator i;
if( i == pattern_tab.end() )
{
log << log2 << "PC: there is no such an item to update, id: " << item.id << ", url: " << item.url << logend;
//log << log2 << "PC: there is no such an item to update, id: " << item.id << ", url: " << item.url << logend;
return;
}

6
templates/patterncacher.h
View File

@@ -14,6 +14,7 @@
#include <map>
#include "core/item.h"
#include "misc.h"
#include "ezc.h"
@@ -59,10 +60,15 @@ class PatternCacher
// how many items to delete
size_t how_many_delete;
// can be null (not set directly)
TemplatesFunctions::EzcFun * ezc_fun;
public:
PatternCacher();
void SetEzcFunctions(TemplatesFunctions::EzcFun * fun);
// returning a pattern corresponding to the 'item'
Ezc::Pattern * GetPattern(const Item & item);

31
templates/templates.cpp
View File

@@ -19,12 +19,12 @@
namespace TemplatesFunctions
{
IndexPatterns index_patterns;
Patterns patterns;
Patterns patterns_fun;
EzcFun ezc_functions;
PatternCacher pattern_cacher;
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
PatternCacher pattern_cacher; // patterns for user items (files with an executable bit set)
Locale locale;
EzcFun ezc_functions;
LocaleFilter locale_filter;
CKEditorGetParser ckeditor_getparser;
@@ -111,8 +111,9 @@ Ezc::Pattern * p = 0;
if( p )
{
EzcGen gen(i.out, *p, ezc_functions);
gen.Generate();
EzcGen gen;
//gen.Generate(i.out, *p, ezc_functions);
gen.Generate(i.out, *p);
}
else
{
@@ -436,7 +437,8 @@ void Templates::ReadFile(TemplatesFunctions::Pat pat, const wchar_t * file)
{
using namespace TemplatesFunctions;
Read(patterns, static_cast<size_t>(pat), locale, locale_filter, file);
Read(patterns, static_cast<size_t>(pat), locale, locale_filter, ezc_functions, file, config->utf8,
config->templates_dir, config->templates_dir_default);
}
@@ -444,7 +446,8 @@ void Templates::ReadFileFun(size_t index, const wchar_t * file)
{
using namespace TemplatesFunctions;
Read(patterns_fun, index, locale, locale_filter, file);
Read(patterns_fun, index, locale, locale_filter, ezc_functions, file, config->utf8,
config->templates_dir, config->templates_dir_default);
}
@@ -557,7 +560,7 @@ using namespace TemplatesFunctions;
}
// index_patterns and patterns for items are not cleared here
void Templates::ClearPatterns()
{
using namespace TemplatesFunctions;
@@ -607,8 +610,9 @@ using namespace TemplatesFunctions;
if( !index )
index = &patterns[locale.GetLang()][pat_index];
EzcGen generator(request->page, *index, ezc_functions);
generator.Generate();
EzcGen generator;
//generator.Generate(request->page, *index, ezc_functions);
generator.Generate(request->page, *index);
}
@@ -668,6 +672,9 @@ void Templates::SetSessionManager(SessionManager * psession_manager)
Templates::Templates()
{
using namespace TemplatesFunctions;
index_patterns.SetEzcFunctions(&ezc_functions);
pattern_cacher.SetEzcFunctions(&ezc_functions);
}

10
templates/templates.h
View File

@@ -42,10 +42,10 @@ namespace TemplatesFunctions
pat_last // should be last
};
extern IndexPatterns index_patterns;
extern Patterns patterns;
extern Patterns patterns_fun;
extern PatternCacher pattern_cacher;
extern IndexPatterns index_patterns; // patterns for main index template
extern Patterns patterns; // those patterns from enum Pat
extern Patterns patterns_fun; // patterns for winix functions
extern PatternCacher pattern_cacher; // patterns for user items (files with an executable bit set)
extern Locale locale;
extern EzcFun ezc_functions;
extern CKEditorGetParser ckeditor_getparser;
@@ -375,7 +375,7 @@ public:
void ReadTemplates();
void ReadNewIndexTemplates();
void ReadIndexFileNames(bool add_pattern = false);
void CreateFunctions();
void CreateFunctions(); // should be called before reading patterns (patterns will cache ezc functions)
void Generate();
void GenerateRunRaw();