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

added: mount option: html_template(file.html)

Browse Source 
files: indexpatterns.h indexpatterns.cpp
removed: templates/index_root.html
        its content was moved to index.html


git-svn-id: svn://ttmath.org/publicrep/winix/trunk@611 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2010-06-21 23:53:19 +00:00
parent 08f5865c72
commit 1e3f5e8695
22 changed files with 631 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/Makefile.dep
+135 -121
View File
@@ -2,20 +2,20 @@
adduser.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
adduser.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
adduser.o: ../core/httpsimpleparser.h ../core/log.h ../core/request.h
adduser.o: ../core/requesttypes.h ../core/session.h ../core/item.h
adduser.o: ../core/error.h ../core/log.h ../core/user.h ../core/rebus.h
adduser.o: ../core/plugindata.h ../core/function.h ../core/thread.h
adduser.o: ../core/compress.h ../core/acceptencodingparser.h
adduser.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
adduser.o: ../core/request.h ../core/requesttypes.h ../core/session.h
adduser.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h
adduser.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
adduser.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
adduser.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
adduser.o: ../core/postmultiparser.h ../core/ticket.h
dir.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
dir.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
dir.o: ../core/httpsimpleparser.h ../core/log.h ../core/request.h
dir.o: ../core/requesttypes.h ../core/session.h ../core/item.h
dir.o: ../core/error.h ../core/log.h ../core/user.h ../core/rebus.h
dir.o: ../core/plugindata.h ../core/function.h ../core/thread.h
dir.o: ../core/compress.h ../core/acceptencodingparser.h
dir.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
dir.o: ../core/request.h ../core/requesttypes.h ../core/session.h
dir.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h
dir.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
dir.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
dir.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
dir.o: ../core/postmultiparser.h ../core/ticket.h ../core/data.h
dir.o: ../core/dirs.h ../core/dircontainer.h ../core/users.h
@@ -24,51 +24,62 @@ dir.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
dir.o: ../core/mount.h ../core/loadavg.h ../core/db.h ../core/misc.h
doc.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
doc.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
doc.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h ../core/dirs.h
doc.o: ../core/item.h ../core/dircontainer.h ../core/users.h ../core/user.h
doc.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h
doc.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
doc.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
doc.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
doc.o: ../core/session.h ../core/plugindata.h ../core/thread.h
doc.o: ../core/compress.h ../core/acceptencodingparser.h
doc.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
doc.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
doc.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
doc.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
doc.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
doc.o: ../core/groups.h ../core/group.h ../core/functions.h
doc.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
doc.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
doc.o: ../core/request.h ../core/requesttypes.h ../core/session.h
doc.o: ../core/plugindata.h ../core/thread.h ../core/compress.h
doc.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
doc.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
doc.o: ../core/misc.h
indexpatterns.o: indexpatterns.h ../core/locale.h ../confparser/confparser.h
indexpatterns.o: localefilter.h ../core/log.h ../core/data.h ../core/dirs.h
indexpatterns.o: ../core/item.h ../core/dircontainer.h ../core/users.h
indexpatterns.o: ../core/user.h ../core/ugcontainer.h ../core/log.h
indexpatterns.o: ../core/groups.h ../core/group.h ../core/functions.h
indexpatterns.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
indexpatterns.o: ../core/mount.h ../core/error.h ../core/rebus.h
indexpatterns.o: ../core/loadavg.h
item.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
item.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
item.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
item.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h
item.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
item.o: ../core/group.h ../core/functions.h ../core/function.h
item.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
item.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h
item.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
item.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
item.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
item.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
item.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
item.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
item.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
item.o: ../core/groups.h ../core/group.h ../core/functions.h
item.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
item.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
item.o: ../core/request.h ../core/requesttypes.h ../core/session.h
item.o: ../core/plugindata.h ../core/thread.h ../core/compress.h
item.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
item.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
item.o: ../core/misc.h
last.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
last.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
last.o: ../core/httpsimpleparser.h ../core/log.h ../core/lastcontainer.h
last.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
last.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
last.o: ../core/groups.h ../core/group.h ../core/functions.h
last.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
last.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
last.o: ../core/request.h ../core/requesttypes.h ../core/session.h
last.o: ../core/plugindata.h ../core/thread.h ../core/compress.h
last.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
last.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
last.o: ../core/misc.h
last.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
last.o: ../core/lastcontainer.h ../core/data.h ../core/dirs.h ../core/item.h
last.o: ../core/dircontainer.h ../core/users.h ../core/user.h
last.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h
last.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
last.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
last.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
last.o: ../core/session.h ../core/plugindata.h ../core/thread.h
last.o: ../core/compress.h ../core/acceptencodingparser.h
last.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
last.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
localefilter.o: localefilter.h ../core/locale.h ../confparser/confparser.h
localefilter.o: ../core/misc.h ../core/item.h
ls.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
ls.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
ls.o: ../core/httpsimpleparser.h ../core/log.h ../core/request.h
ls.o: ../core/requesttypes.h ../core/session.h ../core/item.h ../core/error.h
ls.o: ../core/log.h ../core/user.h ../core/rebus.h ../core/plugindata.h
ls.o: ../core/function.h ../core/thread.h ../core/compress.h
ls.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
ls.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
ls.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
ls.o: ../core/request.h ../core/requesttypes.h ../core/session.h
ls.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h
ls.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
ls.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
ls.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
ls.o: ../core/postmultiparser.h ../core/ticket.h
misc.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
misc.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
misc.o: ../core/groups.h ../core/group.h ../core/functions.h
@@ -78,12 +89,12 @@ misc.o: ../core/misc.h misc.h localefilter.h ../core/locale.h
misc.o: ../confparser/confparser.h
mount.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
mount.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
mount.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
mount.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h
mount.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
mount.o: ../core/group.h ../core/functions.h ../core/function.h
mount.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
mount.o: ../core/error.h ../core/rebus.h ../core/loadavg.h
mount.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
mount.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
mount.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
mount.o: ../core/groups.h ../core/group.h ../core/functions.h
mount.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
mount.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
patterncacher.o: patterncacher.h ../core/item.h ../core/data.h ../core/dirs.h
patterncacher.o: ../core/item.h ../core/dircontainer.h ../core/users.h
patterncacher.o: ../core/user.h ../core/ugcontainer.h ../core/log.h
@@ -93,16 +104,17 @@ patterncacher.o: ../core/mount.h ../core/error.h ../core/rebus.h
patterncacher.o: ../core/loadavg.h ../core/log.h
priv.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
priv.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
priv.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
priv.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h
priv.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
priv.o: ../core/group.h ../core/functions.h ../core/function.h
priv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
priv.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h
priv.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
priv.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
priv.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
priv.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
priv.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
priv.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
priv.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
priv.o: ../core/groups.h ../core/group.h ../core/functions.h
priv.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
priv.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
priv.o: ../core/request.h ../core/requesttypes.h ../core/session.h
priv.o: ../core/plugindata.h ../core/thread.h ../core/compress.h
priv.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
priv.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
priv.o: ../core/misc.h
rebus.o: ../core/request.h ../core/requesttypes.h ../core/session.h
rebus.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h
rebus.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
@@ -115,38 +127,39 @@ rebus.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
rebus.o: ../core/mount.h ../core/loadavg.h templates.h patterncacher.h
rebus.o: ../core/item.h misc.h localefilter.h ../core/locale.h
rebus.o: ../confparser/confparser.h ckeditorgetparser.h
rebus.o: ../core/httpsimpleparser.h ../core/log.h
rebus.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
sys.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
sys.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
sys.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h ../core/dirs.h
sys.o: ../core/item.h ../core/dircontainer.h ../core/users.h ../core/user.h
sys.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h
sys.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
sys.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
sys.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
sys.o: ../core/session.h ../core/plugindata.h ../core/thread.h
sys.o: ../core/compress.h ../core/acceptencodingparser.h
sys.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
sys.o: ../core/postmultiparser.h ../core/ticket.h ../core/version.h
sys.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
sys.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
sys.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
sys.o: ../core/groups.h ../core/group.h ../core/functions.h
sys.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
sys.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
sys.o: ../core/request.h ../core/requesttypes.h ../core/session.h
sys.o: ../core/plugindata.h ../core/thread.h ../core/compress.h
sys.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
sys.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
sys.o: ../core/version.h
templates.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
templates.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
templates.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
templates.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h
templates.o: ../core/users.h ../core/user.h ../core/ugcontainer.h
templates.o: ../core/log.h ../core/groups.h ../core/group.h
templates.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
templates.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
templates.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
templates.o: ../core/session.h ../core/plugindata.h ../core/thread.h
templates.o: ../core/compress.h ../core/acceptencodingparser.h
templates.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
templates.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
templates.o: ../core/plugin.h ../core/request.h ../core/data.h
templates.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
templates.o: ../core/data.h ../core/dirs.h ../core/item.h
templates.o: ../core/dircontainer.h ../core/users.h ../core/user.h
templates.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h
templates.o: ../core/group.h ../core/functions.h ../core/function.h
templates.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
templates.o: ../core/error.h ../core/rebus.h ../core/loadavg.h
templates.o: ../core/request.h ../core/requesttypes.h ../core/session.h
templates.o: ../core/plugindata.h ../core/thread.h ../core/compress.h
templates.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
templates.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
templates.o: ../core/misc.h ../core/plugin.h ../core/request.h ../core/data.h
templates.o: ../core/pluginmsg.h
thread.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
thread.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
thread.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
thread.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h
thread.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
thread.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
thread.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
thread.o: ../core/groups.h ../core/group.h ../core/functions.h
thread.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
@@ -158,8 +171,8 @@ thread.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
thread.o: ../core/misc.h
ticket.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
ticket.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
ticket.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
ticket.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h
ticket.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
ticket.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
ticket.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
ticket.o: ../core/groups.h ../core/group.h ../core/functions.h
ticket.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
@@ -171,39 +184,40 @@ ticket.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
ticket.o: ../core/misc.h
upload.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
upload.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
upload.o: ../core/httpsimpleparser.h ../core/log.h ../core/request.h
upload.o: ../core/requesttypes.h ../core/session.h ../core/item.h
upload.o: ../core/error.h ../core/log.h ../core/user.h ../core/rebus.h
upload.o: ../core/plugindata.h ../core/function.h ../core/thread.h
upload.o: ../core/compress.h ../core/acceptencodingparser.h
upload.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
upload.o: ../core/request.h ../core/requesttypes.h ../core/session.h
upload.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h
upload.o: ../core/rebus.h ../core/plugindata.h ../core/function.h
upload.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
upload.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
upload.o: ../core/postmultiparser.h ../core/ticket.h
uptime.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
uptime.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
uptime.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
uptime.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h
uptime.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
uptime.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
uptime.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
uptime.o: ../core/groups.h ../core/group.h ../core/functions.h
uptime.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
uptime.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
user.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
user.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
user.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
user.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h
user.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
user.o: ../core/group.h ../core/functions.h ../core/function.h
user.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
user.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h
user.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
user.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
user.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
user.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
user.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
user.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
user.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
user.o: ../core/groups.h ../core/group.h ../core/functions.h
user.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
user.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
user.o: ../core/request.h ../core/requesttypes.h ../core/session.h
user.o: ../core/plugindata.h ../core/thread.h ../core/compress.h
user.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
user.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
user.o: ../core/misc.h
who.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
who.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
who.o: ../core/httpsimpleparser.h ../core/log.h ../core/sessioncontainer.h
who.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h
who.o: ../core/user.h ../core/rebus.h ../core/plugindata.h
who.o: ../core/requestcontroller.h ../content/content.h
who.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
who.o: ../core/sessioncontainer.h ../core/session.h ../core/item.h
who.o: ../core/error.h ../core/log.h ../core/user.h ../core/rebus.h
who.o: ../core/plugindata.h ../core/requestcontroller.h ../content/content.h
who.o: ../templates/templates.h ../core/thread.h ../core/ticket.h
who.o: ../core/db.h ../core/group.h ../core/thread.h ../core/dircontainer.h
who.o: ../core/ugcontainer.h ../core/ticket.h ../core/sessionmanager.h
@@ -216,13 +230,13 @@ who.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
who.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/misc.h
winix.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
winix.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
winix.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
winix.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h
winix.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
winix.o: ../core/group.h ../core/functions.h ../core/function.h
winix.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
winix.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h
winix.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
winix.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
winix.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
winix.o: ../core/postmultiparser.h ../core/ticket.h
winix.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
winix.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
winix.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
winix.o: ../core/groups.h ../core/group.h ../core/functions.h
winix.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
winix.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
winix.o: ../core/request.h ../core/requesttypes.h ../core/session.h
winix.o: ../core/plugindata.h ../core/thread.h ../core/compress.h
winix.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
winix.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
templates/Makefile.o.dep
+1 -1
View File
@@ -1 +1 @@
o = adduser.o dir.o doc.o item.o last.o localefilter.o ls.o misc.o mount.o patterncacher.o priv.o rebus.o sys.o templates.o thread.o ticket.o upload.o uptime.o user.o who.o winix.o
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 sys.o templates.o thread.o ticket.o upload.o uptime.o user.o who.o winix.o
templates/indexpatterns.cpp
Executable
+117
View File
@@ -0,0 +1,117 @@
/*
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2010, Tomasz Sowa
* All rights reserved.
*
*/
#include "indexpatterns.h"
#include "../core/log.h"
#include "../core/data.h"
Ezc::Pattern * IndexPatterns::GetPattern(const std::string & file, Locale::Lang lang)
{
Tab::iterator i = tab.find(file);
if( i == tab.end() )
return 0;
size_t index = static_cast<size_t>(lang);
if( index >= i->second.patterns.size() )
{
log << log1 << "IndexPatterns: there is no a pattern: " << file << ", for lang: " << index << logend;
return 0;
}
return &i->second.patterns[index];
}
void IndexPatterns::AddPattern(const std::string & 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;
i->second.to_delete = false;
ReadPattern(i, locale, locale_filter, delete_white);
}
void IndexPatterns::AddPatternIfNotExists(const std::string & file, Locale & locale, LocaleFilter & locale_filter, bool delete_white)
{
Tab::iterator i = tab.find(file);
if( i != tab.end() )
return;
AddPattern(file, locale, locale_filter, delete_white);
}
void IndexPatterns::AddFileName(const std::string & file)
{
tab.insert( std::make_pair(file, Template()) );
}
void IndexPatterns::ReadPattern(Tab::iterator & iter, Locale & locale, LocaleFilter & locale_filter, bool delete_white)
{
size_t i;
size_t len = Locale::lang_unknown;
Template & templ = iter->second;
templ.patterns.resize(len);
for(i=0 ; i<len ; ++i)
{
templ.patterns[i].delete_all_white = delete_white;
templ.patterns[i].Directory(data.templates_dir, data.templates_dir_default);
templ.patterns[i].ParseFile(iter->first);
locale_filter.Filter(templ.patterns[i], locale, static_cast<Locale::Lang>(i));
}
}
void IndexPatterns::ReloadPatterns(Locale & locale, LocaleFilter & locale_filter, bool delete_white)
{
Tab::iterator i;
for(i=tab.begin() ; i!=tab.end() ; ++i)
ReadPattern(i, locale, locale_filter, delete_white);
}
void IndexPatterns::MarkAllToDelete()
{
Tab::iterator i;
for(i=tab.begin() ; i!=tab.end() ; ++i)
i->second.to_delete = true;
}
void IndexPatterns::DeleteMarked()
{
Tab::iterator i = tab.begin();
Tab::iterator next;
while( i != tab.end() )
{
next = i;
++next;
if( i->second.to_delete )
tab.erase(i);
i = next;
}
}
templates/indexpatterns.h
Executable
+58
View File
@@ -0,0 +1,58 @@
/*
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2010, Tomasz Sowa
* All rights reserved.
*
*/
#ifndef headerfilecmslutemplatesindexpatterns
#define headerfilecmslutemplatesindexpatterns
#include <string>
#include <vector>
#include <map>
#include "ezc.h"
#include "../core/locale.h"
#include "localefilter.h"
class IndexPatterns
{
public:
// 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);
// adding a file name without reading the pattern
// the pattern will be read during ReloadPatterns()
void AddFileName(const std::string & file);
void ReloadPatterns(Locale & locale, LocaleFilter & locale_filter, bool delete_white);
void MarkAllToDelete();
void DeleteMarked();
private:
struct Template
{
bool to_delete;
// table[lang]
std::vector<Ezc::Pattern> patterns;
};
typedef std::map<std::string, Template> Tab;
Tab tab;
void ReadPattern(Tab::iterator & i, Locale & locale, LocaleFilter & locale_filter, bool delete_white);
};
#endif
templates/localefilter.cpp
+4 -2
View File
@@ -76,7 +76,7 @@ void LocaleFilter::Parse(std::string & str)
{
++pchar;
ReadKey();
res += FilterValue(plocale->Get(key));
res += FilterValue(plocale->Get(key, lang));
}
else
if( *pchar == '\\' && (*(pchar+1) == open_mark || *(pchar+1) == closing_mark || *(pchar+1) == '\\') )
@@ -110,8 +110,10 @@ void LocaleFilter::FilterText(Ezc::Pattern::Item & item)
void LocaleFilter::Filter(Ezc::Pattern & pattern, const Locale & locale)
void LocaleFilter::Filter(Ezc::Pattern & pattern, const Locale & locale, Locale::Lang lang_)
{
plocale = &locale;
lang = lang_;
FilterText( pattern.item_root );
}
templates/localefilter.h
+2 -1
View File
@@ -21,7 +21,7 @@ class LocaleFilter
public:
LocaleFilter();
void Filter(Ezc::Pattern & pattern, const Locale & locale);
void Filter(Ezc::Pattern & pattern, const Locale & locale, Locale::Lang lang_);
private:
void ReadKey();
@@ -33,6 +33,7 @@ private:
char closing_mark; // default '}'
const Locale * plocale;
Locale::Lang lang;
std::string res;
std::string key;
std::string value;
templates/misc.cpp
+1 -19
View File
@@ -33,7 +33,6 @@ void print_date_nice(Ezc::Info & i, tm * ptm)
// those functions from here are used in the second thread too
@@ -43,8 +42,6 @@ void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & local
{
size_t i;
size_t len = patterns.size();
Locale::Lang old_lang = locale.GetLang();
for(i=0 ; i<len ; ++i)
{
@@ -54,24 +51,9 @@ void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & local
patterns[i][pat].Directory(data.templates_dir, data.templates_dir_default);
patterns[i][pat].ParseFile(file);
Locale::Lang new_lang = static_cast<Locale::Lang>(i);
locale.SetLang(new_lang);
locale_filter.Filter(patterns[i][pat], locale);
locale_filter.Filter(patterns[i][pat], locale, static_cast<Locale::Lang>(i));
}
}
locale.SetLang(old_lang);
}
templates/templates.cpp
+59 -3
View File
@@ -8,16 +8,19 @@
*/
#include "templates.h"
#include "localefilter.h"
#include "../core/data.h"
#include "../core/request.h"
#include "../core/misc.h"
#include "../core/plugin.h"
#include "localefilter.h"
namespace TemplatesFunctions
{
IndexPatterns index_patterns;
TemplatesMisc::Patterns patterns;
Ezc::Functions functions;
PatternCacher pattern_cacher;
@@ -464,7 +467,7 @@ void Templates::CreateFunctions()
functions.Insert("winix_err_code", winix_err_code);
functions.Insert("winix_is_err_in_locales", winix_is_err_in_locales);
functions.Insert("winix_err_msg_from_locales",winix_err_msg_from_locales);
functions.Insert("winix_content_full", winix_content_full);
functions.Insert("winix_show_content_in_full_window", winix_show_content_in_full_window);
plugin.Call(WINIX_TEMPLATES_CREATEFUNCTIONS, &functions);
}
@@ -526,10 +529,54 @@ using namespace TemplatesFunctions;
ReadFile(pat_fun_subject, "fun_subject.html");
ReadFile(pat_fun_cp, "fun_cp.html");
ReadFile(pat_fun_tinymce, "fun_tinymce.html");
index_patterns.ReloadPatterns(locale, locale_filter, false);
}
// reading only new index templates (with parsing)
// those which are exists are not touched
// the rest are deleted
void Templates::ReadNewIndexTemplates()
{
Mounts::MountTab::const_iterator i;
using namespace TemplatesFunctions;
index_patterns.MarkAllToDelete();
const Mounts::MountTab * pmount_tab = data.mounts.GetMountTab();
for(i=pmount_tab->begin() ; i!=pmount_tab->end() ; ++i)
{
const std::string * file = i->second.HtmlTemplate();
if( file )
index_patterns.AddPatternIfNotExists(*file, locale, locale_filter, false); // file pattern will be unmarked
}
index_patterns.DeleteMarked();
}
// reading only index file names (without parsing the files)
void Templates::ReadIndexFileNames()
{
using namespace TemplatesFunctions;
Mounts::MountTab::const_iterator i;
const Mounts::MountTab * pmount_tab = data.mounts.GetMountTab();
for(i=pmount_tab->begin() ; i!=pmount_tab->end() ; ++i)
{
const std::string * file = i->second.HtmlTemplate();
if( file )
index_patterns.AddFileName(*file);
}
}
void Templates::ClearPatterns()
{
@@ -547,7 +594,16 @@ using namespace TemplatesFunctions;
if( static_cast<size_t>(locale.GetLang()) >= patterns.size() )
return;
Ezc::Generator generator(request.page, patterns[locale.GetLang()][pat_index], functions);
Ezc::Pattern * index = 0;
const std::string * index_file_local = data.mounts.pmount->HtmlTemplate();
if( index_file_local )
index = index_patterns.GetPattern(*index_file_local, locale.GetLang());
if( !index )
index = &patterns[locale.GetLang()][pat_index];
Ezc::Generator generator(request.page, *index, functions);
generator.Generate();
}
templates/templates.h
+6 -2
View File
@@ -17,6 +17,8 @@
#include "misc.h"
#include "ckeditorgetparser.h"
#include "../core/locale.h"
#include "indexpatterns.h"
namespace TemplatesFunctions
@@ -66,7 +68,7 @@ namespace TemplatesFunctions
};
extern IndexPatterns index_patterns;
extern TemplatesMisc::Patterns patterns;
extern PatternCacher pattern_cacher;
extern Locale locale;
@@ -369,7 +371,7 @@ namespace TemplatesFunctions
void winix_err_code(Info & i);
void winix_is_err_in_locales(Info & i);
void winix_err_msg_from_locales(Info & i);
void winix_content_full(Info & i);
void winix_show_content_in_full_window(Info & i);
} // namespace TemplatesFunctions
@@ -384,6 +386,8 @@ public:
void ClearPatterns();
void ReadTemplates();
void ReadNewIndexTemplates();
void ReadIndexFileNames();
void CreateFunctions();
void Generate();
void GenerateRunRaw();
templates/winix.cpp
+1 -1
View File
@@ -170,7 +170,7 @@ char buff[40];
}
void winix_content_full(Info & i)
void winix_show_content_in_full_window(Info & i)
{
if( request.pfunction )
i.res = (request.pfunction->code == FUN_CKEDITOR || request.pfunction->code == FUN_TINYMCE);