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

the first part of reimplementing has been done

Browse Source 
now we have app object and singletons are only: log logn plugin and app



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@628 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2010-08-10 16:12:50 +00:00
parent 6897192364
commit 217cf1420b
191 changed files with 9529 additions and 7250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

526
templates/Makefile.dep
View File

@@ -1,255 +1,367 @@
# DO NOT DELETE
adduser.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h
adduser.o: misc.h localefilter.h ../core/locale.h ../confparser/confparser.h
adduser.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h
adduser.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
adduser.o: indexpatterns.h ../core/request.h ../core/requesttypes.h
adduser.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h
adduser.o: ../core/user.h ../core/rebus.h ../core/plugindata.h
adduser.o: ../core/function.h ../core/thread.h ../core/compress.h
adduser.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
adduser.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
adduser.o: indexpatterns.h ../core/locale.h ../core/config.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/plugindata.h ../core/rebus.h ../core/thread.h
adduser.o: ../core/compress.h ../core/acceptencodingparser.h
adduser.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
adduser.o: ../core/postmultiparser.h ../core/config.h ../core/ticket.h
adduser.o: ../core/db.h ../core/group.h ../core/dircontainer.h
adduser.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h
adduser.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
adduser.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
adduser.o: ../core/sessionmanager.h ../core/sessioncontainer.h
adduser.o: ../core/system.h
dir.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
dir.o: localefilter.h ../core/locale.h ../confparser/confparser.h
dir.o: localefilter.h ../core/locale.h ../core/confparser.h
dir.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
dir.o: indexpatterns.h ../core/request.h ../core/requesttypes.h
dir.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h
dir.o: ../core/user.h ../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
dir.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h
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
dir.o: indexpatterns.h ../core/locale.h ../core/config.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/plugindata.h
dir.o: ../core/rebus.h ../core/thread.h ../core/compress.h
dir.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
dir.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
dir.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/dircontainer.h
dir.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h
dir.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
dir.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
dir.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
dir.o: ../core/misc.h ../functions/functions.h ../functions/functionbase.h
dir.o: ../core/item.h ../core/notify.h ../templatesnotify/templatesnotify.h
dir.o: ../core/mount.h ../templates/misc.h ../functions/functionparser.h
dir.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
dir.o: ../functions/privchanger.h ../functions/chown.h ../functions/cp.h
dir.o: ../functions/createthread.h ../functions/createticket.h
dir.o: ../functions/default.h ../functions/download.h
dir.o: ../functions/editticket.h ../functions/emacs.h ../functions/last.h
dir.o: ../functions/login.h ../functions/logout.h ../functions/ls.h
dir.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h
dir.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
dir.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h
dir.o: ../core/thread.h ../functions/funticket.h ../functions/uname.h
dir.o: ../functions/upload.h ../functions/who.h
doc.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
doc.o: localefilter.h ../core/locale.h ../confparser/confparser.h
doc.o: localefilter.h ../core/locale.h ../core/confparser.h
doc.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
doc.o: indexpatterns.h ../core/data.h ../core/dirs.h ../core/item.h
doc.o: ../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
indexpatterns.o: indexpatterns.h ../../ezc/src/ezc.h ../core/locale.h
indexpatterns.o: ../confparser/confparser.h localefilter.h ../core/log.h
indexpatterns.o: ../core/data.h ../core/dirs.h ../core/item.h
indexpatterns.o: ../core/dircontainer.h ../core/users.h ../core/user.h
indexpatterns.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h
indexpatterns.o: ../core/group.h ../core/functions.h ../core/function.h
indexpatterns.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
indexpatterns.o: ../core/error.h ../core/rebus.h ../core/loadavg.h
doc.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h
doc.o: ../core/requesttypes.h ../core/session.h ../core/item.h
doc.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h
doc.o: ../core/rebus.h ../core/thread.h ../core/compress.h
doc.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
doc.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
doc.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/dircontainer.h
doc.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h
doc.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
doc.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
doc.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
doc.o: ../core/request.h ../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/log.h
item.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
item.o: localefilter.h ../core/locale.h ../confparser/confparser.h
item.o: localefilter.h ../core/locale.h ../core/confparser.h
item.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
item.o: indexpatterns.h ../core/data.h ../core/dirs.h ../core/item.h
item.o: ../core/dircontainer.h ../core/users.h ../core/user.h
item.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h
item.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
item.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
item.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
item.o: ../core/session.h ../core/plugindata.h ../core/thread.h
item.o: ../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/bbcodeparser.h
item.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h
item.o: ../core/requesttypes.h ../core/session.h ../core/item.h
item.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h
item.o: ../core/rebus.h ../core/thread.h ../core/compress.h
item.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
item.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
item.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/dircontainer.h
item.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h
item.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
item.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
item.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
item.o: ../core/request.h ../core/misc.h ../core/bbcodeparser.h
last.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
last.o: localefilter.h ../core/locale.h ../confparser/confparser.h
last.o: localefilter.h ../core/locale.h ../core/confparser.h
last.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
last.o: indexpatterns.h ../core/lastcontainer.h ../core/data.h ../core/dirs.h
last.o: ../core/item.h ../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
last.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h
last.o: ../core/requesttypes.h ../core/session.h ../core/item.h
last.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h
last.o: ../core/rebus.h ../core/thread.h ../core/compress.h
last.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
last.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
last.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/dircontainer.h
last.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h
last.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
last.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
last.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
last.o: ../core/lastcontainer.h ../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 patterncacher.h ../core/item.h misc.h
ls.o: localefilter.h ../core/locale.h ../confparser/confparser.h
ls.o: localefilter.h ../core/locale.h ../core/confparser.h
ls.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
ls.o: indexpatterns.h ../core/request.h ../core/requesttypes.h
ls.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h
ls.o: ../core/user.h ../core/rebus.h ../core/plugindata.h ../core/function.h
ls.o: indexpatterns.h ../core/locale.h ../core/config.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/plugindata.h ../core/rebus.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
misc.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
misc.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
misc.o: ../core/misc.h ../core/request.h ../core/requesttypes.h
misc.o: ../core/session.h ../core/plugindata.h ../core/thread.h
misc.o: ../core/compress.h ../core/acceptencodingparser.h
misc.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
misc.o: ../core/postmultiparser.h ../core/ticket.h templates.h
ls.o: ../core/postmultiparser.h ../core/config.h ../core/ticket.h
ls.o: ../core/db.h ../core/group.h ../core/dircontainer.h
ls.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h
ls.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
ls.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
ls.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
ls.o: ../core/request.h
misc.o: ../core/misc.h ../core/item.h ../core/request.h templates.h
misc.o: ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
misc.o: localefilter.h ../core/locale.h ../confparser/confparser.h
misc.o: localefilter.h ../core/locale.h ../core/confparser.h
misc.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
misc.o: indexpatterns.h
misc.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h
misc.o: ../core/requesttypes.h ../core/session.h ../core/error.h
misc.o: ../core/log.h ../core/user.h ../core/plugindata.h ../core/rebus.h
misc.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
misc.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
misc.o: ../core/postmultiparser.h ../core/config.h ../core/ticket.h
misc.o: ../core/db.h ../core/group.h ../core/dircontainer.h
misc.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h
misc.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
misc.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
misc.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
mount.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h
mount.o: misc.h localefilter.h ../core/locale.h ../confparser/confparser.h
mount.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h
mount.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
mount.o: indexpatterns.h ../core/data.h ../core/dirs.h ../core/item.h
mount.o: ../core/dircontainer.h ../core/users.h ../core/user.h
mount.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h
mount.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
mount.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
mount.o: ../core/loadavg.h
mount.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h
mount.o: ../core/requesttypes.h ../core/session.h ../core/item.h
mount.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h
mount.o: ../core/rebus.h ../core/thread.h ../core/compress.h
mount.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
mount.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
mount.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/dircontainer.h
mount.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h
mount.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
mount.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
mount.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
patterncacher.o: patterncacher.h ../core/item.h ../../ezc/src/ezc.h
patterncacher.o: ../core/data.h ../core/dirs.h ../core/item.h
patterncacher.o: ../core/dircontainer.h ../core/users.h ../core/user.h
patterncacher.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h
patterncacher.o: ../core/group.h ../core/functions.h ../core/function.h
patterncacher.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
patterncacher.o: ../core/error.h ../core/rebus.h ../core/loadavg.h
patterncacher.o: ../core/log.h
priv.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
priv.o: localefilter.h ../core/locale.h ../confparser/confparser.h
priv.o: localefilter.h ../core/locale.h ../core/confparser.h
priv.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
priv.o: indexpatterns.h ../core/data.h ../core/dirs.h ../core/item.h
priv.o: ../core/dircontainer.h ../core/users.h ../core/user.h
priv.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h
priv.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
priv.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
priv.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
priv.o: ../core/session.h ../core/plugindata.h ../core/thread.h
priv.o: ../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: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h
priv.o: ../core/requesttypes.h ../core/session.h ../core/item.h
priv.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h
priv.o: ../core/rebus.h ../core/thread.h ../core/compress.h
priv.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
priv.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
priv.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/dircontainer.h
priv.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h
priv.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
priv.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
priv.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
priv.o: ../core/misc.h ../functions/functions.h ../functions/functionbase.h
priv.o: ../core/item.h ../core/notify.h ../templatesnotify/templatesnotify.h
priv.o: ../core/mount.h ../templates/misc.h ../functions/functionparser.h
priv.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
priv.o: ../functions/privchanger.h ../functions/chown.h ../functions/cp.h
priv.o: ../functions/createthread.h ../functions/createticket.h
priv.o: ../functions/default.h ../functions/download.h
priv.o: ../functions/editticket.h ../functions/emacs.h ../functions/last.h
priv.o: ../functions/login.h ../functions/logout.h ../functions/ls.h
priv.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h
priv.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
priv.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h
priv.o: ../core/thread.h ../functions/funticket.h ../functions/uname.h
priv.o: ../functions/upload.h ../functions/who.h
rebus.o: ../core/request.h templates.h ../../ezc/src/ezc.h patterncacher.h
rebus.o: ../core/item.h misc.h localefilter.h ../core/locale.h
rebus.o: ../core/confparser.h ckeditorgetparser.h ../core/httpsimpleparser.h
rebus.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.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
rebus.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
rebus.o: ../core/plugindata.h ../core/rebus.h ../core/thread.h
rebus.o: ../core/compress.h ../core/acceptencodingparser.h
rebus.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
rebus.o: ../core/postmultiparser.h ../core/ticket.h ../core/data.h
rebus.o: ../core/dirs.h ../core/dircontainer.h ../core/users.h
rebus.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h
rebus.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
rebus.o: ../core/mount.h ../core/loadavg.h templates.h ../../ezc/src/ezc.h
rebus.o: patterncacher.h ../core/item.h misc.h localefilter.h
rebus.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
rebus.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
rebus.o: ../core/postmultiparser.h ../core/config.h ../core/ticket.h
rebus.o: ../core/db.h ../core/group.h ../core/dircontainer.h
rebus.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h
rebus.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
rebus.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
rebus.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
sys.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
sys.o: localefilter.h ../core/locale.h ../confparser/confparser.h
sys.o: localefilter.h ../core/locale.h ../core/confparser.h
sys.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
sys.o: indexpatterns.h ../core/data.h ../core/dirs.h ../core/item.h
sys.o: ../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: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h
sys.o: ../core/requesttypes.h ../core/session.h ../core/item.h
sys.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h
sys.o: ../core/rebus.h ../core/thread.h ../core/compress.h
sys.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
sys.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
sys.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/dircontainer.h
sys.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h
sys.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
sys.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
sys.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
sys.o: ../core/request.h ../core/version.h
templates.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h
templates.o: misc.h localefilter.h ../core/locale.h
templates.o: ../confparser/confparser.h ckeditorgetparser.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: misc.h localefilter.h ../core/locale.h ../core/confparser.h
templates.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
templates.o: indexpatterns.h ../core/locale.h ../core/config.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
templates.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h
templates.o: ../core/plugindata.h ../core/rebus.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/config.h ../core/ticket.h
templates.o: ../core/db.h ../core/group.h ../core/dircontainer.h
templates.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h
templates.o: ../core/db.h ../core/request.h ../core/mounts.h ../core/mount.h
templates.o: ../core/users.h ../core/lastcontainer.h ../core/groups.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/item.h ../core/notify.h
templates.o: ../templatesnotify/templatesnotify.h ../core/mount.h
templates.o: ../templates/misc.h ../functions/functionparser.h
templates.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
templates.o: ../functions/privchanger.h ../functions/chown.h
templates.o: ../functions/cp.h ../functions/createthread.h
templates.o: ../functions/createticket.h ../functions/default.h
templates.o: ../functions/download.h ../functions/editticket.h
templates.o: ../functions/emacs.h ../functions/last.h ../functions/login.h
templates.o: ../functions/logout.h ../functions/ls.h ../functions/mkdir.h
templates.o: ../functions/mv.h ../functions/node.h ../functions/priv.h
templates.o: ../functions/reload.h ../functions/rm.h ../functions/run.h
templates.o: ../functions/subject.h ../functions/funthread.h ../core/thread.h
templates.o: ../functions/funticket.h ../functions/uname.h
templates.o: ../functions/upload.h ../functions/who.h
templates.o: ../templates/templates.h
thread.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h
thread.o: misc.h localefilter.h ../core/locale.h ../confparser/confparser.h
thread.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h
thread.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
thread.o: indexpatterns.h ../core/data.h ../core/dirs.h ../core/item.h
thread.o: ../core/dircontainer.h ../core/users.h ../core/user.h
thread.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h
thread.o: ../core/group.h ../core/functions.h ../core/function.h
thread.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
thread.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h
thread.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
thread.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
thread.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
thread.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
thread.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h
thread.o: ../core/requesttypes.h ../core/session.h ../core/item.h
thread.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h
thread.o: ../core/rebus.h ../core/thread.h ../core/compress.h
thread.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
thread.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
thread.o: ../core/ticket.h ../core/db.h ../core/group.h
thread.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/system.h
thread.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
thread.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
thread.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
thread.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
thread.o: ../core/misc.h
ticket.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h
ticket.o: misc.h localefilter.h ../core/locale.h ../confparser/confparser.h
ticket.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h
ticket.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
ticket.o: indexpatterns.h ../core/data.h ../core/dirs.h ../core/item.h
ticket.o: ../core/dircontainer.h ../core/users.h ../core/user.h
ticket.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h
ticket.o: ../core/group.h ../core/functions.h ../core/function.h
ticket.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
ticket.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h
ticket.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h
ticket.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
ticket.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
ticket.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
ticket.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h
ticket.o: ../core/requesttypes.h ../core/session.h ../core/item.h
ticket.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h
ticket.o: ../core/rebus.h ../core/thread.h ../core/compress.h
ticket.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
ticket.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
ticket.o: ../core/ticket.h ../core/db.h ../core/group.h
ticket.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/system.h
ticket.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
ticket.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
ticket.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
ticket.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
ticket.o: ../functions/functions.h ../functions/functionbase.h ../core/item.h
ticket.o: ../core/notify.h ../templatesnotify/templatesnotify.h
ticket.o: ../core/mount.h ../templates/misc.h ../functions/functionparser.h
ticket.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
ticket.o: ../functions/privchanger.h ../functions/chown.h ../functions/cp.h
ticket.o: ../functions/createthread.h ../functions/createticket.h
ticket.o: ../functions/default.h ../functions/download.h
ticket.o: ../functions/editticket.h ../functions/emacs.h ../functions/last.h
ticket.o: ../functions/login.h ../functions/logout.h ../functions/ls.h
ticket.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h
ticket.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
ticket.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h
ticket.o: ../core/thread.h ../functions/funticket.h ../functions/uname.h
ticket.o: ../functions/upload.h ../functions/who.h
upload.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h
upload.o: misc.h localefilter.h ../core/locale.h ../confparser/confparser.h
upload.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h
upload.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
upload.o: indexpatterns.h ../core/request.h ../core/requesttypes.h
upload.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h
upload.o: ../core/user.h ../core/rebus.h ../core/plugindata.h
upload.o: ../core/function.h ../core/thread.h ../core/compress.h
upload.o: indexpatterns.h ../core/locale.h ../core/config.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/plugindata.h
upload.o: ../core/rebus.h ../core/thread.h ../core/compress.h
upload.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
upload.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
upload.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
upload.o: ../core/ticket.h ../core/db.h ../core/group.h
upload.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/system.h
upload.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
upload.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
upload.o: ../core/groups.h ../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 patterncacher.h ../core/item.h
uptime.o: misc.h localefilter.h ../core/locale.h ../confparser/confparser.h
uptime.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h
uptime.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
uptime.o: indexpatterns.h ../core/data.h ../core/dirs.h ../core/item.h
uptime.o: ../core/dircontainer.h ../core/users.h ../core/user.h
uptime.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h
uptime.o: ../core/group.h ../core/functions.h ../core/function.h
uptime.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
uptime.o: ../core/error.h ../core/rebus.h ../core/loadavg.h
uptime.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h
uptime.o: ../core/requesttypes.h ../core/session.h ../core/item.h
uptime.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h
uptime.o: ../core/rebus.h ../core/thread.h ../core/compress.h
uptime.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
uptime.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
uptime.o: ../core/ticket.h ../core/db.h ../core/group.h
uptime.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/system.h
uptime.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
uptime.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
uptime.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
uptime.o: ../core/sessioncontainer.h ../core/system.h
user.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
user.o: localefilter.h ../core/locale.h ../confparser/confparser.h
user.o: localefilter.h ../core/locale.h ../core/confparser.h
user.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
user.o: indexpatterns.h ../core/data.h ../core/dirs.h ../core/item.h
user.o: ../core/dircontainer.h ../core/users.h ../core/user.h
user.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h
user.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
user.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
user.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
user.o: ../core/session.h ../core/plugindata.h ../core/thread.h
user.o: ../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: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h
user.o: ../core/requesttypes.h ../core/session.h ../core/item.h
user.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h
user.o: ../core/rebus.h ../core/thread.h ../core/compress.h
user.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
user.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
user.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/dircontainer.h
user.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h
user.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
user.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
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 patterncacher.h ../core/item.h misc.h
who.o: localefilter.h ../core/locale.h ../confparser/confparser.h
who.o: localefilter.h ../core/locale.h ../core/confparser.h
who.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
who.o: indexpatterns.h ../core/sessioncontainer.h ../core/session.h
who.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h
who.o: ../core/rebus.h ../core/plugindata.h ../core/requestcontroller.h
who.o: ../content/content.h ../templates/templates.h ../core/thread.h
who.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/thread.h
who.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
who.o: ../core/sessionmanager.h ../core/sessioncontainer.h
who.o: ../core/functionparser.h ../core/requesttypes.h ../core/data.h
who.o: ../core/dirs.h ../core/users.h ../core/groups.h ../core/functions.h
who.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
who.o: ../core/mount.h ../core/loadavg.h ../core/request.h ../core/compress.h
who.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h
who.o: ../core/requesttypes.h ../core/session.h ../core/item.h
who.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h
who.o: ../core/rebus.h ../core/thread.h ../core/compress.h
who.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
who.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/misc.h
who.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
who.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/dircontainer.h
who.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h
who.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
who.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
who.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
who.o: ../core/misc.h
winix.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h
winix.o: misc.h localefilter.h ../core/locale.h ../confparser/confparser.h
winix.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h
winix.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
winix.o: indexpatterns.h ../core/data.h ../core/dirs.h ../core/item.h
winix.o: ../core/dircontainer.h ../core/users.h ../core/user.h
winix.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h
winix.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
winix.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
winix.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
winix.o: ../core/session.h ../core/plugindata.h ../core/thread.h
winix.o: ../core/compress.h ../core/acceptencodingparser.h
winix.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
winix.o: ../core/postmultiparser.h ../core/ticket.h
winix.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/request.h
winix.o: ../core/requesttypes.h ../core/session.h ../core/item.h
winix.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h
winix.o: ../core/rebus.h ../core/thread.h ../core/compress.h
winix.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
winix.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
winix.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/dircontainer.h
winix.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h ../core/db.h
winix.o: ../core/request.h ../core/mounts.h ../core/mount.h ../core/users.h
winix.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
winix.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
winix.o: ../functions/functions.h ../functions/functionbase.h ../core/item.h
winix.o: ../core/notify.h ../templatesnotify/templatesnotify.h
winix.o: ../core/mount.h ../templates/misc.h ../functions/functionparser.h
winix.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
winix.o: ../functions/privchanger.h ../functions/chown.h ../functions/cp.h
winix.o: ../functions/createthread.h ../functions/createticket.h
winix.o: ../functions/default.h ../functions/download.h
winix.o: ../functions/editticket.h ../functions/emacs.h ../functions/last.h
winix.o: ../functions/login.h ../functions/logout.h ../functions/ls.h
winix.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h
winix.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
winix.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h
winix.o: ../core/thread.h ../functions/funticket.h ../functions/uname.h
winix.o: ../functions/upload.h ../functions/who.h

6
templates/adduser.cpp
View File

@@ -9,7 +9,7 @@
#include <ctime>
#include "templates.h"
#include "../core/request.h"
#include "core/request.h"
namespace TemplatesFunctions
@@ -17,7 +17,7 @@ namespace TemplatesFunctions
void adduser_last_login(Info & i)
{
std::string * last_login = request.PostVar("login");
std::string * last_login = request->PostVar("login");
if( last_login )
i.out << *last_login;
@@ -26,7 +26,7 @@ void adduser_last_login(Info & i)
void adduser_last_email(Info & i)
{
std::string * last_email = request.PostVar("email");
std::string * last_email = request->PostVar("email");
if( last_email )
i.out << *last_email;

120
templates/dir.cpp
View File

@@ -8,12 +8,8 @@
*/
#include "templates.h"
#include "../core/request.h"
#include "../core/data.h"
#include "../core/db.h"
#include "../core/log.h"
#include "../core/misc.h"
#include "core/misc.h"
#include "functions/functions.h"
namespace TemplatesFunctions
@@ -23,9 +19,9 @@ namespace TemplatesFunctions
void dir(Info & i)
{
for(size_t a=0 ; a<request.dir_table.size() ; ++a)
for(size_t a=0 ; a<request->dir_table.size() ; ++a)
{
HtmlEscape(i.out, request.dir_table[a]->url);
HtmlEscape(i.out, request->dir_table[a]->url);
i.out << '/';
}
}
@@ -33,11 +29,11 @@ void dir(Info & i)
void dir_without_slash(Info & i)
{
for(size_t a=0 ; a<request.dir_table.size() ; ++a)
for(size_t a=0 ; a<request->dir_table.size() ; ++a)
{
HtmlEscape(i.out, request.dir_table[a]->url);
HtmlEscape(i.out, request->dir_table[a]->url);
if( a < request.dir_table.size()-1 )
if( a < request->dir_table.size()-1 )
i.out << '/';
}
}
@@ -45,12 +41,12 @@ void dir_without_slash(Info & i)
void dir_parent(Info & i)
{
if( request.dir_table.empty() )
if( request->dir_table.empty() )
return;
for(size_t a=0 ; a<request.dir_table.size()-1 ; ++a)
for(size_t a=0 ; a<request->dir_table.size()-1 ; ++a)
{
HtmlEscape(i.out, request.dir_table[a]->url);
HtmlEscape(i.out, request->dir_table[a]->url);
i.out << '/';
}
}
@@ -58,14 +54,14 @@ void dir_parent(Info & i)
void dir_parent_without_slash(Info & i)
{
if( request.dir_table.empty() )
if( request->dir_table.empty() )
return;
for(size_t a=0 ; a<request.dir_table.size()-1 ; ++a)
for(size_t a=0 ; a<request->dir_table.size()-1 ; ++a)
{
HtmlEscape(i.out, request.dir_table[a]->url);
HtmlEscape(i.out, request->dir_table[a]->url);
if( request.dir_table.size()>=2 && a<request.dir_table.size()-2 )
if( request->dir_table.size()>=2 && a<request->dir_table.size()-2 )
i.out << '/';
}
}
@@ -77,9 +73,9 @@ void dir_can_read_exec(Info & i)
{
bool result = true;
for(size_t a=0 ; a<request.dir_table.size() ; ++a)
for(size_t a=0 ; a<request->dir_table.size() ; ++a)
{
if( !request.HasReadExecAccess(*request.dir_table[a]) )
if( !system->HasReadExecAccess(*request->dir_table[a]) )
{
result = false;
break;
@@ -92,7 +88,7 @@ bool result = true;
void dir_can_write(Info & i)
{
i.res = request.HasWriteAccess(*request.dir_table.back());
i.res = system->HasWriteAccess(*request->dir_table.back());
}
@@ -101,18 +97,18 @@ void dir_can_remove(Info & i)
bool result = true;
if( request.dir_table.size() == 1 )
if( request->dir_table.size() == 1 )
{
// rm for the root dir
// only the superuser can do it
if( !request.session->puser || !request.session->puser->super_user )
if( !request->session->puser || !request->session->puser->super_user )
result = false;
}
else
{
Item * last_but_one_dir = *(--(--request.dir_table.end()));
Item * last_but_one_dir = *(--(--request->dir_table.end()));
if( !request.HasWriteAccess(*last_but_one_dir) )
if( !system->HasWriteAccess(*last_but_one_dir) )
result = false;
}
@@ -122,26 +118,20 @@ bool result = true;
void dir_can_use_emacs(Info & i)
{
if( !request.dir_table.empty() )
i.res = request.CanUseEmacs(*request.dir_table.back(), true);
else
i.res = false;
i.res = functions->fun_emacs.HasAccess();
}
void dir_can_use_mkdir(Info & i)
{
if( !request.dir_table.empty() )
i.res = request.CanUseMkdir(*request.dir_table.back(), true);
else
i.res = false;
i.res = functions->fun_mkdir.HasAccess();
}
static std::vector<Item*> dir_childs_table;
static size_t dir_childs_index;
// request.id is never 0 and we can start dir_childs_reqid from 0
// request->id is never 0 and we can start dir_childs_reqid from 0
static size_t dir_childs_reqid = 0;
// is the first directory the parent ('..')
@@ -150,22 +140,22 @@ static bool dir_childs_has_parent;
void dir_childs_tab(Info & i)
{
if( dir_childs_reqid != request.id )
if( dir_childs_reqid != request->id )
{
dir_childs_reqid = request.id;
dir_childs_reqid = request->id;
dir_childs_table.clear();
dir_childs_has_parent = false;
if( !request.dir_table.empty() )
if( !request->dir_table.empty() )
{
if( request.dir_table.size() >= 2 && i.par == "with_parent")
if( request->dir_table.size() >= 2 && i.par == "with_parent")
{
Item * dir_up = request.dir_table[request.dir_table.size()-2];
Item * dir_up = request->dir_table[request->dir_table.size()-2];
dir_childs_table.push_back(dir_up);
dir_childs_has_parent = true;
}
data.dirs.GetDirChilds(request.dir_table.back()->id, dir_childs_table);
system->dirs.GetDirChilds(request->dir_table.back()->id, dir_childs_table);
}
}
@@ -201,7 +191,7 @@ void dir_childs_tab_user(Info & i)
if( dir_childs_index < dir_childs_table.size() )
{
long user_id = dir_childs_table[dir_childs_index]->user_id;
User * puser = data.users.GetUser(user_id);
User * puser = system->users.GetUser(user_id);
if( puser )
HtmlEscape(i.out, puser->name);
@@ -224,7 +214,7 @@ void dir_childs_tab_group(Info & i)
if( dir_childs_index < dir_childs_table.size() )
{
long group_id = dir_childs_table[dir_childs_index]->group_id;
Group * pgroup = data.groups.GetGroup(group_id);
Group * pgroup = system->groups.GetGroup(group_id);
if( pgroup )
HtmlEscape(i.out, pgroup->name);
@@ -244,24 +234,24 @@ static size_t dir_index;
void dir_tab(Info & i)
{
dir_index = i.iter;
i.res = dir_index < request.dir_table.size();
i.res = dir_index < request->dir_table.size();
}
void dir_tab_url(Info & i)
{
if( dir_index < request.dir_table.size() )
HtmlEscape(i.out, request.dir_table[dir_index]->url);
if( dir_index < request->dir_table.size() )
HtmlEscape(i.out, request->dir_table[dir_index]->url);
}
void dir_tab_link(Info & i)
{
i.out << data.base_url;
i.out << config->base_url;
for(size_t a = 0 ; a <= dir_index && a < request.dir_table.size() ; ++a)
for(size_t a = 0 ; a <= dir_index && a < request->dir_table.size() ; ++a)
{
HtmlEscape(i.out, request.dir_table[a]->url);
HtmlEscape(i.out, request->dir_table[a]->url);
i.out << '/';
}
}
@@ -274,23 +264,23 @@ static size_t dir_last_default_item_reqid = 0;
void dir_last_default_item_init()
{
if( dir_last_default_item_reqid == request.id )
if( dir_last_default_item_reqid == request->id )
return;
dir_last_default_item_reqid = request.id;
dir_last_default_item_reqid = request->id;
dir_last_default_item.Clear();
if( request.dir_table.empty() )
if( request->dir_table.empty() )
return;
long default_item = request.dir_table.back()->default_item;
long default_item = request->dir_table.back()->default_item;
if( default_item == -1 )
return;
std::vector<Item> item_table; // !! tymczasowo, nie bedzie tego po zmianie interfejsu dla Db
db.GetItem(item_table, default_item);
db->GetItem(item_table, default_item);
if( item_table.empty() )
return;
@@ -307,7 +297,7 @@ void dir_last_default_item_dir(Info & i)
std::string path;
if( dir_last_default_item.parent_id != -1 )
if( data.dirs.MakePath(dir_last_default_item.parent_id, path) )
if( system->dirs.MakePath(dir_last_default_item.parent_id, path) )
HtmlEscape(i.out, path);
}
@@ -322,7 +312,7 @@ void dir_last_default_item_url(Info & i)
void dir_last_subject(Info & i)
{
HtmlEscape(i.out, request.dir_table.back()->subject);
HtmlEscape(i.out, request->dir_table.back()->subject);
}
@@ -331,14 +321,14 @@ void dir_last_info(Info & i)
if( static_cast<size_t>(locale.GetLang()) >= patterns.size() )
return;
Ezc::Generator gen(i.out, patterns[locale.GetLang()][pat_dir_last_info], functions);
Ezc::Generator gen(i.out, patterns[locale.GetLang()][pat_dir_last_info], ezc_functions);
gen.Generate();
}
void dir_last_user(Info & i)
{
User * puser = data.users.GetUser(request.dir_table.back()->user_id);
User * puser = system->users.GetUser(request->dir_table.back()->user_id);
if( puser )
HtmlEscape(i.out, puser->name);
@@ -346,8 +336,8 @@ void dir_last_user(Info & i)
{
i.out << "~";
if( !request.dir_table.back()->guest_name.empty() )
HtmlEscape(i.out, request.dir_table.back()->guest_name);
if( !request->dir_table.back()->guest_name.empty() )
HtmlEscape(i.out, request->dir_table.back()->guest_name);
else
i.out << "guest"; // !! dodac do konfiga
}
@@ -356,19 +346,19 @@ void dir_last_user(Info & i)
void dir_last_url(Info & i)
{
HtmlEscape(i.out, request.dir_table.back()->url);
HtmlEscape(i.out, request->dir_table.back()->url);
}
void dir_last_url_is(Info & i)
{
i.res = request.dir_table.back()->url == i.par;
i.res = request->dir_table.back()->url == i.par;
}
void dir_last_date_creation(Info & i)
{
tm * ptm = &request.dir_table.back()->date_creation;
tm * ptm = &request->dir_table.back()->date_creation;
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
}
@@ -376,7 +366,7 @@ void dir_last_date_creation(Info & i)
void dir_last_date_modification(Info & i)
{
tm * ptm = &request.dir_table.back()->date_modification;
tm * ptm = &request->dir_table.back()->date_modification;
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
}
@@ -384,8 +374,8 @@ void dir_last_date_modification(Info & i)
void dir_last_dates_equal(Info & i)
{
tm * ptm1 = &request.dir_table.back()->date_creation;
tm * ptm2 = &request.dir_table.back()->date_modification;
tm * ptm1 = &request->dir_table.back()->date_creation;
tm * ptm2 = &request->dir_table.back()->date_modification;
i.res = ptm1->tm_year == ptm2->tm_year &&
ptm1->tm_mon == ptm2->tm_mon &&

25
templates/doc.cpp
View File

@@ -8,7 +8,6 @@
*/
#include "templates.h"
#include "../core/data.h"
#include "../core/request.h"
#include "../core/misc.h"
@@ -28,21 +27,21 @@ void doc_title(Info & i)
bool was_dir = false;
// from 1 means skipping the root directory
for(a = 1 ; a<request.dir_table.size() ; ++a)
for(a = 1 ; a<request->dir_table.size() ; ++a)
{
HtmlEscape(i.out, request.dir_table[a]->subject);
HtmlEscape(i.out, request->dir_table[a]->subject);
was_dir = true;
if( a < request.dir_table.size()-1 )
i.out << data.title_separator;
if( a < request->dir_table.size()-1 )
i.out << config->title_separator;
}
if( request.is_item )
if( request->is_item )
{
if( was_dir )
i.out << data.title_separator;
i.out << config->title_separator;
HtmlEscape(i.out, request.item.subject);
HtmlEscape(i.out, request->item.subject);
}
}
@@ -53,32 +52,32 @@ void doc_title(Info & i)
void doc_base_url(Info & i)
{
i.out << data.base_url;
i.out << config->base_url;
}
void doc_base_url_auth(Info & i)
{
i.out << data.base_url_auth;
i.out << config->base_url_auth;
}
void doc_base_url_static(Info & i)
{
i.out << data.base_url_static;
i.out << config->base_url_static;
}
void doc_base_url_common(Info & i)
{
i.out << data.base_url_common;
i.out << config->base_url_common;
}
void doc_current_url(Info & i)
{
i.out << request.env_request_uri;
i.out << request->env_request_uri;
}

10
templates/indexpatterns.cpp
View File

@@ -8,11 +8,15 @@
*/
#include "indexpatterns.h"
#include "../core/log.h"
#include "../core/data.h"
#include "core/log.h"
void IndexPatterns::SetConfig(Config * pconfig)
{
config = pconfig;
}
Ezc::Pattern * IndexPatterns::GetPattern(const std::string & file, Locale::Lang lang)
{
@@ -75,7 +79,7 @@ void IndexPatterns::ReadPattern(Tab::iterator & iter, Locale & locale, LocaleFil
for(i=0 ; i<len ; ++i)
{
templ.patterns[i].DeleteWhiteTextItems(delete_white);
templ.patterns[i].Directory(data.templates_dir, data.templates_dir_default);
templ.patterns[i].Directory(config->templates_dir, config->templates_dir_default);
templ.patterns[i].ParseFile(iter->first);
locale_filter.Filter(templ.patterns[i], locale, static_cast<Locale::Lang>(i));

6
templates/indexpatterns.h
View File

@@ -14,8 +14,9 @@
#include <vector>
#include <map>
#include "ezc.h"
#include "../core/locale.h"
#include "localefilter.h"
#include "core/locale.h"
#include "core/config.h"
@@ -23,6 +24,8 @@ class IndexPatterns
{
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);
@@ -38,6 +41,7 @@ public:
private:
Config * config;
struct Template
{

200
templates/item.cpp
View File

@@ -9,7 +9,6 @@
#include "templates.h"
#include "misc.h"
#include "../core/data.h"
#include "../core/request.h"
#include "../core/misc.h"
#include "../core/bbcodeparser.h"
@@ -45,41 +44,41 @@ void print_user_name(Info & i, const User * puser, const std::string & guest_nam
void item_is(Info & i)
{
i.res = request.is_item;
i.res = request->is_item;
}
void item_id(Info & i)
{
i.out << request.item.id;
i.out << request->item.id;
}
void item_subject(Info & i)
{
HtmlEscape(i.out, request.item.subject);
HtmlEscape(i.out, request->item.subject);
}
void item_subject_noescape(Info & i)
{
i.out << request.item.subject;
i.out << request->item.subject;
}
void item_content(Info & i)
{
HtmlEscape(i.out, request.item.content);
HtmlEscape(i.out, request->item.content);
}
void item_content_noescape(Info & i)
{
i.out << request.item.content;
i.out << request->item.content;
}
@@ -87,19 +86,19 @@ void item_content_type_is(Info & i)
{
i.res = false;
if( request.item.content_type == Item::ct_text && i.par == "text" )
if( request->item.content_type == Item::ct_text && i.par == "text" )
i.res = true;
if( request.item.content_type == Item::ct_formatted_text && i.par == "formatted text" )
if( request->item.content_type == Item::ct_formatted_text && i.par == "formatted text" )
i.res = true;
if( request.item.content_type == Item::ct_html && i.par == "html" )
if( request->item.content_type == Item::ct_html && i.par == "html" )
i.res = true;
if( request.item.content_type == Item::ct_bbcode && i.par == "bbcode" )
if( request->item.content_type == Item::ct_bbcode && i.par == "bbcode" )
i.res = true;
if( request.item.content_type == Item::ct_raw && i.par == "raw" )
if( request->item.content_type == Item::ct_raw && i.par == "raw" )
i.res = true;
}
@@ -136,19 +135,19 @@ void item_print_content(std::ostringstream & out, const std::string & content, I
void item_content_is_empty(Info & i)
{
i.res = request.item.content.empty();
i.res = request->item.content.empty();
}
void item_print_content(Info & i)
{
item_print_content(i.out, request.item.content, request.item.content_type);
item_print_content(i.out, request->item.content, request->item.content_type);
}
void item_privileges(Info & i)
{
i.out << std::setbase(8) << request.item.privileges << std::setbase(10);
i.out << std::setbase(8) << request->item.privileges << std::setbase(10);
}
@@ -160,22 +159,22 @@ void item_dir(Info & i)
void item_url(Info & i)
{
HtmlEscape(i.out, request.item.url);
HtmlEscape(i.out, request->item.url);
}
void item_url_is(Info & i)
{
if( !request.is_item )
if( !request->is_item )
return; // default false
i.res = (request.item.url == i.par);
i.res = (request->item.url == i.par);
}
void item_link(Info & i)
{
HtmlEscape(i.out, data.base_url);
HtmlEscape(i.out, config->base_url);
item_dir(i);
item_url(i);
}
@@ -185,31 +184,33 @@ void item_link(Info & i)
void item_auth_is_none(Info & i)
{
i.res = request.item.auth == Item::auth_none;
i.res = request->item.auth == Item::auth_none;
}
void item_auth_is_image(Info & i)
{
i.res = request.item.auth == Item::auth_image;
i.res = request->item.auth == Item::auth_image;
}
void item_can_read(Info & i)
{
i.res = request.HasReadAccess(request.item);
i.res = system->HasReadAccess(request->item);
}
void item_can_write(Info & i)
{
i.res = request.HasWriteAccess(request.item);
i.res = system->HasWriteAccess(request->item);
}
void item_can_remove(Info & i)
{
i.res = request.CanRemove(request.item);
// !! tutaj trzeba bedzie cos innego zrobic
// zwlaszcza jak dojdzie sticky bit
i.res = system->HasWriteAccess(*request->dir_table.back());
}
@@ -218,35 +219,35 @@ void item_info(Info & i)
if( static_cast<size_t>(locale.GetLang()) >= patterns.size() )
return;
Ezc::Generator gen(i.out, patterns[locale.GetLang()][pat_item_info], functions);
Ezc::Generator gen(i.out, patterns[locale.GetLang()][pat_item_info], ezc_functions);
gen.Generate();
}
void item_user(Info & i)
{
User * puser = data.users.GetUser(request.item.user_id);
print_user_name(i, puser, request.item.guest_name);
User * puser = system->users.GetUser(request->item.user_id);
print_user_name(i, puser, request->item.guest_name);
}
void item_modification_user(Info & i)
{
User * puser = data.users.GetUser(request.item.modification_user_id);
print_user_name(i, puser, request.item.guest_name);
User * puser = system->users.GetUser(request->item.modification_user_id);
print_user_name(i, puser, request->item.guest_name);
}
void item_users_different(Info & i)
{
i.res = (request.item.user_id != request.item.modification_user_id);
i.res = (request->item.user_id != request->item.modification_user_id);
}
void item_date_creation(Info & i)
{
tm * ptm = &request.item.date_creation;
tm * ptm = &request->item.date_creation;
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
}
@@ -254,7 +255,7 @@ void item_date_creation(Info & i)
void item_date_modification(Info & i)
{
tm * ptm = &request.item.date_modification;
tm * ptm = &request->item.date_modification;
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
}
@@ -262,22 +263,22 @@ void item_date_modification(Info & i)
void item_date_creation_nice(Info & i)
{
tm * ptm = &request.item.date_creation;
tm * ptm = &request->item.date_creation;
print_date_nice(i, ptm);
}
void item_date_modification_nice(Info & i)
{
tm * ptm = &request.item.date_modification;
tm * ptm = &request->item.date_modification;
print_date_nice(i, ptm);
}
void item_dates_equal(Info & i)
{
tm * ptm1 = &request.item.date_creation;
tm * ptm2 = &request.item.date_modification;
tm * ptm1 = &request->item.date_creation;
tm * ptm2 = &request->item.date_modification;
i.res = ptm1->tm_year == ptm2->tm_year &&
ptm1->tm_mon == ptm2->tm_mon &&
@@ -291,31 +292,31 @@ void item_dates_equal(Info & i)
void item_run(Info & i)
{
if( !request.is_item )
if( !request->is_item )
{
i.out << "<!-- there is no an item to run -->";
return;
}
if( !request.HasReadExecAccess(request.item) )
if( !system->HasReadExecAccess(request->item) )
{
i.out << "<!-- run: permission denied -->";
return;
}
Ezc::Pattern * p = pattern_cacher.GetPattern(request.item);
Ezc::Pattern * p = pattern_cacher.GetPattern(request->item);
std::ostringstream item_run_content;
Ezc::Generator gen(item_run_content, *p, functions);
Ezc::Generator 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);
}
void item_guest_name(Info & i)
{
HtmlEscape(i.out, request.item.guest_name);
HtmlEscape(i.out, request->item.guest_name);
}
@@ -330,51 +331,51 @@ static size_t item_index;
void item_tab(Info & i)
{
item_index = i.iter;
i.res = item_index < request.item_table.size();
i.res = item_index < request->item_table.size();
}
void item_tab_id(Info & i)
{
if( item_index < request.item_table.size() )
i.out << request.item_table[item_index].id;
if( item_index < request->item_table.size() )
i.out << request->item_table[item_index].id;
}
void item_tab_subject(Info & i)
{
if( item_index < request.item_table.size() )
HtmlEscape(i.out, request.item_table[item_index].subject);
if( item_index < request->item_table.size() )
HtmlEscape(i.out, request->item_table[item_index].subject);
}
void item_tab_subject_noescape(Info & i)
{
if( item_index < request.item_table.size() )
i.out << request.item_table[item_index].subject;
if( item_index < request->item_table.size() )
i.out << request->item_table[item_index].subject;
}
void item_tab_content(Info & i)
{
if( item_index < request.item_table.size() )
HtmlEscape(i.out, request.item_table[item_index].content);
if( item_index < request->item_table.size() )
HtmlEscape(i.out, request->item_table[item_index].content);
}
void item_tab_content_noescape(Info & i)
{
if( item_index < request.item_table.size() )
i.out << request.item_table[item_index].content;
if( item_index < request->item_table.size() )
i.out << request->item_table[item_index].content;
}
void item_tab_print_content(Info & i)
{
if( item_index >= request.item_table.size() )
if( item_index >= request->item_table.size() )
return;
std::string & content = request.item_table[item_index].content;
Item::ContentType type = request.item_table[item_index].content_type;
std::string & content = request->item_table[item_index].content;
Item::ContentType type = request->item_table[item_index].content_type;
item_print_content(i.out, content, type);
}
@@ -382,19 +383,19 @@ void item_tab_print_content(Info & i)
void item_tab_privileges(Info & i)
{
if( item_index < request.item_table.size() )
i.out << "0" << std::setbase(8) << request.item_table[item_index].privileges << std::setbase(10);
if( item_index < request->item_table.size() )
i.out << "0" << std::setbase(8) << request->item_table[item_index].privileges << std::setbase(10);
}
void item_tab_dir(Info & i)
{
if( item_index < request.item_table.size() )
if( item_index < request->item_table.size() )
{
std::string path;
if( data.dirs.MakePath(request.item_table[item_index].parent_id, path) )
if( system->dirs.MakePath(request->item_table[item_index].parent_id, path) )
HtmlEscape(i.out, path);
else
i.out << "/the path does not exist/";
@@ -404,16 +405,16 @@ void item_tab_dir(Info & i)
void item_tab_url(Info & i)
{
if( item_index < request.item_table.size() )
HtmlEscape(i.out, request.item_table[item_index].url);
if( item_index < request->item_table.size() )
HtmlEscape(i.out, request->item_table[item_index].url);
}
void item_tab_link(Info & i)
{
if( item_index < request.item_table.size() )
if( item_index < request->item_table.size() )
{
HtmlEscape(i.out, data.base_url);
HtmlEscape(i.out, config->base_url);
item_tab_dir(i);
item_tab_url(i);
}
@@ -422,9 +423,9 @@ void item_tab_link(Info & i)
void item_tab_link_auth(Info & i)
{
if( item_index < request.item_table.size() )
if( item_index < request->item_table.size() )
{
HtmlEscape(i.out, data.base_url_auth);
HtmlEscape(i.out, config->base_url_auth);
item_tab_dir(i);
item_tab_url(i);
}
@@ -433,9 +434,9 @@ void item_tab_link_auth(Info & i)
void item_tab_can_read(Info & i)
{
if( item_index < request.item_table.size() )
if( item_index < request->item_table.size() )
{
if( request.HasReadAccess(request.item_table[item_index]) )
if( system->HasReadAccess(request->item_table[item_index]) )
i.res = true;
}
}
@@ -443,9 +444,9 @@ void item_tab_can_read(Info & i)
void item_tab_can_write(Info & i)
{
if( item_index < request.item_table.size() )
if( item_index < request->item_table.size() )
{
if( request.HasWriteAccess(request.item_table[item_index]) )
if( system->HasWriteAccess(request->item_table[item_index]) )
i.res = true;
}
}
@@ -456,17 +457,17 @@ void item_tab_info(Info & i)
if( static_cast<size_t>(locale.GetLang()) >= patterns.size() )
return;
Ezc::Generator gen(i.out, patterns[locale.GetLang()][pat_item_tab_info], functions);
Ezc::Generator gen(i.out, patterns[locale.GetLang()][pat_item_tab_info], ezc_functions);
gen.Generate();
}
void item_tab_user(Info & i)
{
if( item_index < request.item_table.size() )
if( item_index < request->item_table.size() )
{
User * puser = data.users.GetUser(request.item_table[item_index].user_id);
print_user_name(i, puser, request.item_table[item_index].guest_name);
User * puser = system->users.GetUser(request->item_table[item_index].user_id);
print_user_name(i, puser, request->item_table[item_index].guest_name);
}
}
@@ -474,10 +475,10 @@ void item_tab_user(Info & i)
void item_tab_modification_user(Info & i)
{
if( item_index < request.item_table.size() )
if( item_index < request->item_table.size() )
{
User * puser = data.users.GetUser(request.item_table[item_index].modification_user_id);
print_user_name(i, puser, request.item_table[item_index].guest_name);
User * puser = system->users.GetUser(request->item_table[item_index].modification_user_id);
print_user_name(i, puser, request->item_table[item_index].guest_name);
}
}
@@ -485,9 +486,9 @@ void item_tab_modification_user(Info & i)
void item_tab_users_different(Info & i)
{
if( item_index < request.item_table.size() )
if( item_index < request->item_table.size() )
{
i.res = (request.item_table[item_index].user_id != request.item_table[item_index].modification_user_id);
i.res = (request->item_table[item_index].user_id != request->item_table[item_index].modification_user_id);
}
}
@@ -495,10 +496,10 @@ void item_tab_users_different(Info & i)
void item_tab_group(Info & i)
{
if( item_index < request.item_table.size() )
if( item_index < request->item_table.size() )
{
long group_id = request.item_table[item_index].group_id;
Group * pgroup = data.groups.GetGroup(group_id);
long group_id = request->item_table[item_index].group_id;
Group * pgroup = system->groups.GetGroup(group_id);
if( pgroup )
HtmlEscape(i.out, pgroup->name);
@@ -510,9 +511,9 @@ void item_tab_group(Info & i)
void item_tab_date_creation(Info & i)
{
if( item_index < request.item_table.size() )
if( item_index < request->item_table.size() )
{
tm * ptm = &request.item_table[item_index].date_creation;
tm * ptm = &request->item_table[item_index].date_creation;
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
}
@@ -521,9 +522,9 @@ void item_tab_date_creation(Info & i)
void item_tab_date_modification(Info & i)
{
if( item_index < request.item_table.size() )
if( item_index < request->item_table.size() )
{
tm * ptm = &request.item_table[item_index].date_modification;
tm * ptm = &request->item_table[item_index].date_modification;
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
}
@@ -532,9 +533,9 @@ void item_tab_date_modification(Info & i)
void item_tab_date_creation_nice(Info & i)
{
if( item_index < request.item_table.size() )
if( item_index < request->item_table.size() )
{
tm * ptm = &request.item_table[item_index].date_creation;
tm * ptm = &request->item_table[item_index].date_creation;
print_date_nice(i, ptm);
}
}
@@ -543,9 +544,9 @@ void item_tab_date_creation_nice(Info & i)
void item_tab_date_modification_nice(Info & i)
{
if( item_index < request.item_table.size() )
if( item_index < request->item_table.size() )
{
tm * ptm = &request.item_table[item_index].date_modification;
tm * ptm = &request->item_table[item_index].date_modification;
print_date_nice(i, ptm);
}
}
@@ -553,10 +554,10 @@ void item_tab_date_modification_nice(Info & i)
void item_tab_dates_equal(Info & i)
{
if( item_index < request.item_table.size() )
if( item_index < request->item_table.size() )
{
tm * ptm1 = &request.item_table[item_index].date_creation;
tm * ptm2 = &request.item_table[item_index].date_modification;
tm * ptm1 = &request->item_table[item_index].date_creation;
tm * ptm2 = &request->item_table[item_index].date_modification;
i.res = ptm1->tm_year == ptm2->tm_year &&
ptm1->tm_mon == ptm2->tm_mon &&
@@ -570,16 +571,16 @@ void item_tab_dates_equal(Info & i)
void item_tab_run(Info & i)
{
if( item_index < request.item_table.size() )
if( item_index < request->item_table.size() )
{
if( !request.HasReadExecAccess(request.item) )
if( !system->HasReadExecAccess(request->item) )
{
i.out << "<!-- run: permission denied -->";
return;
}
Ezc::Pattern * p = pattern_cacher.GetPattern(request.item_table[item_index]);
Ezc::Generator gen(i.out, *p, functions);
Ezc::Pattern * p = pattern_cacher.GetPattern(request->item_table[item_index]);
Ezc::Generator gen(i.out, *p, ezc_functions);
gen.Generate();
}
}
@@ -587,9 +588,10 @@ void item_tab_run(Info & i)
void item_tab_can_use_emacs(Info & i)
{
if( item_index < request.item_table.size() )
if( item_index < request->item_table.size() )
{
i.res = request.CanUseEmacs(request.item_table[item_index], true);
// !!
//i.res = request->CanUseEmacs(request->item_table[item_index], true);
}
}

13
templates/last.cpp
View File

@@ -9,7 +9,6 @@
#include "templates.h"
#include "../core/lastcontainer.h"
#include "../core/data.h"
#include "../core/request.h"
#include "../core/misc.h"
@@ -24,13 +23,13 @@ static LastContainer::Iterator last_iterator;
bool last_init()
{
if( last_reqid != request.id )
if( last_reqid != request->id )
{
last_reqid = request.id;
last_iterator = data.last.Begin();
last_reqid = request->id;
last_iterator = system->users.last.Begin();
}
return last_iterator != data.last.End();
return last_iterator != system->users.last.End();
}
@@ -39,10 +38,10 @@ void last_tab(Info & i)
{
last_init();
if( i.iter != 0 && last_iterator != data.last.End() )
if( i.iter != 0 && last_iterator != system->users.last.End() )
++last_iterator;
i.res = last_iterator != data.last.End();
i.res = last_iterator != system->users.last.End();
}

4
templates/ls.cpp
View File

@@ -24,9 +24,9 @@ static int ls_ckeditor_funnum = 0;
void ls_ckeditor_funnum_browse(Info & i)
{
if( ls_ckeditor_reqid != request.id )
if( ls_ckeditor_reqid != request->id )
{
ls_ckeditor_reqid = request.id;
ls_ckeditor_reqid = request->id;
ls_ckeditor_funnum = ParseCKeditorFun();
}

11
templates/misc.cpp
View File

@@ -8,7 +8,6 @@
*/
#include "../core/data.h"
#include "../core/misc.h"
#include "../core/request.h"
#include "templates.h"
@@ -40,13 +39,13 @@ int ParseCKeditorFun()
{
ckeditor_getparser.fun_num = 2; // default if there is a problem with parsing info
if( !request.get_table.empty() )
if( !request->get_table.empty() )
{
size_t last = request.get_table.size()-1;
size_t last = request->get_table.size()-1;
if( !request.get_table[last].empty() )
if( !request->get_table[last].empty() )
{
const char * str = request.get_table[last].c_str() + 1; // the first char is '?'
const char * str = request->get_table[last].c_str() + 1; // the first char is '?'
ckeditor_getparser.Parse(str);
}
}
@@ -70,7 +69,7 @@ void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & local
if( pat < patterns[i].size() )
{
patterns[i][pat].DeleteWhiteTextItems(delete_white);
patterns[i][pat].Directory(data.templates_dir, data.templates_dir_default);
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));

12
templates/mount.cpp
View File

@@ -8,7 +8,7 @@
*/
#include "templates.h"
#include "../core/data.h"
@@ -20,31 +20,31 @@ namespace TemplatesFunctions
void mount_page_is(Info & i)
{
i.res = data.mounts.pmount->IsArg(Mount::par_page, i.par);
i.res = system->mounts.pmount->IsArg(Mount::par_page, i.par);
}
void mount_thread_is(Info & i)
{
i.res = data.mounts.pmount->IsArg(Mount::par_thread, i.par);
i.res = system->mounts.pmount->IsArg(Mount::par_thread, i.par);
}
void mount_type_is_thread(Info & i)
{
i.res = data.mounts.pmount->type == Mount::thread;
i.res = system->mounts.pmount->type == Mount::thread;
}
void mount_type_is_ticket(Info & i)
{
i.res = data.mounts.pmount->type == Mount::ticket;
i.res = system->mounts.pmount->type == Mount::ticket;
}
void mount_type_is_cms(Info & i)
{
i.res = data.mounts.pmount->type == Mount::cms;
i.res = system->mounts.pmount->type == Mount::cms;
}

1
templates/patterncacher.cpp
View File

@@ -8,7 +8,6 @@
*/
#include "patterncacher.h"
#include "../core/data.h"
#include "../core/log.h"

81
templates/priv.cpp
View File

@@ -8,10 +8,9 @@
*/
#include "templates.h"
#include "../core/data.h"
#include "../core/request.h"
#include "../core/misc.h"
#include "core/request.h"
#include "core/misc.h"
#include "functions/functions.h"
@@ -27,20 +26,20 @@ static size_t priv_user_reqid = 0;
void priv_user_tab_init(Item & item)
{
priv_user_reqid = request.id;
priv_user_reqid = request->id;
priv_user_table.clear();
if( !request.session->puser )
if( !request->session->puser )
{
// not logged
priv_user_table.push_back(item.user_id);
}
else
if( request.session->puser->super_user )
if( request->session->puser->super_user )
{
// super user is allowed to change to any user
for(size_t i=0 ; i<data.users.Size() ; ++i)
priv_user_table.push_back( data.users[i].id );
for(size_t i=0 ; i<system->users.Size() ; ++i)
priv_user_table.push_back( system->users[i].id );
// as well to nobody (-1)
priv_user_table.push_back(-1);
@@ -55,16 +54,16 @@ void priv_user_tab_init(Item & item)
void priv_user_tab_init()
{
if( request.is_item )
priv_user_tab_init(request.item);
if( request->is_item )
priv_user_tab_init(request->item);
else
priv_user_tab_init(*request.dir_table.back());
priv_user_tab_init(*request->dir_table.back());
}
void priv_user_tab(Info & i)
{
if( priv_user_reqid != request.id )
if( priv_user_reqid != request->id )
priv_user_tab_init();
priv_user_index = i.iter;
@@ -82,7 +81,7 @@ void priv_user_tab_name(Info & i)
if( uid != -1 )
{
User * puser = data.users.GetUser( uid );
User * puser = system->users.GetUser( uid );
if( puser )
HtmlEscape(i.out, puser->name);
@@ -91,7 +90,7 @@ void priv_user_tab_name(Info & i)
}
else
{
HtmlEscape(i.out, data.priv_no_user);
HtmlEscape(i.out, config->priv_no_user);
}
}
}
@@ -104,14 +103,14 @@ void priv_user_tab_isdefault(Info & i)
{
long uid = priv_user_table[priv_user_index];
if( request.is_item )
if( request->is_item )
{
if( uid == request.item.user_id )
if( uid == request->item.user_id )
i.res = true;
}
else
{
if( uid == request.dir_table.back()->user_id )
if( uid == request->dir_table.back()->user_id )
i.res = true;
}
}
@@ -132,34 +131,34 @@ static size_t priv_group_reqid = 0;
void priv_group_tab_init(Item & item)
{
priv_group_reqid = request.id;
priv_group_reqid = request->id;
priv_group_table.clear();
if( !request.session->puser )
if( !request->session->puser )
{
// not logged
priv_group_table.push_back(item.group_id);
}
else
if( request.session->puser->super_user )
if( request->session->puser->super_user )
{
// super user is allowed to change to any group
for(size_t i=0 ; i<data.groups.Size() ; ++i)
priv_group_table.push_back( data.groups[i].id );
for(size_t i=0 ; i<system->groups.Size() ; ++i)
priv_group_table.push_back( system->groups[i].id );
// as well to nogroup (-1)
priv_group_table.push_back(-1);
}
else
if( request.session->puser->id == item.user_id )
if( request->session->puser->id == item.user_id )
{
bool was_current_group = false;
// owner of the item -- is allowed to change only to a group in which he belongs to
for(size_t i=0 ; i<request.session->puser->groups.size() ; ++i)
for(size_t i=0 ; i<request->session->puser->groups.size() ; ++i)
{
priv_group_table.push_back( request.session->puser->groups[i] );
priv_group_table.push_back( request->session->puser->groups[i] );
if( item.group_id == request.session->puser->groups[i] )
if( item.group_id == request->session->puser->groups[i] )
was_current_group = true;
}
@@ -180,16 +179,16 @@ void priv_group_tab_init(Item & item)
void priv_group_tab_init()
{
if( request.is_item )
priv_group_tab_init(request.item);
if( request->is_item )
priv_group_tab_init(request->item);
else
priv_group_tab_init(*request.dir_table.back());
priv_group_tab_init(*request->dir_table.back());
}
void priv_group_tab(Info & i)
{
if( priv_group_reqid != request.id )
if( priv_group_reqid != request->id )
priv_group_tab_init();
priv_group_index = i.iter;
@@ -207,7 +206,7 @@ void priv_group_tab_name(Info & i)
if( gid != -1 )
{
Group * pgroup = data.groups.GetGroup( gid );
Group * pgroup = system->groups.GetGroup( gid );
if( pgroup )
HtmlEscape(i.out, pgroup->name);
@@ -216,7 +215,7 @@ void priv_group_tab_name(Info & i)
}
else
{
HtmlEscape(i.out, data.priv_no_group);
HtmlEscape(i.out, config->priv_no_group);
}
}
}
@@ -229,14 +228,14 @@ void priv_group_tab_isdefault(Info & i)
{
long gid = priv_group_table[priv_group_index];
if( request.is_item )
if( request->is_item )
{
if( gid == request.item.group_id )
if( gid == request->item.group_id )
i.res = true;
}
else
{
if( gid == request.dir_table.back()->group_id )
if( gid == request->dir_table.back()->group_id )
i.res = true;
}
}
@@ -245,10 +244,10 @@ 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);
if( request->is_item )
i.out << std::setbase(8) << request->item.privileges << std::setbase(10);
else
i.out << std::setbase(8) << request.dir_table.back()->privileges << std::setbase(10);
i.out << std::setbase(8) << request->dir_table.back()->privileges << std::setbase(10);
}
@@ -268,13 +267,13 @@ void priv_privileges_for_dirs(Info & i)
void priv_show_form_chown(Info & i)
{
i.res = (request.pfunction->code == FUN_PRIV || request.pfunction->code == FUN_CHOWN);
i.res = (request->pfunction->fun.url == "priv" || request->pfunction->fun.url == "chown");
}
void priv_show_form_chmod(Info & i)
{
i.res = (request.pfunction->code == FUN_PRIV || request.pfunction->code == FUN_CHMOD);
i.res = (request->pfunction->fun.url == "priv" || request->pfunction->fun.url == "chmod");
}

13
templates/rebus.cpp
View File

@@ -9,7 +9,6 @@
#include "../core/request.h"
#include "../core/data.h"
#include "templates.h"
@@ -24,11 +23,11 @@ static size_t rebus_reqid = 0;
void rebus_init()
{
if( rebus_reqid != request.id )
if( rebus_reqid != request->id )
{
request.session->rebus_item = data.rebus.Rand();
request.session->rebus_checked = false;
rebus_reqid = request.id;
request->session->rebus_item = system->rebus.Rand();
request->session->rebus_checked = false;
rebus_reqid = request->id;
}
}
@@ -37,8 +36,8 @@ void rebus_question(Info & i)
{
rebus_init();
if( request.session->rebus_item )
i.out << request.session->rebus_item->question;
if( request->session->rebus_item )
i.out << request->session->rebus_item->question;
}

1
templates/sys.cpp
View File

@@ -8,7 +8,6 @@
*/
#include "templates.h"
#include "../core/data.h"
#include "../core/request.h"
#include "../core/version.h"

554
templates/templates.cpp
View File

@@ -8,12 +8,10 @@
*/
#include "templates.h"
#include "../core/data.h"
#include "../core/request.h"
#include "../core/misc.h"
#include "../core/plugin.h"
#include "core/misc.h"
#include "core/plugin.h"
#include "localefilter.h"
#include "functions/functions.h"
@@ -22,7 +20,7 @@ namespace TemplatesFunctions
IndexPatterns index_patterns;
Patterns patterns;
Ezc::Functions functions;
Ezc::Functions ezc_functions;
PatternCacher pattern_cacher;
Locale locale;
LocaleFilter locale_filter;
@@ -32,7 +30,12 @@ CKEditorGetParser ckeditor_getparser;
std::vector<std::string> empty_pars;
const std::string empty_string;
Config * config;
Request * request;
Db * db;
System * system;
Functions * functions;
SessionManager * session_manager;
@@ -40,48 +43,48 @@ Ezc::Pattern * content_for_function()
{
Ezc::Pattern * p = 0;
if( !request.pfunction )
if( !request->pfunction )
{
log << log1 << "Templates: no function" << logend;
return p;
}
static PatName pat_name_tab[] = {
{FUN_CAT, pat_fun_cat},
{FUN_LS, pat_fun_ls},
{FUN_RM, pat_fun_rm},
{FUN_EMACS, pat_fun_emacs},
{FUN_MKDIR, pat_fun_mkdir},
{FUN_DEFAULT, pat_fun_default},
{FUN_PRIV, pat_fun_priv},
{FUN_CHMOD, pat_fun_priv},
{FUN_CHOWN, pat_fun_priv},
{FUN_RUN, pat_fun_run},
{FUN_WHO, pat_fun_who},
{FUN_LAST, pat_fun_last},
{FUN_THREAD, pat_fun_thread},
{FUN_RELOAD, pat_fun_reload},
{FUN_CREATETHREAD, pat_fun_createthread},
{FUN_TICKET, pat_fun_ticket},
{FUN_CREATETICKET, pat_fun_createticket},
{FUN_EDITTICKET, pat_fun_createticket},
{FUN_UPLOAD, pat_fun_upload},
{FUN_UPTIME, pat_fun_uptime},
{FUN_LOGIN, pat_fun_login},
{FUN_MV, pat_fun_mv},
{FUN_UNAME, pat_fun_uname},
{FUN_CKEDITOR, pat_fun_ckeditor},
{FUN_SUBJECT, pat_fun_subject},
{FUN_ADDUSER, pat_fun_adduser},
{FUN_CP, pat_fun_cp},
{FUN_TINYMCE, pat_fun_tinymce},
{"cat", pat_fun_cat},
{"ls", pat_fun_ls},
{"rm", pat_fun_rm},
{"emacs", pat_fun_emacs},
{"mkdir", pat_fun_mkdir},
{"default", pat_fun_default},
{"priv", pat_fun_priv},
{"chmod", pat_fun_priv},
{"chown", pat_fun_priv},
{"run", pat_fun_run},
{"who", pat_fun_who},
{"last", pat_fun_last},
{"thread", pat_fun_thread},
{"reload", pat_fun_reload},
{"createthread",pat_fun_createthread},
{"ticket", pat_fun_ticket},
{"createticket",pat_fun_createticket},
{"editticket", pat_fun_createticket},
{"upload", pat_fun_upload},
{"uptime", pat_fun_uptime},
{"login", pat_fun_login},
{"mv", pat_fun_mv},
{"uname", pat_fun_uname},
{"ckeditor", pat_fun_ckeditor},
{"subject", pat_fun_subject},
{"adduser", pat_fun_adduser},
{"cp", pat_fun_cp},
{"tinymce", pat_fun_tinymce},
};
size_t i, len = sizeof(pat_name_tab)/sizeof(PatName);
for(i=0 ; i<len ; ++i)
{
if( pat_name_tab[i].fun_code == request.pfunction->code )
if( strcmp(pat_name_tab[i].fun_name, request->pfunction->fun.url.c_str()) == 0 )
{
// !! locale.GetLang() bedzie brane indywidualnie dla kazdego uzytkownika
p = &patterns[locale.GetLang()][pat_name_tab[i].pat];
@@ -105,7 +108,7 @@ Ezc::Pattern * p = 0;
}
switch( request.status )
switch( request->status )
{
//case WINIX_ERR_NO_ITEM: !! we need something like 'error::item_required'
//p = &pat_err_item_required;
@@ -142,7 +145,7 @@ Ezc::Pattern * p = 0;
if( p )
{
Ezc::Generator gen(i.out, *p, functions);
Ezc::Generator gen(i.out, *p, ezc_functions);
gen.Generate();
}
else
@@ -164,322 +167,322 @@ void Templates::CreateFunctions()
{
using namespace TemplatesFunctions;
functions.Clear();
ezc_functions.Clear();
/*
sys
*/
functions.Insert("sys_ver_major", sys_ver_major);
functions.Insert("sys_ver_minor", sys_ver_minor);
functions.Insert("sys_ver_revision", sys_ver_revision);
ezc_functions.Insert("sys_ver_major", sys_ver_major);
ezc_functions.Insert("sys_ver_minor", sys_ver_minor);
ezc_functions.Insert("sys_ver_revision", sys_ver_revision);
/*
adduser
*/
functions.Insert("adduser_last_login", adduser_last_login);
functions.Insert("adduser_last_email", adduser_last_email);
ezc_functions.Insert("adduser_last_login", adduser_last_login);
ezc_functions.Insert("adduser_last_email", adduser_last_email);
/*
doc
*/
functions.Insert("doc_title", doc_title);
functions.Insert("doc_base_url", doc_base_url);
functions.Insert("doc_base_url_auth", doc_base_url_auth);
functions.Insert("doc_base_url_static", doc_base_url_static);
functions.Insert("doc_base_url_common", doc_base_url_common);
functions.Insert("doc_current_url", doc_current_url);
ezc_functions.Insert("doc_title", doc_title);
ezc_functions.Insert("doc_base_url", doc_base_url);
ezc_functions.Insert("doc_base_url_auth", doc_base_url_auth);
ezc_functions.Insert("doc_base_url_static", doc_base_url_static);
ezc_functions.Insert("doc_base_url_common", doc_base_url_common);
ezc_functions.Insert("doc_current_url", doc_current_url);
/*
item
*/
functions.Insert("item_is", item_is);
functions.Insert("item_id", item_id);
functions.Insert("item_subject", item_subject);
functions.Insert("item_subject_noescape", item_subject_noescape);
functions.Insert("item_content_is_empty", item_content_is_empty);
functions.Insert("item_content", item_content);
functions.Insert("item_content_noescape", item_content_noescape);
functions.Insert("item_content_type_is", item_content_type_is);
functions.Insert("item_print_content", item_print_content);
functions.Insert("item_privileges", item_privileges);
functions.Insert("item_dir", item_dir);
functions.Insert("item_url", item_url);
functions.Insert("item_url_is", item_url_is);
functions.Insert("item_link", item_link);
functions.Insert("item_auth_is_none", item_auth_is_none);
functions.Insert("item_auth_is_image", item_auth_is_image);
ezc_functions.Insert("item_is", item_is);
ezc_functions.Insert("item_id", item_id);
ezc_functions.Insert("item_subject", item_subject);
ezc_functions.Insert("item_subject_noescape", item_subject_noescape);
ezc_functions.Insert("item_content_is_empty", item_content_is_empty);
ezc_functions.Insert("item_content", item_content);
ezc_functions.Insert("item_content_noescape", item_content_noescape);
ezc_functions.Insert("item_content_type_is", item_content_type_is);
ezc_functions.Insert("item_print_content", item_print_content);
ezc_functions.Insert("item_privileges", item_privileges);
ezc_functions.Insert("item_dir", item_dir);
ezc_functions.Insert("item_url", item_url);
ezc_functions.Insert("item_url_is", item_url_is);
ezc_functions.Insert("item_link", item_link);
ezc_functions.Insert("item_auth_is_none", item_auth_is_none);
ezc_functions.Insert("item_auth_is_image", item_auth_is_image);
functions.Insert("item_can_read", item_can_read);
functions.Insert("item_can_write", item_can_write);
functions.Insert("item_can_remove", item_can_remove);
functions.Insert("item_info", item_info);
functions.Insert("item_user", item_user);
functions.Insert("item_modification_user", item_modification_user);
functions.Insert("item_users_different", item_users_different);
functions.Insert("item_date_creation", item_date_creation);
functions.Insert("item_date_modification", item_date_modification);
functions.Insert("item_date_creation_nice", item_date_creation_nice);
functions.Insert("item_date_modification_nice",item_date_modification_nice);
functions.Insert("item_dates_equal", item_dates_equal);
functions.Insert("item_run", item_run);
functions.Insert("item_guest_name", item_guest_name);
ezc_functions.Insert("item_can_read", item_can_read);
ezc_functions.Insert("item_can_write", item_can_write);
ezc_functions.Insert("item_can_remove", item_can_remove);
ezc_functions.Insert("item_info", item_info);
ezc_functions.Insert("item_user", item_user);
ezc_functions.Insert("item_modification_user", item_modification_user);
ezc_functions.Insert("item_users_different", item_users_different);
ezc_functions.Insert("item_date_creation", item_date_creation);
ezc_functions.Insert("item_date_modification", item_date_modification);
ezc_functions.Insert("item_date_creation_nice", item_date_creation_nice);
ezc_functions.Insert("item_date_modification_nice",item_date_modification_nice);
ezc_functions.Insert("item_dates_equal", item_dates_equal);
ezc_functions.Insert("item_run", item_run);
ezc_functions.Insert("item_guest_name", item_guest_name);
functions.Insert("item_tab", item_tab);
functions.Insert("item_tab_id", item_tab_id);
functions.Insert("item_tab_subject", item_tab_subject);
functions.Insert("item_tab_subject_noescape", item_tab_subject_noescape);
functions.Insert("item_tab_content", item_tab_content);
functions.Insert("item_tab_content_noescape", item_tab_content_noescape);
functions.Insert("item_tab_print_content", item_tab_print_content);
functions.Insert("item_tab_privileges", item_tab_privileges);
functions.Insert("item_tab_dir", item_tab_dir);
functions.Insert("item_tab_url", item_tab_url);
functions.Insert("item_tab_link", item_tab_link);
functions.Insert("item_tab_link_auth", item_tab_link_auth);
functions.Insert("item_tab_can_read", item_tab_can_read);
functions.Insert("item_tab_can_write", item_tab_can_write);
functions.Insert("item_tab_info", item_tab_info);
functions.Insert("item_tab_user", item_tab_user);
functions.Insert("item_tab_modification_user", item_tab_modification_user);
functions.Insert("item_tab_users_different", item_tab_users_different);
functions.Insert("item_tab_group", item_tab_group);
functions.Insert("item_tab_date_creation", item_tab_date_creation);
functions.Insert("item_tab_date_modification", item_tab_date_modification);
functions.Insert("item_tab_date_creation_nice", item_tab_date_creation_nice);
functions.Insert("item_tab_date_modification_nice", item_tab_date_modification_nice);
functions.Insert("item_tab_dates_equal", item_tab_dates_equal);
functions.Insert("item_tab_run", item_tab_run);
functions.Insert("item_tab_can_use_emacs", item_tab_can_use_emacs);
ezc_functions.Insert("item_tab", item_tab);
ezc_functions.Insert("item_tab_id", item_tab_id);
ezc_functions.Insert("item_tab_subject", item_tab_subject);
ezc_functions.Insert("item_tab_subject_noescape", item_tab_subject_noescape);
ezc_functions.Insert("item_tab_content", item_tab_content);
ezc_functions.Insert("item_tab_content_noescape", item_tab_content_noescape);
ezc_functions.Insert("item_tab_print_content", item_tab_print_content);
ezc_functions.Insert("item_tab_privileges", item_tab_privileges);
ezc_functions.Insert("item_tab_dir", item_tab_dir);
ezc_functions.Insert("item_tab_url", item_tab_url);
ezc_functions.Insert("item_tab_link", item_tab_link);
ezc_functions.Insert("item_tab_link_auth", item_tab_link_auth);
ezc_functions.Insert("item_tab_can_read", item_tab_can_read);
ezc_functions.Insert("item_tab_can_write", item_tab_can_write);
ezc_functions.Insert("item_tab_info", item_tab_info);
ezc_functions.Insert("item_tab_user", item_tab_user);
ezc_functions.Insert("item_tab_modification_user", item_tab_modification_user);
ezc_functions.Insert("item_tab_users_different", item_tab_users_different);
ezc_functions.Insert("item_tab_group", item_tab_group);
ezc_functions.Insert("item_tab_date_creation", item_tab_date_creation);
ezc_functions.Insert("item_tab_date_modification", item_tab_date_modification);
ezc_functions.Insert("item_tab_date_creation_nice", item_tab_date_creation_nice);
ezc_functions.Insert("item_tab_date_modification_nice", item_tab_date_modification_nice);
ezc_functions.Insert("item_tab_dates_equal", item_tab_dates_equal);
ezc_functions.Insert("item_tab_run", item_tab_run);
ezc_functions.Insert("item_tab_can_use_emacs", item_tab_can_use_emacs);
/*
dir
*/
functions.Insert("dir", dir);
functions.Insert("dir_without_slash", dir_without_slash);
functions.Insert("dir_parent", dir_parent);
functions.Insert("dir_parent_without_slash", dir_parent_without_slash);
functions.Insert("dir_can_read_exec", dir_can_read_exec);
functions.Insert("dir_can_write", dir_can_write);
functions.Insert("dir_can_remove", dir_can_remove);
functions.Insert("dir_can_use_emacs", dir_can_use_emacs);
functions.Insert("dir_can_use_mkdir", dir_can_use_mkdir);
ezc_functions.Insert("dir", dir);
ezc_functions.Insert("dir_without_slash", dir_without_slash);
ezc_functions.Insert("dir_parent", dir_parent);
ezc_functions.Insert("dir_parent_without_slash", dir_parent_without_slash);
ezc_functions.Insert("dir_can_read_exec", dir_can_read_exec);
ezc_functions.Insert("dir_can_write", dir_can_write);
ezc_functions.Insert("dir_can_remove", dir_can_remove);
ezc_functions.Insert("dir_can_use_emacs", dir_can_use_emacs);
ezc_functions.Insert("dir_can_use_mkdir", dir_can_use_mkdir);
functions.Insert("dir_childs_tab", dir_childs_tab);
functions.Insert("dir_childs_is_parent", dir_childs_is_parent);
functions.Insert("dir_childs_tab_url", dir_childs_tab_url);
functions.Insert("dir_childs_tab_privileges", dir_childs_tab_privileges);
functions.Insert("dir_childs_tab_user", dir_childs_tab_user);
functions.Insert("dir_childs_tab_group", dir_childs_tab_group);
ezc_functions.Insert("dir_childs_tab", dir_childs_tab);
ezc_functions.Insert("dir_childs_is_parent", dir_childs_is_parent);
ezc_functions.Insert("dir_childs_tab_url", dir_childs_tab_url);
ezc_functions.Insert("dir_childs_tab_privileges", dir_childs_tab_privileges);
ezc_functions.Insert("dir_childs_tab_user", dir_childs_tab_user);
ezc_functions.Insert("dir_childs_tab_group", dir_childs_tab_group);
functions.Insert("dir_tab", dir_tab);
functions.Insert("dir_tab_url", dir_tab_url);
functions.Insert("dir_tab_link", dir_tab_link);
ezc_functions.Insert("dir_tab", dir_tab);
ezc_functions.Insert("dir_tab_url", dir_tab_url);
ezc_functions.Insert("dir_tab_link", dir_tab_link);
functions.Insert("dir_last_default_item_dir", dir_last_default_item_dir);
functions.Insert("dir_last_default_item_url", dir_last_default_item_url);
functions.Insert("dir_last_subject", dir_last_subject);
functions.Insert("dir_last_info", dir_last_info);
functions.Insert("dir_last_user", dir_last_user);
functions.Insert("dir_last_url", dir_last_url);
functions.Insert("dir_last_url_is", dir_last_url_is);
functions.Insert("dir_last_date_creation", dir_last_date_creation);
functions.Insert("dir_last_date_modification", dir_last_date_modification);
functions.Insert("dir_last_dates_equal", dir_last_dates_equal);
ezc_functions.Insert("dir_last_default_item_dir", dir_last_default_item_dir);
ezc_functions.Insert("dir_last_default_item_url", dir_last_default_item_url);
ezc_functions.Insert("dir_last_subject", dir_last_subject);
ezc_functions.Insert("dir_last_info", dir_last_info);
ezc_functions.Insert("dir_last_user", dir_last_user);
ezc_functions.Insert("dir_last_url", dir_last_url);
ezc_functions.Insert("dir_last_url_is", dir_last_url_is);
ezc_functions.Insert("dir_last_date_creation", dir_last_date_creation);
ezc_functions.Insert("dir_last_date_modification", dir_last_date_modification);
ezc_functions.Insert("dir_last_dates_equal", dir_last_dates_equal);
/*
user
*/
functions.Insert("ls_ckeditor_funnum_browse", ls_ckeditor_funnum_browse);
ezc_functions.Insert("ls_ckeditor_funnum_browse", ls_ckeditor_funnum_browse);
/*
user
*/
functions.Insert("user_name", user_name);
functions.Insert("user_logged", user_logged);
functions.Insert("user_super_user", user_super_user);
functions.Insert("user_can_use_html", user_can_use_html);
functions.Insert("user_can_use_bbcode", user_can_use_bbcode);
functions.Insert("user_can_use_raw", user_can_use_raw);
ezc_functions.Insert("user_name", user_name);
ezc_functions.Insert("user_logged", user_logged);
ezc_functions.Insert("user_super_user", user_super_user);
ezc_functions.Insert("user_can_use_html", user_can_use_html);
ezc_functions.Insert("user_can_use_bbcode", user_can_use_bbcode);
ezc_functions.Insert("user_can_use_raw", user_can_use_raw);
/*
privileges
*/
functions.Insert("priv_user_tab", priv_user_tab);
functions.Insert("priv_user_tab_name", priv_user_tab_name);
functions.Insert("priv_user_tab_isdefault", priv_user_tab_isdefault);
ezc_functions.Insert("priv_user_tab", priv_user_tab);
ezc_functions.Insert("priv_user_tab_name", priv_user_tab_name);
ezc_functions.Insert("priv_user_tab_isdefault", priv_user_tab_isdefault);
functions.Insert("priv_group_tab", priv_group_tab);
functions.Insert("priv_group_tab_name", priv_group_tab_name);
functions.Insert("priv_group_tab_isdefault", priv_group_tab_isdefault);
ezc_functions.Insert("priv_group_tab", priv_group_tab);
ezc_functions.Insert("priv_group_tab_name", priv_group_tab_name);
ezc_functions.Insert("priv_group_tab_isdefault", priv_group_tab_isdefault);
functions.Insert("priv_privileges", priv_privileges);
functions.Insert("priv_privileges_for_files", priv_privileges_for_files);
functions.Insert("priv_privileges_for_dirs", priv_privileges_for_dirs);
functions.Insert("priv_show_form_chown", priv_show_form_chown);
functions.Insert("priv_show_form_chmod", priv_show_form_chmod);
ezc_functions.Insert("priv_privileges", priv_privileges);
ezc_functions.Insert("priv_privileges_for_files", priv_privileges_for_files);
ezc_functions.Insert("priv_privileges_for_dirs", priv_privileges_for_dirs);
ezc_functions.Insert("priv_show_form_chown", priv_show_form_chown);
ezc_functions.Insert("priv_show_form_chmod", priv_show_form_chmod);
/*
others
*/
functions.Insert("content", content);
ezc_functions.Insert("content", content);
/*
who
*/
functions.Insert("who_tab", who_tab);
functions.Insert("who_tab_lp", who_tab_lp);
functions.Insert("who_tab_user", who_tab_user);
functions.Insert("who_tab_time", who_tab_time);
functions.Insert("who_tab_last_time", who_tab_last_time);
ezc_functions.Insert("who_tab", who_tab);
ezc_functions.Insert("who_tab_lp", who_tab_lp);
ezc_functions.Insert("who_tab_user", who_tab_user);
ezc_functions.Insert("who_tab_time", who_tab_time);
ezc_functions.Insert("who_tab_last_time", who_tab_last_time);
/*
last
*/
functions.Insert("last_tab", last_tab);
functions.Insert("last_tab_name", last_tab_name);
functions.Insert("last_tab_ip", last_tab_ip);
functions.Insert("last_tab_start", last_tab_start);
functions.Insert("last_tab_end", last_tab_end);
ezc_functions.Insert("last_tab", last_tab);
ezc_functions.Insert("last_tab_name", last_tab_name);
ezc_functions.Insert("last_tab_ip", last_tab_ip);
ezc_functions.Insert("last_tab_start", last_tab_start);
ezc_functions.Insert("last_tab_end", last_tab_end);
/*
thread
*/
functions.Insert("thread_is", thread_is);
functions.Insert("thread_tab", thread_tab);
functions.Insert("thread_tab_url", thread_tab_url);
functions.Insert("thread_tab_subject", thread_tab_subject);
functions.Insert("thread_tab_author", thread_tab_author);
functions.Insert("thread_tab_answers", thread_tab_answers);
functions.Insert("thread_tab_last_item_date_modification", thread_tab_last_item_date_modification);
functions.Insert("thread_tab_last_item_date_modification_nice", thread_tab_last_item_date_modification_nice);
functions.Insert("thread_tab_last_item_user", thread_tab_last_item_user);
functions.Insert("thread_can_create", thread_can_create);
ezc_functions.Insert("thread_is", thread_is);
ezc_functions.Insert("thread_tab", thread_tab);
ezc_functions.Insert("thread_tab_url", thread_tab_url);
ezc_functions.Insert("thread_tab_subject", thread_tab_subject);
ezc_functions.Insert("thread_tab_author", thread_tab_author);
ezc_functions.Insert("thread_tab_answers", thread_tab_answers);
ezc_functions.Insert("thread_tab_last_item_date_modification", thread_tab_last_item_date_modification);
ezc_functions.Insert("thread_tab_last_item_date_modification_nice", thread_tab_last_item_date_modification_nice);
ezc_functions.Insert("thread_tab_last_item_user", thread_tab_last_item_user);
ezc_functions.Insert("thread_can_create", thread_can_create);
/*
ticket
*/
functions.Insert("ticket_is", ticket_is);
functions.Insert("ticket_can_create", ticket_can_create);
functions.Insert("ticket_can_edit", ticket_can_edit);
functions.Insert("ticket_type", ticket_type);
functions.Insert("ticket_status", ticket_status);
functions.Insert("ticket_priority", ticket_priority);
functions.Insert("ticket_category", ticket_category);
functions.Insert("ticket_expected", ticket_expected);
functions.Insert("ticket_progress", ticket_progress);
functions.Insert("ticket_progress_image_number", ticket_progress_image_number);
ezc_functions.Insert("ticket_is", ticket_is);
ezc_functions.Insert("ticket_can_create", ticket_can_create);
ezc_functions.Insert("ticket_can_edit", ticket_can_edit);
ezc_functions.Insert("ticket_type", ticket_type);
ezc_functions.Insert("ticket_status", ticket_status);
ezc_functions.Insert("ticket_priority", ticket_priority);
ezc_functions.Insert("ticket_category", ticket_category);
ezc_functions.Insert("ticket_expected", ticket_expected);
ezc_functions.Insert("ticket_progress", ticket_progress);
ezc_functions.Insert("ticket_progress_image_number", ticket_progress_image_number);
functions.Insert("ticket_tab", ticket_tab);
functions.Insert("ticket_tab_url", ticket_tab_url);
functions.Insert("ticket_tab_subject", ticket_tab_subject);
functions.Insert("ticket_tab_subject_empty", ticket_tab_subject_empty);
functions.Insert("ticket_tab_author", ticket_tab_author);
functions.Insert("ticket_tab_type", ticket_tab_type);
functions.Insert("ticket_tab_status", ticket_tab_status);
functions.Insert("ticket_tab_priority", ticket_tab_priority);
functions.Insert("ticket_tab_category", ticket_tab_category);
functions.Insert("ticket_tab_expected", ticket_tab_expected);
functions.Insert("ticket_tab_progress", ticket_tab_progress);
functions.Insert("ticket_tab_progress_image_number",ticket_tab_progress_image_number);
ezc_functions.Insert("ticket_tab", ticket_tab);
ezc_functions.Insert("ticket_tab_url", ticket_tab_url);
ezc_functions.Insert("ticket_tab_subject", ticket_tab_subject);
ezc_functions.Insert("ticket_tab_subject_empty", ticket_tab_subject_empty);
ezc_functions.Insert("ticket_tab_author", ticket_tab_author);
ezc_functions.Insert("ticket_tab_type", ticket_tab_type);
ezc_functions.Insert("ticket_tab_status", ticket_tab_status);
ezc_functions.Insert("ticket_tab_priority", ticket_tab_priority);
ezc_functions.Insert("ticket_tab_category", ticket_tab_category);
ezc_functions.Insert("ticket_tab_expected", ticket_tab_expected);
ezc_functions.Insert("ticket_tab_progress", ticket_tab_progress);
ezc_functions.Insert("ticket_tab_progress_image_number",ticket_tab_progress_image_number);
functions.Insert("ticket_type_tab", ticket_type_tab);
functions.Insert("ticket_type_tab_defined", ticket_type_tab_defined);
functions.Insert("ticket_type_tab_isdefault", ticket_type_tab_isdefault);
functions.Insert("ticket_type_tab_index", ticket_type_tab_index);
functions.Insert("ticket_type_tab_name", ticket_type_tab_name);
ezc_functions.Insert("ticket_type_tab", ticket_type_tab);
ezc_functions.Insert("ticket_type_tab_defined", ticket_type_tab_defined);
ezc_functions.Insert("ticket_type_tab_isdefault", ticket_type_tab_isdefault);
ezc_functions.Insert("ticket_type_tab_index", ticket_type_tab_index);
ezc_functions.Insert("ticket_type_tab_name", ticket_type_tab_name);
functions.Insert("ticket_status_tab", ticket_status_tab);
functions.Insert("ticket_status_tab_defined", ticket_status_tab_defined);
functions.Insert("ticket_status_tab_isdefault", ticket_status_tab_isdefault);
functions.Insert("ticket_status_tab_index", ticket_status_tab_index);
functions.Insert("ticket_status_tab_name", ticket_status_tab_name);
ezc_functions.Insert("ticket_status_tab", ticket_status_tab);
ezc_functions.Insert("ticket_status_tab_defined", ticket_status_tab_defined);
ezc_functions.Insert("ticket_status_tab_isdefault", ticket_status_tab_isdefault);
ezc_functions.Insert("ticket_status_tab_index", ticket_status_tab_index);
ezc_functions.Insert("ticket_status_tab_name", ticket_status_tab_name);
functions.Insert("ticket_priority_tab", ticket_priority_tab);
functions.Insert("ticket_priority_tab_defined", ticket_priority_tab_defined);
functions.Insert("ticket_priority_tab_isdefault", ticket_priority_tab_isdefault);
functions.Insert("ticket_priority_tab_index", ticket_priority_tab_index);
functions.Insert("ticket_priority_tab_name", ticket_priority_tab_name);
ezc_functions.Insert("ticket_priority_tab", ticket_priority_tab);
ezc_functions.Insert("ticket_priority_tab_defined", ticket_priority_tab_defined);
ezc_functions.Insert("ticket_priority_tab_isdefault", ticket_priority_tab_isdefault);
ezc_functions.Insert("ticket_priority_tab_index", ticket_priority_tab_index);
ezc_functions.Insert("ticket_priority_tab_name", ticket_priority_tab_name);
functions.Insert("ticket_category_tab", ticket_category_tab);
functions.Insert("ticket_category_tab_defined", ticket_category_tab_defined);
functions.Insert("ticket_category_tab_isdefault", ticket_category_tab_isdefault);
functions.Insert("ticket_category_tab_index", ticket_category_tab_index);
functions.Insert("ticket_category_tab_name", ticket_category_tab_name);
ezc_functions.Insert("ticket_category_tab", ticket_category_tab);
ezc_functions.Insert("ticket_category_tab_defined", ticket_category_tab_defined);
ezc_functions.Insert("ticket_category_tab_isdefault", ticket_category_tab_isdefault);
ezc_functions.Insert("ticket_category_tab_index", ticket_category_tab_index);
ezc_functions.Insert("ticket_category_tab_name", ticket_category_tab_name);
functions.Insert("ticket_expected_tab", ticket_expected_tab);
functions.Insert("ticket_expected_tab_defined", ticket_expected_tab_defined);
functions.Insert("ticket_expected_tab_isdefault", ticket_expected_tab_isdefault);
functions.Insert("ticket_expected_tab_index", ticket_expected_tab_index);
functions.Insert("ticket_expected_tab_name", ticket_expected_tab_name);
ezc_functions.Insert("ticket_expected_tab", ticket_expected_tab);
ezc_functions.Insert("ticket_expected_tab_defined", ticket_expected_tab_defined);
ezc_functions.Insert("ticket_expected_tab_isdefault", ticket_expected_tab_isdefault);
ezc_functions.Insert("ticket_expected_tab_index", ticket_expected_tab_index);
ezc_functions.Insert("ticket_expected_tab_name", ticket_expected_tab_name);
/*
mount
*/
functions.Insert("mount_page_is", mount_page_is);
functions.Insert("mount_thread_is", mount_thread_is);
functions.Insert("mount_type_is_thread", mount_type_is_thread);
functions.Insert("mount_type_is_ticket", mount_type_is_ticket);
functions.Insert("mount_type_is_cms", mount_type_is_cms);
ezc_functions.Insert("mount_page_is", mount_page_is);
ezc_functions.Insert("mount_thread_is", mount_thread_is);
ezc_functions.Insert("mount_type_is_thread", mount_type_is_thread);
ezc_functions.Insert("mount_type_is_ticket", mount_type_is_ticket);
ezc_functions.Insert("mount_type_is_cms", mount_type_is_cms);
/*
rebus
*/
functions.Insert("rebus_question", rebus_question);
ezc_functions.Insert("rebus_question", rebus_question);
/*
upload
*/
functions.Insert("upload_ckeditor_funnum", upload_ckeditor_funnum);
ezc_functions.Insert("upload_ckeditor_funnum", upload_ckeditor_funnum);
/*
uptime
*/
functions.Insert("uptime_more_than_one_day", uptime_more_than_one_day);
functions.Insert("uptime_days", uptime_days);
functions.Insert("uptime_hours", uptime_hours);
ezc_functions.Insert("uptime_more_than_one_day", uptime_more_than_one_day);
ezc_functions.Insert("uptime_days", uptime_days);
ezc_functions.Insert("uptime_hours", uptime_hours);
/*
winix
*/
functions.Insert("winix_cur_time", winix_cur_time);
functions.Insert("winix_users_logged", winix_users_logged);
functions.Insert("winix_function", winix_function);
functions.Insert("winix_function_is", winix_function_is);
functions.Insert("winix_function_param_is", winix_function_param_is);
functions.Insert("winix_loadavg_now", winix_loadavg_now);
functions.Insert("winix_loadavg_1", winix_loadavg_1);
functions.Insert("winix_loadavg_5", winix_loadavg_5);
functions.Insert("winix_loadavg_15", winix_loadavg_15);
functions.Insert("winix_req_per_sec_now", winix_req_per_sec_now);
functions.Insert("winix_req_per_sec_1", winix_req_per_sec_1);
functions.Insert("winix_req_per_sec_5", winix_req_per_sec_5);
functions.Insert("winix_req_per_sec_15", winix_req_per_sec_15);
functions.Insert("winix_err_is", winix_err_is);
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_show_content_in_full_window", winix_show_content_in_full_window);
ezc_functions.Insert("winix_cur_time", winix_cur_time);
ezc_functions.Insert("winix_users_logged", winix_users_logged);
ezc_functions.Insert("winix_function", winix_function);
ezc_functions.Insert("winix_function_is", winix_function_is);
ezc_functions.Insert("winix_function_param_is", winix_function_param_is);
ezc_functions.Insert("winix_loadavg_now", winix_loadavg_now);
ezc_functions.Insert("winix_loadavg_1", winix_loadavg_1);
ezc_functions.Insert("winix_loadavg_5", winix_loadavg_5);
ezc_functions.Insert("winix_loadavg_15", winix_loadavg_15);
ezc_functions.Insert("winix_req_per_sec_now", winix_req_per_sec_now);
ezc_functions.Insert("winix_req_per_sec_1", winix_req_per_sec_1);
ezc_functions.Insert("winix_req_per_sec_5", winix_req_per_sec_5);
ezc_functions.Insert("winix_req_per_sec_15", winix_req_per_sec_15);
ezc_functions.Insert("winix_err_is", winix_err_is);
ezc_functions.Insert("winix_err_code", winix_err_code);
ezc_functions.Insert("winix_is_err_in_locales", winix_is_err_in_locales);
ezc_functions.Insert("winix_err_msg_from_locales",winix_err_msg_from_locales);
ezc_functions.Insert("winix_show_content_in_full_window", winix_show_content_in_full_window);
plugin.Call(WINIX_TEMPLATES_CREATEFUNCTIONS, &functions);
plugin.Call(WINIX_TEMPLATES_CREATEFUNCTIONS, &ezc_functions);
}
@@ -497,14 +500,14 @@ void Templates::ReadTemplates()
{
using namespace TemplatesFunctions;
Locale::Lang lang = Locale::StrToLang(data.locale_str);
Locale::Lang lang = Locale::StrToLang(config->locale_str);
if( lang != Locale::lang_unknown )
locale.SetLang(lang);
else
locale.SetLang(Locale::lang_en);
locale.Read(data.locale_dir, data.locale_dir_default);
locale.Read(config->locale_dir, config->locale_dir_default);
ClearPatterns();
@@ -555,7 +558,7 @@ Mounts::MountTab::const_iterator i;
using namespace TemplatesFunctions;
index_patterns.MarkAllToDelete();
const Mounts::MountTab * pmount_tab = data.mounts.GetMountTab();
const Mounts::MountTab * pmount_tab = TemplatesFunctions::system->mounts.GetMountTab();
for(i=pmount_tab->begin() ; i!=pmount_tab->end() ; ++i)
{
@@ -575,7 +578,7 @@ void Templates::ReadIndexFileNames()
using namespace TemplatesFunctions;
Mounts::MountTab::const_iterator i;
const Mounts::MountTab * pmount_tab = data.mounts.GetMountTab();
const Mounts::MountTab * pmount_tab = TemplatesFunctions::system->mounts.GetMountTab();
for(i=pmount_tab->begin() ; i!=pmount_tab->end() ; ++i)
{
@@ -605,7 +608,7 @@ using namespace TemplatesFunctions;
return;
Ezc::Pattern * index = 0;
const std::string * index_file_local = data.mounts.pmount->HtmlTemplate();
const std::string * index_file_local = TemplatesFunctions::system->mounts.pmount->HtmlTemplate();
if( index_file_local )
index = index_patterns.GetPattern(*index_file_local, locale.GetLang());
@@ -613,7 +616,7 @@ using namespace TemplatesFunctions;
if( !index )
index = &patterns[locale.GetLang()][pat_index];
Ezc::Generator generator(request.page, *index, functions);
Ezc::Generator generator(request->page, *index, ezc_functions);
generator.Generate();
}
@@ -626,7 +629,7 @@ using namespace TemplatesFunctions;
if( !empty_pars.empty() )
empty_pars.clear();
Ezc::Info info(request.page, empty_pars, empty_string);
Ezc::Info info(request->page, empty_pars, empty_string);
info.iter = 0;
info.res = false;
@@ -635,6 +638,43 @@ using namespace TemplatesFunctions;
}
void Templates::SetConfig(Config * pconfig)
{
TemplatesFunctions::config = pconfig;
TemplatesFunctions::index_patterns.SetConfig(pconfig);
}
void Templates::SetRequest(Request * prequest)
{
TemplatesFunctions::request = prequest;
}
void Templates::SetDb(Db * pdb)
{
TemplatesFunctions::db = pdb;
}
void Templates::SetSystem(System * psystem)
{
TemplatesFunctions::system = psystem;
}
void Templates::SetFunctions(Functions * pfunctions)
{
TemplatesFunctions::functions = pfunctions;
}
void Templates::SetSessionManager(SessionManager * psession_manager)
{
TemplatesFunctions::session_manager = psession_manager;
}
Templates::Templates()
{
ClearPatterns();

30
templates/templates.h
View File

@@ -16,11 +16,19 @@
#include "patterncacher.h"
#include "misc.h"
#include "ckeditorgetparser.h"
#include "../core/locale.h"
#include "indexpatterns.h"
#include "core/config.h"
#include "core/request.h"
#include "core/db.h"
#include "core/system.h"
#include "core/locale.h"
#include "core/sessionmanager.h"
class Functions;
namespace TemplatesFunctions
{
@@ -64,7 +72,7 @@ namespace TemplatesFunctions
struct PatName
{
int fun_code;
const char * fun_name;
Pat pat;
};
@@ -73,9 +81,18 @@ namespace TemplatesFunctions
extern Patterns patterns;
extern PatternCacher pattern_cacher;
extern Locale locale;
extern Ezc::Functions functions;
extern Ezc::Functions ezc_functions;
extern CKEditorGetParser ckeditor_getparser;
extern Config * config;
extern Request * request;
extern Db * db;
extern System * system;
extern Functions * functions;
extern SessionManager * session_manager;
/*
sys
@@ -394,6 +411,13 @@ public:
Templates();
void SetConfig(Config * pconfig);
void SetRequest(Request * prequest);
void SetDb(Db * pdb);
void SetSystem(System * psystem);
void SetFunctions(Functions * pfunctions);
void SetSessionManager(SessionManager * psession_manager);
void ClearPatterns();
void ReadTemplates();
void ReadNewIndexTemplates();

48
templates/thread.cpp
View File

@@ -9,7 +9,6 @@
#include "templates.h"
#include "misc.h"
#include "../core/data.h"
#include "../core/request.h"
#include "../core/misc.h"
@@ -20,7 +19,7 @@ namespace TemplatesFunctions
void thread_is(Info & i)
{
i.res = request.is_thread;
i.res = request->is_thread;
}
@@ -33,15 +32,15 @@ void thread_tab(Info & i)
{
thread_tab_index = i.iter;
i.res = thread_tab_index < request.thread_tab.size();
i.res = thread_tab_index < request->thread_tab.size();
}
void thread_tab_url(Info & i)
{
if( thread_tab_index < request.thread_tab.size() )
if( thread_tab_index < request->thread_tab.size() )
{
Item * dir = data.dirs.GetDir( request.thread_tab[thread_tab_index].dir_id );
Item * dir = system->dirs.GetDir( request->thread_tab[thread_tab_index].dir_id );
if( dir )
{
@@ -57,9 +56,9 @@ void thread_tab_url(Info & i)
void thread_tab_subject(Info & i)
{
if( thread_tab_index < request.thread_tab.size() )
if( thread_tab_index < request->thread_tab.size() )
{
Item * dir = data.dirs.GetDir( request.thread_tab[thread_tab_index].dir_id );
Item * dir = system->dirs.GetDir( request->thread_tab[thread_tab_index].dir_id );
if( dir )
{
@@ -78,9 +77,9 @@ void thread_tab_subject(Info & i)
void thread_tab_answers(Info & i)
{
if( thread_tab_index < request.thread_tab.size() )
if( thread_tab_index < request->thread_tab.size() )
{
long a = request.thread_tab[thread_tab_index].items;
long a = request->thread_tab[thread_tab_index].items;
// the first is created by the author
// we count only the rest
@@ -97,13 +96,13 @@ void thread_tab_author(Info & i)
bool unknown = true;
if( thread_tab_index < request.thread_tab.size() )
if( thread_tab_index < request->thread_tab.size() )
{
Item * dir = data.dirs.GetDir( request.thread_tab[thread_tab_index].dir_id );
Item * dir = system->dirs.GetDir( request->thread_tab[thread_tab_index].dir_id );
if( dir )
{
User * puser = data.users.GetUser(dir->user_id);
User * puser = system->users.GetUser(dir->user_id);
unknown = false;
if( puser )
@@ -130,27 +129,27 @@ bool unknown = true;
void thread_tab_last_item_date_modification(Info & i)
{
if( thread_tab_index < request.thread_tab.size() )
if( request.thread_tab[thread_tab_index].last_item.id != -1 )
i.out << DateToStr( &request.thread_tab[thread_tab_index].last_item.date_modification );
if( thread_tab_index < request->thread_tab.size() )
if( request->thread_tab[thread_tab_index].last_item.id != -1 )
i.out << DateToStr( &request->thread_tab[thread_tab_index].last_item.date_modification );
}
void thread_tab_last_item_date_modification_nice(Info & i)
{
if( thread_tab_index < request.thread_tab.size() )
if( request.thread_tab[thread_tab_index].last_item.id != -1 )
print_date_nice(i, &request.thread_tab[thread_tab_index].last_item.date_modification);
if( thread_tab_index < request->thread_tab.size() )
if( request->thread_tab[thread_tab_index].last_item.id != -1 )
print_date_nice(i, &request->thread_tab[thread_tab_index].last_item.date_modification);
}
void thread_tab_last_item_user(Info & i)
{
if( thread_tab_index < request.thread_tab.size() )
if( thread_tab_index < request->thread_tab.size() )
{
if( request.thread_tab[thread_tab_index].last_item.id != -1 )
if( request->thread_tab[thread_tab_index].last_item.id != -1 )
{
User * puser = data.users.GetUser( request.thread_tab[thread_tab_index].last_item.user_id );
User * puser = system->users.GetUser( request->thread_tab[thread_tab_index].last_item.user_id );
if( puser )
HtmlEscape(i.out, puser->name);
@@ -158,8 +157,8 @@ void thread_tab_last_item_user(Info & i)
{
i.out << "~";
if( !request.thread_tab[thread_tab_index].last_item.guest_name.empty() )
HtmlEscape(i.out, request.thread_tab[thread_tab_index].last_item.guest_name);
if( !request->thread_tab[thread_tab_index].last_item.guest_name.empty() )
HtmlEscape(i.out, request->thread_tab[thread_tab_index].last_item.guest_name);
else
i.out << "guest"; // !! dodac do konfiga
}
@@ -170,7 +169,8 @@ void thread_tab_last_item_user(Info & i)
void thread_can_create(Info & i)
{
i.res = request.CanCreateThread(true);
//i.res = request->CanCreateThread(true);
i.res = true; // temporarily
}

177
templates/ticket.cpp
View File

@@ -8,10 +8,9 @@
*/
#include "templates.h"
#include "../core/data.h"
#include "../core/request.h"
#include "../core/misc.h"
#include "core/request.h"
#include "core/misc.h"
#include "functions/functions.h"
namespace TemplatesFunctions
@@ -35,7 +34,7 @@ return percent;
void ticket_is(Info & i)
{
i.res = request.is_ticket;
i.res = request->is_ticket;
}
@@ -43,61 +42,63 @@ void ticket_is(Info & i)
void ticket_can_create(Info & i)
{
i.res = request.CanCreateTicket(true);
//i.res = request->CanCreateTicket(true);
i.res = functions->fun_createticket.HasAccess();
}
void ticket_can_edit(Info & i)
{
i.res = request.CanEditTicket();
//i.res = request->CanEditTicket();
i.res = functions->fun_editticket.HasAccess();
}
void ticket_type(Info & i)
{
if( request.ticket.type < data.mounts.pmount->param[Mount::par_ticket_type].arg.size() )
HtmlEscape(i.out, data.mounts.pmount->param[Mount::par_ticket_type].arg[request.ticket.type]);
if( request->ticket.type < system->mounts.pmount->param[Mount::par_ticket_type].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_type].arg[request->ticket.type]);
}
void ticket_status(Info & i)
{
if( request.ticket.status < data.mounts.pmount->param[Mount::par_ticket_status].arg.size() )
HtmlEscape(i.out, data.mounts.pmount->param[Mount::par_ticket_status].arg[request.ticket.status]);
if( request->ticket.status < system->mounts.pmount->param[Mount::par_ticket_status].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_status].arg[request->ticket.status]);
}
void ticket_priority(Info & i)
{
if( request.ticket.priority < data.mounts.pmount->param[Mount::par_ticket_priority].arg.size() )
HtmlEscape(i.out, data.mounts.pmount->param[Mount::par_ticket_priority].arg[request.ticket.priority]);
if( request->ticket.priority < system->mounts.pmount->param[Mount::par_ticket_priority].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_priority].arg[request->ticket.priority]);
}
void ticket_category(Info & i)
{
if( request.ticket.category < data.mounts.pmount->param[Mount::par_ticket_category].arg.size() )
HtmlEscape(i.out, data.mounts.pmount->param[Mount::par_ticket_category].arg[request.ticket.category]);
if( request->ticket.category < system->mounts.pmount->param[Mount::par_ticket_category].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_category].arg[request->ticket.category]);
}
void ticket_expected(Info & i)
{
if( request.ticket.expected < data.mounts.pmount->param[Mount::par_ticket_expected].arg.size() )
HtmlEscape(i.out, data.mounts.pmount->param[Mount::par_ticket_expected].arg[request.ticket.expected]);
if( request->ticket.expected < system->mounts.pmount->param[Mount::par_ticket_expected].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_expected].arg[request->ticket.expected]);
}
void ticket_progress(Info & i)
{
i.out << request.ticket.progress;
i.out << request->ticket.progress;
}
void ticket_progress_image_number(Info & i)
{
int percent = request.ticket.progress;
int percent = request->ticket.progress;
i.out << ticket_calc_progress_image_number(percent);
}
@@ -115,15 +116,15 @@ void ticket_tab(Info & i)
{
ticket_tab_index = i.iter;
i.res = ticket_tab_index < request.ticket_tab.size();
i.res = ticket_tab_index < request->ticket_tab.size();
}
void ticket_tab_url(Info & i)
{
if( ticket_tab_index < request.ticket_tab.size() )
if( ticket_tab_index < request->ticket_tab.size() )
{
Item * dir = data.dirs.GetDir( request.ticket_tab[ticket_tab_index].dir_id );
Item * dir = system->dirs.GetDir( request->ticket_tab[ticket_tab_index].dir_id );
if( dir )
{
@@ -139,9 +140,9 @@ void ticket_tab_url(Info & i)
void ticket_tab_subject(Info & i)
{
if( ticket_tab_index < request.ticket_tab.size() )
if( ticket_tab_index < request->ticket_tab.size() )
{
Item * dir = data.dirs.GetDir( request.ticket_tab[ticket_tab_index].dir_id );
Item * dir = system->dirs.GetDir( request->ticket_tab[ticket_tab_index].dir_id );
if( dir )
{
@@ -162,9 +163,9 @@ void ticket_tab_subject_empty(Info & i)
{
i.res = true;
if( ticket_tab_index < request.ticket_tab.size() )
if( ticket_tab_index < request->ticket_tab.size() )
{
Item * dir = data.dirs.GetDir( request.ticket_tab[ticket_tab_index].dir_id );
Item * dir = system->dirs.GetDir( request->ticket_tab[ticket_tab_index].dir_id );
if( dir )
i.res = dir->subject.empty();
@@ -177,13 +178,13 @@ void ticket_tab_author(Info & i)
bool unknown = true;
if( ticket_tab_index < request.ticket_tab.size() )
if( ticket_tab_index < request->ticket_tab.size() )
{
Item * dir = data.dirs.GetDir( request.ticket_tab[ticket_tab_index].dir_id );
Item * dir = system->dirs.GetDir( request->ticket_tab[ticket_tab_index].dir_id );
if( dir )
{
User * puser = data.users.GetUser(dir->user_id);
User * puser = system->users.GetUser(dir->user_id);
unknown = false;
if( puser )
@@ -211,79 +212,79 @@ bool unknown = true;
void ticket_tab_type(Info & i)
{
if( ticket_tab_index >= request.ticket_tab.size() )
if( ticket_tab_index >= request->ticket_tab.size() )
return;
Ticket & t = request.ticket_tab[ticket_tab_index];
Ticket & t = request->ticket_tab[ticket_tab_index];
if( t.type < data.mounts.pmount->param[Mount::par_ticket_type].arg.size() )
HtmlEscape(i.out, data.mounts.pmount->param[Mount::par_ticket_type].arg[t.type]);
if( t.type < system->mounts.pmount->param[Mount::par_ticket_type].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_type].arg[t.type]);
}
void ticket_tab_status(Info & i)
{
if( ticket_tab_index >= request.ticket_tab.size() )
if( ticket_tab_index >= request->ticket_tab.size() )
return;
Ticket & t = request.ticket_tab[ticket_tab_index];
Ticket & t = request->ticket_tab[ticket_tab_index];
if( t.status < data.mounts.pmount->param[Mount::par_ticket_status].arg.size() )
HtmlEscape(i.out, data.mounts.pmount->param[Mount::par_ticket_status].arg[t.status]);
if( t.status < system->mounts.pmount->param[Mount::par_ticket_status].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_status].arg[t.status]);
}
void ticket_tab_priority(Info & i)
{
if( ticket_tab_index >= request.ticket_tab.size() )
if( ticket_tab_index >= request->ticket_tab.size() )
return;
Ticket & t = request.ticket_tab[ticket_tab_index];
Ticket & t = request->ticket_tab[ticket_tab_index];
if( t.priority < data.mounts.pmount->param[Mount::par_ticket_priority].arg.size() )
HtmlEscape(i.out, data.mounts.pmount->param[Mount::par_ticket_priority].arg[t.priority]);
if( t.priority < system->mounts.pmount->param[Mount::par_ticket_priority].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_priority].arg[t.priority]);
}
void ticket_tab_category(Info & i)
{
if( ticket_tab_index >= request.ticket_tab.size() )
if( ticket_tab_index >= request->ticket_tab.size() )
return;
Ticket & t = request.ticket_tab[ticket_tab_index];
Ticket & t = request->ticket_tab[ticket_tab_index];
if( t.category < data.mounts.pmount->param[Mount::par_ticket_category].arg.size() )
HtmlEscape(i.out, data.mounts.pmount->param[Mount::par_ticket_category].arg[t.category]);
if( t.category < system->mounts.pmount->param[Mount::par_ticket_category].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_category].arg[t.category]);
}
void ticket_tab_expected(Info & i)
{
if( ticket_tab_index >= request.ticket_tab.size() )
if( ticket_tab_index >= request->ticket_tab.size() )
return;
Ticket & t = request.ticket_tab[ticket_tab_index];
Ticket & t = request->ticket_tab[ticket_tab_index];
if( t.expected < data.mounts.pmount->param[Mount::par_ticket_expected].arg.size() )
HtmlEscape(i.out, data.mounts.pmount->param[Mount::par_ticket_expected].arg[t.expected]);
if( t.expected < system->mounts.pmount->param[Mount::par_ticket_expected].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_expected].arg[t.expected]);
}
void ticket_tab_progress(Info & i)
{
if( ticket_tab_index >= request.ticket_tab.size() )
if( ticket_tab_index >= request->ticket_tab.size() )
return;
i.out << request.ticket_tab[ticket_tab_index].progress;
i.out << request->ticket_tab[ticket_tab_index].progress;
}
void ticket_tab_progress_image_number(Info & i)
{
if( ticket_tab_index >= request.ticket_tab.size() )
if( ticket_tab_index >= request->ticket_tab.size() )
return;
int percent = request.ticket_tab[ticket_tab_index].progress;
int percent = request->ticket_tab[ticket_tab_index].progress;
i.out << ticket_calc_progress_image_number(percent);
}
@@ -298,25 +299,25 @@ void ticket_type_tab(Info & i)
{
ticket_type_tab_ind = i.iter;
i.res = ticket_type_tab_ind < data.mounts.pmount->param[Mount::par_ticket_type].arg.size();
i.res = ticket_type_tab_ind < system->mounts.pmount->param[Mount::par_ticket_type].arg.size();
}
void ticket_type_tab_defined(Info & i)
{
i.res = data.mounts.pmount->param[Mount::par_ticket_type].defined;
i.res = system->mounts.pmount->param[Mount::par_ticket_type].defined;
}
void ticket_type_tab_isdefault(Info & i)
{
if( request.is_ticket )
if( request->is_ticket )
{
i.res = (ticket_type_tab_ind == request.ticket.type);
i.res = (ticket_type_tab_ind == request->ticket.type);
}
else
{
Mount::ParamRow & p = data.mounts.pmount->param[Mount::par_ticket_type_default];
Mount::ParamRow & p = system->mounts.pmount->param[Mount::par_ticket_type_default];
if( !p.defined || p.arg.empty() )
return; // default false
@@ -335,8 +336,8 @@ void ticket_type_tab_index(Info & i)
void ticket_type_tab_name(Info & i)
{
if( ticket_type_tab_ind < data.mounts.pmount->param[Mount::par_ticket_type].arg.size() )
HtmlEscape(i.out, data.mounts.pmount->param[Mount::par_ticket_type].arg[ticket_type_tab_ind]);
if( ticket_type_tab_ind < system->mounts.pmount->param[Mount::par_ticket_type].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_type].arg[ticket_type_tab_ind]);
}
@@ -350,25 +351,25 @@ void ticket_status_tab(Info & i)
{
ticket_status_tab_ind = i.iter;
i.res = ticket_status_tab_ind < data.mounts.pmount->param[Mount::par_ticket_status].arg.size();
i.res = ticket_status_tab_ind < system->mounts.pmount->param[Mount::par_ticket_status].arg.size();
}
void ticket_status_tab_defined(Info & i)
{
i.res = data.mounts.pmount->param[Mount::par_ticket_status].defined;
i.res = system->mounts.pmount->param[Mount::par_ticket_status].defined;
}
void ticket_status_tab_isdefault(Info & i)
{
if( request.is_ticket )
if( request->is_ticket )
{
i.res = (ticket_status_tab_ind == request.ticket.status);
i.res = (ticket_status_tab_ind == request->ticket.status);
}
else
{
Mount::ParamRow & p = data.mounts.pmount->param[Mount::par_ticket_status_default];
Mount::ParamRow & p = system->mounts.pmount->param[Mount::par_ticket_status_default];
if( !p.defined || p.arg.empty() )
return; // default false
@@ -387,8 +388,8 @@ void ticket_status_tab_index(Info & i)
void ticket_status_tab_name(Info & i)
{
if( ticket_status_tab_ind < data.mounts.pmount->param[Mount::par_ticket_status].arg.size() )
HtmlEscape(i.out, data.mounts.pmount->param[Mount::par_ticket_status].arg[ticket_status_tab_ind]);
if( ticket_status_tab_ind < system->mounts.pmount->param[Mount::par_ticket_status].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_status].arg[ticket_status_tab_ind]);
}
@@ -401,25 +402,25 @@ void ticket_priority_tab(Info & i)
{
ticket_priority_tab_ind = i.iter;
i.res = ticket_priority_tab_ind < data.mounts.pmount->param[Mount::par_ticket_priority].arg.size();
i.res = ticket_priority_tab_ind < system->mounts.pmount->param[Mount::par_ticket_priority].arg.size();
}
void ticket_priority_tab_defined(Info & i)
{
i.res = data.mounts.pmount->param[Mount::par_ticket_priority].defined;
i.res = system->mounts.pmount->param[Mount::par_ticket_priority].defined;
}
void ticket_priority_tab_isdefault(Info & i)
{
if( request.is_ticket )
if( request->is_ticket )
{
i.res = (ticket_priority_tab_ind == request.ticket.priority);
i.res = (ticket_priority_tab_ind == request->ticket.priority);
}
else
{
Mount::ParamRow & p = data.mounts.pmount->param[Mount::par_ticket_priority_default];
Mount::ParamRow & p = system->mounts.pmount->param[Mount::par_ticket_priority_default];
if( !p.defined || p.arg.empty() )
return; // default false
@@ -438,8 +439,8 @@ void ticket_priority_tab_index(Info & i)
void ticket_priority_tab_name(Info & i)
{
if( ticket_priority_tab_ind < data.mounts.pmount->param[Mount::par_ticket_priority].arg.size() )
HtmlEscape(i.out, data.mounts.pmount->param[Mount::par_ticket_priority].arg[ticket_priority_tab_ind]);
if( ticket_priority_tab_ind < system->mounts.pmount->param[Mount::par_ticket_priority].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_priority].arg[ticket_priority_tab_ind]);
}
@@ -452,25 +453,25 @@ void ticket_category_tab(Info & i)
{
ticket_category_tab_ind = i.iter;
i.res = ticket_category_tab_ind < data.mounts.pmount->param[Mount::par_ticket_category].arg.size();
i.res = ticket_category_tab_ind < system->mounts.pmount->param[Mount::par_ticket_category].arg.size();
}
void ticket_category_tab_defined(Info & i)
{
i.res = data.mounts.pmount->param[Mount::par_ticket_category].defined;
i.res = system->mounts.pmount->param[Mount::par_ticket_category].defined;
}
void ticket_category_tab_isdefault(Info & i)
{
if( request.is_ticket )
if( request->is_ticket )
{
i.res = (ticket_category_tab_ind == request.ticket.category);
i.res = (ticket_category_tab_ind == request->ticket.category);
}
else
{
Mount::ParamRow & p = data.mounts.pmount->param[Mount::par_ticket_category_default];
Mount::ParamRow & p = system->mounts.pmount->param[Mount::par_ticket_category_default];
if( !p.defined || p.arg.empty() )
return; // default false
@@ -489,8 +490,8 @@ void ticket_category_tab_index(Info & i)
void ticket_category_tab_name(Info & i)
{
if( ticket_category_tab_ind < data.mounts.pmount->param[Mount::par_ticket_category].arg.size() )
HtmlEscape(i.out, data.mounts.pmount->param[Mount::par_ticket_category].arg[ticket_category_tab_ind]);
if( ticket_category_tab_ind < system->mounts.pmount->param[Mount::par_ticket_category].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_category].arg[ticket_category_tab_ind]);
}
@@ -504,25 +505,25 @@ void ticket_expected_tab(Info & i)
{
ticket_expected_tab_ind = i.iter;
i.res = ticket_expected_tab_ind < data.mounts.pmount->param[Mount::par_ticket_expected].arg.size();
i.res = ticket_expected_tab_ind < system->mounts.pmount->param[Mount::par_ticket_expected].arg.size();
}
void ticket_expected_tab_defined(Info & i)
{
i.res = data.mounts.pmount->param[Mount::par_ticket_expected].defined;
i.res = system->mounts.pmount->param[Mount::par_ticket_expected].defined;
}
void ticket_expected_tab_isdefault(Info & i)
{
if( request.is_ticket )
if( request->is_ticket )
{
i.res = (ticket_expected_tab_ind == request.ticket.expected);
i.res = (ticket_expected_tab_ind == request->ticket.expected);
}
else
{
Mount::ParamRow & p = data.mounts.pmount->param[Mount::par_ticket_expected_default];
Mount::ParamRow & p = system->mounts.pmount->param[Mount::par_ticket_expected_default];
if( !p.defined || p.arg.empty() )
return; // default false
@@ -541,8 +542,8 @@ void ticket_expected_tab_index(Info & i)
void ticket_expected_tab_name(Info & i)
{
if( ticket_expected_tab_ind < data.mounts.pmount->param[Mount::par_ticket_expected].arg.size() )
HtmlEscape(i.out, data.mounts.pmount->param[Mount::par_ticket_expected].arg[ticket_expected_tab_ind]);
if( ticket_expected_tab_ind < system->mounts.pmount->param[Mount::par_ticket_expected].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_expected].arg[ticket_expected_tab_ind]);
}

4
templates/upload.cpp
View File

@@ -23,9 +23,9 @@ static int upload_fun_num = 0;
void upload_ckeditor_funnum(Info & i)
{
if( upload_ckeditor_reqid != request.id )
if( upload_ckeditor_reqid != request->id )
{
upload_ckeditor_reqid = request.id;
upload_ckeditor_reqid = request->id;
upload_fun_num = ParseCKeditorFun();
}

8
templates/uptime.cpp
View File

@@ -9,7 +9,7 @@
#include <ctime>
#include "templates.h"
#include "../core/data.h"
namespace TemplatesFunctions
@@ -19,7 +19,7 @@ namespace TemplatesFunctions
void uptime_more_than_one_day(Info & i)
{
time_t up = time(0) - data.system_start;
time_t up = time(0) - system->system_start;
time_t days = up / 60 / 60 / 24;
i.res = ( days > 1 );
@@ -28,7 +28,7 @@ void uptime_more_than_one_day(Info & i)
void uptime_days(Info & i)
{
time_t up = time(0) - data.system_start;
time_t up = time(0) - system->system_start;
time_t days = up / 60 / 60 / 24;
i.out << days;
@@ -39,7 +39,7 @@ void uptime_hours(Info & i)
{
char buf[50];
time_t sec = time(0) - data.system_start;
time_t sec = time(0) - system->system_start;
time_t min = sec / 60;
time_t hour = min / 60;

21
templates/user.cpp
View File

@@ -8,7 +8,6 @@
*/
#include "templates.h"
#include "../core/data.h"
#include "../core/request.h"
#include "../core/misc.h"
@@ -22,51 +21,51 @@ namespace TemplatesFunctions
void user_logged(Info & i)
{
i.res = request.session->puser != 0;
i.res = request->session->puser != 0;
}
void user_name(Info & i)
{
if( !request.session->puser )
if( !request->session->puser )
return;
HtmlEscape(i.out, request.session->puser->name);
HtmlEscape(i.out, request->session->puser->name);
}
void user_super_user(Info & i)
{
if( request.session->puser && request.session->puser->super_user )
if( request->session->puser && request->session->puser->super_user )
i.res = true;
}
void user_can_use_html(Info & i)
{
if( !request.session->puser )
if( !request->session->puser )
i.res = false;
else
i.res = request.CanUseHtml(request.session->puser->id);
i.res = system->CanUseHtml(request->session->puser->id);
}
void user_can_use_bbcode(Info & i)
{
if( !request.session->puser )
if( !request->session->puser )
i.res = false;
else
i.res = request.CanUseBBCode(request.session->puser->id);
i.res = system->CanUseBBCode(request->session->puser->id);
}
void user_can_use_raw(Info & i)
{
if( !request.session->puser )
if( !request->session->puser )
i.res = false;
else
i.res = request.CanUseRaw(request.session->puser->id);
i.res = system->CanUseRaw(request->session->puser->id);
}

19
templates/who.cpp
View File

@@ -8,11 +8,8 @@
*/
#include "templates.h"
#include "../core/sessioncontainer.h"
#include "../core/requestcontroller.h"
#include "../core/data.h"
#include "../core/request.h"
#include "../core/misc.h"
#include "core/request.h"
#include "core/misc.h"
@@ -27,14 +24,14 @@ size_t who_lp;
bool who_init()
{
if( who_reqid != request.id )
if( who_reqid != request->id )
{
who_reqid = request.id;
who_iterator = req_controller.SessionBegin();
who_reqid = request->id;
who_iterator = session_manager->SessionBegin();
who_lp = 1;
}
return who_iterator != req_controller.SessionEnd();
return who_iterator != session_manager->SessionEnd();
}
@@ -43,13 +40,13 @@ void who_tab(Info & i)
{
who_init();
if( i.iter != 0 && who_iterator != req_controller.SessionEnd() )
if( i.iter != 0 && who_iterator != session_manager->SessionEnd() )
{
++who_iterator;
++who_lp;
}
i.res = who_iterator != req_controller.SessionEnd();
i.res = who_iterator != session_manager->SessionEnd();
}

43
templates/winix.cpp
View File

@@ -9,8 +9,9 @@
#include <ctime>
#include "templates.h"
#include "../core/data.h"
#include "../core/request.h"
#include "core/request.h"
#include "functions/functions.h"
namespace TemplatesFunctions
@@ -33,28 +34,28 @@ static char buffer[100];
void winix_users_logged(Info & i)
{
i.out << data.how_many_logged;
i.out << system->users.HowManyLogged();
}
void winix_function(Info & i)
{
i.out << request.pfunction->item.url;
i.out << request->pfunction->fun.url;
}
void winix_function_is(Info & i)
{
if( !request.pfunction )
if( !request->pfunction )
return;
i.res = (request.pfunction->item.url == i.par);
i.res = (request->pfunction->fun.url == i.par);
}
void winix_function_param_is(Info & i)
{
i.res = request.IsParam(i.par.c_str());
i.res = request->IsParam(i.par.c_str());
}
@@ -63,7 +64,7 @@ void winix_loadavg_now(Info & i)
{
char buf[20];
sprintf(buf, "%.2f", (double)data.load_avg.LoadAvgNow());
sprintf(buf, "%.2f", (double)system->load_avg.LoadAvgNow());
i.out << buf;
}
@@ -72,7 +73,7 @@ void winix_loadavg_1(Info & i)
{
char buf[20];
sprintf(buf, "%.2f", (double)data.load_avg.LoadAvg1());
sprintf(buf, "%.2f", (double)system->load_avg.LoadAvg1());
i.out << buf;
}
@@ -81,7 +82,7 @@ void winix_loadavg_5(Info & i)
{
char buf[20];
sprintf(buf, "%.2f", (double)data.load_avg.LoadAvg5());
sprintf(buf, "%.2f", (double)system->load_avg.LoadAvg5());
i.out << buf;
}
@@ -90,7 +91,7 @@ void winix_loadavg_15(Info & i)
{
char buf[20];
sprintf(buf, "%.2f", (double)data.load_avg.LoadAvg15());
sprintf(buf, "%.2f", (double)system->load_avg.LoadAvg15());
i.out << buf;
}
@@ -99,7 +100,7 @@ void winix_req_per_sec_now(Info & i)
{
char buf[20];
sprintf(buf, "%.2f", (double)data.load_avg.ReqPerSecNow());
sprintf(buf, "%.2f", (double)system->load_avg.ReqPerSecNow());
i.out << buf;
}
@@ -108,7 +109,7 @@ void winix_req_per_sec_1(Info & i)
{
char buf[20];
sprintf(buf, "%.2f", (double)data.load_avg.ReqPerSec1());
sprintf(buf, "%.2f", (double)system->load_avg.ReqPerSec1());
i.out << buf;
}
@@ -117,7 +118,7 @@ void winix_req_per_sec_5(Info & i)
{
char buf[20];
sprintf(buf, "%.2f", (double)data.load_avg.ReqPerSec5());
sprintf(buf, "%.2f", (double)system->load_avg.ReqPerSec5());
i.out << buf;
}
@@ -126,7 +127,7 @@ void winix_req_per_sec_15(Info & i)
{
char buf[20];
sprintf(buf, "%.2f", (double)data.load_avg.ReqPerSec15());
sprintf(buf, "%.2f", (double)system->load_avg.ReqPerSec15());
i.out << buf;
}
@@ -134,13 +135,13 @@ char buf[20];
void winix_err_is(Info & i)
{
int value = atoi( i.par.c_str() );
i.res = (request.status == value);
i.res = (request->status == value);
}
void winix_err_code(Info & i)
{
i.out << request.status;
i.out << request->status;
}
@@ -152,7 +153,7 @@ void winix_is_err_in_locales(Info & i)
{
char buff[40];
sprintf(buff, "winix_err_%d", request.status);
sprintf(buff, "winix_err_%d", request->status);
winix_error_key = buff;
i.res = locale.IsKey(winix_error_key);
@@ -163,7 +164,7 @@ void winix_err_msg_from_locales(Info & i)
{
char buff[40];
sprintf(buff, "winix_err_%d", request.status);
sprintf(buff, "winix_err_%d", request->status);
winix_error_key = buff;
i.out << locale.Get(winix_error_key);
@@ -172,8 +173,8 @@ char buff[40];
void winix_show_content_in_full_window(Info & i)
{
if( request.pfunction )
i.res = (request.pfunction->code == FUN_CKEDITOR || request.pfunction->code == FUN_TINYMCE);
if( request->pfunction )
i.res = (request->pfunction->fun.url == "ckeditor" || request->pfunction->fun.url == "tinymce");
}