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

removed some thread and ticket information from request

Browse Source 
they are in FunThread and FunTicket classes now
added funtion FunUptime (I forgot about it)



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@631 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2010-08-10 20:43:38 +00:00
parent 76897b8a83
commit 9901c63ede
79 changed files with 1219 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

358
templates/Makefile.dep
View File

@@ -6,13 +6,13 @@ adduser.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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/plugindata.h ../core/rebus.h ../core/compress.h
adduser.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
adduser.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
adduser.o: ../core/db.h ../core/group.h ../core/thread.h
adduser.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
adduser.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
adduser.o: ../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
@@ -22,17 +22,18 @@ dir.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h
dir.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
dir.o: ../core/postmultiparser.h ../core/config.h ../core/db.h
dir.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
dir.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h ../core/dirs.h
dir.o: ../core/db.h ../core/request.h ../core/mounts.h ../core/mount.h
dir.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
dir.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
dir.o: ../core/system.h ../core/misc.h ../functions/functions.h
dir.o: ../functions/functionbase.h ../core/item.h ../core/notify.h
dir.o: ../templatesnotify/templatesnotify.h ../core/mount.h
dir.o: ../templates/misc.h ../functions/functionparser.h
dir.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
dir.o: ../functions/privchanger.h ../functions/chown.h
dir.o: ../functions/ckeditor.h ../functions/cp.h ../functions/createthread.h
@@ -43,23 +44,23 @@ dir.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
dir.o: ../functions/node.h ../functions/priv.h ../functions/reload.h
dir.o: ../functions/rm.h ../functions/run.h ../functions/subject.h
dir.o: ../functions/funthread.h ../core/thread.h ../functions/funticket.h
dir.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
dir.o: ../functions/who.h
dir.o: ../core/ticket.h ../functions/tinymce.h ../functions/uname.h
dir.o: ../functions/upload.h ../functions/uptime.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 ../core/confparser.h
doc.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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
doc.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h
doc.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
doc.o: ../core/postmultiparser.h ../core/config.h ../core/db.h
doc.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
doc.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h ../core/dirs.h
doc.o: ../core/db.h ../core/request.h ../core/mounts.h ../core/mount.h
doc.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
doc.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
doc.o: ../core/system.h ../core/request.h ../core/misc.h
indexpatterns.o: indexpatterns.h ../../ezc/src/ezc.h localefilter.h
indexpatterns.o: ../core/locale.h ../core/confparser.h ../core/locale.h
indexpatterns.o: ../core/config.h ../core/log.h
@@ -69,30 +70,32 @@ item.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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
item.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h
item.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
item.o: ../core/postmultiparser.h ../core/config.h ../core/db.h
item.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
item.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h
item.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
item.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
item.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
item.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
item.o: ../core/misc.h ../core/bbcodeparser.h
last.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.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/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
last.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h
last.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
last.o: ../core/postmultiparser.h ../core/config.h ../core/db.h
last.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
last.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h
last.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
last.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
last.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
last.o: ../core/sessioncontainer.h ../core/system.h ../core/lastcontainer.h
last.o: ../core/request.h ../core/misc.h
localefilter.o: localefilter.h ../core/locale.h ../core/confparser.h
localefilter.o: ../../ezc/src/ezc.h ../core/misc.h ../core/item.h
ls.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
@@ -101,11 +104,11 @@ ls.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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/compress.h ../core/acceptencodingparser.h
ls.o: ../core/acceptbaseparser.h ../core/htmlfilter.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/postmultiparser.h ../core/config.h ../core/db.h ../core/group.h
ls.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
ls.o: ../core/ticket.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
@@ -117,28 +120,30 @@ misc.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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/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
misc.o: ../core/postmultiparser.h ../core/config.h ../core/db.h
misc.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
misc.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h
misc.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
misc.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
misc.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
misc.o: ../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 ../core/confparser.h
mount.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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
mount.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h
mount.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
mount.o: ../core/postmultiparser.h ../core/config.h ../core/db.h
mount.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
mount.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h
mount.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
mount.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
mount.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
mount.o: ../core/sessioncontainer.h ../core/system.h
patterncacher.o: patterncacher.h ../core/item.h ../../ezc/src/ezc.h
patterncacher.o: ../core/log.h
priv.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
@@ -147,17 +152,18 @@ priv.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h
priv.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
priv.o: ../core/postmultiparser.h ../core/config.h ../core/db.h
priv.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
priv.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h
priv.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
priv.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
priv.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
priv.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
priv.o: ../functions/functions.h ../functions/functionbase.h ../core/item.h
priv.o: ../core/notify.h ../templatesnotify/templatesnotify.h ../core/mount.h
priv.o: ../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
priv.o: ../functions/ckeditor.h ../functions/cp.h ../functions/createthread.h
@@ -168,55 +174,56 @@ priv.o: ../functions/logout.h ../functions/ls.h ../functions/mkdir.h
priv.o: ../functions/mv.h ../functions/node.h ../functions/priv.h
priv.o: ../functions/reload.h ../functions/rm.h ../functions/run.h
priv.o: ../functions/subject.h ../functions/funthread.h ../core/thread.h
priv.o: ../functions/funticket.h ../functions/tinymce.h ../functions/uname.h
priv.o: ../functions/upload.h ../functions/who.h
priv.o: ../functions/funticket.h ../core/ticket.h ../functions/tinymce.h
priv.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
priv.o: ../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/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/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
rebus.o: ../core/plugindata.h ../core/rebus.h ../core/compress.h
rebus.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
rebus.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
rebus.o: ../core/db.h ../core/group.h ../core/thread.h ../core/dircontainer.h
rebus.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h
rebus.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
rebus.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
rebus.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
rebus.o: ../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 ../core/confparser.h
sys.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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
sys.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h
sys.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
sys.o: ../core/postmultiparser.h ../core/config.h ../core/db.h
sys.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
sys.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h ../core/dirs.h
sys.o: ../core/db.h ../core/request.h ../core/mounts.h ../core/mount.h
sys.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
sys.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
sys.o: ../core/system.h ../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 ../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/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: ../core/plugindata.h ../core/rebus.h ../core/compress.h
templates.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
templates.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/config.h
templates.o: ../core/db.h ../core/group.h ../core/thread.h
templates.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
templates.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
templates.o: ../core/mounts.h ../core/mount.h ../core/users.h
templates.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
templates.o: ../core/sessionmanager.h ../core/sessioncontainer.h
templates.o: ../core/system.h ../core/misc.h ../core/plugin.h
templates.o: ../core/pluginmsg.h ../core/sessionmanager.h
templates.o: ../functions/functions.h ../functions/functionbase.h
templates.o: ../core/item.h ../core/notify.h
templates.o: ../templatesnotify/templatesnotify.h ../core/mount.h
@@ -232,36 +239,51 @@ templates.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
templates.o: ../functions/node.h ../functions/priv.h ../functions/reload.h
templates.o: ../functions/rm.h ../functions/run.h ../functions/subject.h
templates.o: ../functions/funthread.h ../core/thread.h
templates.o: ../functions/funticket.h ../functions/tinymce.h
templates.o: ../functions/uname.h ../functions/upload.h ../functions/who.h
templates.o: ../templates/templates.h
templates.o: ../functions/funticket.h ../core/ticket.h ../functions/tinymce.h
templates.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
templates.o: ../functions/who.h ../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 ../core/confparser.h
thread.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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/rebus.h ../core/compress.h ../core/acceptencodingparser.h
thread.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
thread.o: ../core/postmultiparser.h ../core/config.h ../core/db.h
thread.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
thread.o: ../core/ugcontainer.h ../core/ticket.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
thread.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
thread.o: ../functions/functions.h ../functions/functionbase.h ../core/item.h
thread.o: ../core/notify.h ../templatesnotify/templatesnotify.h
thread.o: ../core/mount.h ../templates/misc.h ../functions/functionparser.h
thread.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
thread.o: ../functions/privchanger.h ../functions/chown.h
thread.o: ../functions/ckeditor.h ../functions/cp.h
thread.o: ../functions/createthread.h ../functions/createticket.h
thread.o: ../functions/default.h ../functions/download.h
thread.o: ../functions/editticket.h ../functions/emacs.h ../functions/last.h
thread.o: ../functions/login.h ../functions/logout.h ../functions/ls.h
thread.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h
thread.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
thread.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h
thread.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h
thread.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
thread.o: ../functions/uptime.h ../functions/who.h
ticket.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.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/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/rebus.h ../core/compress.h ../core/acceptencodingparser.h
ticket.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
ticket.o: ../core/postmultiparser.h ../core/config.h ../core/db.h
ticket.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
ticket.o: ../core/ugcontainer.h ../core/ticket.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
@@ -279,19 +301,20 @@ 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/tinymce.h
ticket.o: ../functions/uname.h ../functions/upload.h ../functions/who.h
ticket.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h
ticket.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
ticket.o: ../functions/uptime.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 ../core/confparser.h
upload.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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/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/rebus.h ../core/compress.h ../core/acceptencodingparser.h
upload.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
upload.o: ../core/postmultiparser.h ../core/config.h ../core/db.h
upload.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
upload.o: ../core/ugcontainer.h ../core/ticket.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
@@ -302,11 +325,11 @@ uptime.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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/rebus.h ../core/compress.h ../core/acceptencodingparser.h
uptime.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
uptime.o: ../core/postmultiparser.h ../core/config.h ../core/db.h
uptime.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
uptime.o: ../core/ugcontainer.h ../core/ticket.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
@@ -317,47 +340,49 @@ user.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.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
user.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h
user.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
user.o: ../core/postmultiparser.h ../core/config.h ../core/db.h
user.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
user.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h
user.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
user.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
user.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
user.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
user.o: ../core/misc.h
who.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.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/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/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
who.o: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h
who.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
who.o: ../core/postmultiparser.h ../core/config.h ../core/db.h
who.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
who.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h ../core/dirs.h
who.o: ../core/db.h ../core/request.h ../core/mounts.h ../core/mount.h
who.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
who.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
who.o: ../core/system.h ../core/misc.h
winix.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.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/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: ../core/rebus.h ../core/compress.h ../core/acceptencodingparser.h
winix.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
winix.o: ../core/postmultiparser.h ../core/config.h ../core/db.h
winix.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
winix.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h
winix.o: ../core/dirs.h ../core/db.h ../core/request.h ../core/mounts.h
winix.o: ../core/mount.h ../core/users.h ../core/lastcontainer.h
winix.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
winix.o: ../core/sessioncontainer.h ../core/system.h ../functions/functions.h
winix.o: ../functions/functionbase.h ../core/item.h ../core/notify.h
winix.o: ../templatesnotify/templatesnotify.h ../core/mount.h
winix.o: ../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
winix.o: ../functions/ckeditor.h ../functions/cp.h
@@ -368,5 +393,6 @@ 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/tinymce.h
winix.o: ../functions/uname.h ../functions/upload.h ../functions/who.h
winix.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h
winix.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
winix.o: ../functions/uptime.h ../functions/who.h

88
templates/dir.cpp
View File

@@ -19,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_tab.size() ; ++a)
{
HtmlEscape(i.out, request->dir_table[a]->url);
HtmlEscape(i.out, request->dir_tab[a]->url);
i.out << '/';
}
}
@@ -29,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_tab.size() ; ++a)
{
HtmlEscape(i.out, request->dir_table[a]->url);
HtmlEscape(i.out, request->dir_tab[a]->url);
if( a < request->dir_table.size()-1 )
if( a < request->dir_tab.size()-1 )
i.out << '/';
}
}
@@ -41,12 +41,12 @@ void dir_without_slash(Info & i)
void dir_parent(Info & i)
{
if( request->dir_table.empty() )
if( request->dir_tab.empty() )
return;
for(size_t a=0 ; a<request->dir_table.size()-1 ; ++a)
for(size_t a=0 ; a<request->dir_tab.size()-1 ; ++a)
{
HtmlEscape(i.out, request->dir_table[a]->url);
HtmlEscape(i.out, request->dir_tab[a]->url);
i.out << '/';
}
}
@@ -54,14 +54,14 @@ void dir_parent(Info & i)
void dir_parent_without_slash(Info & i)
{
if( request->dir_table.empty() )
if( request->dir_tab.empty() )
return;
for(size_t a=0 ; a<request->dir_table.size()-1 ; ++a)
for(size_t a=0 ; a<request->dir_tab.size()-1 ; ++a)
{
HtmlEscape(i.out, request->dir_table[a]->url);
HtmlEscape(i.out, request->dir_tab[a]->url);
if( request->dir_table.size()>=2 && a<request->dir_table.size()-2 )
if( request->dir_tab.size()>=2 && a<request->dir_tab.size()-2 )
i.out << '/';
}
}
@@ -73,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_tab.size() ; ++a)
{
if( !system->HasReadExecAccess(*request->dir_table[a]) )
if( !system->HasReadExecAccess(*request->dir_tab[a]) )
{
result = false;
break;
@@ -88,7 +88,7 @@ bool result = true;
void dir_can_write(Info & i)
{
i.res = system->HasWriteAccess(*request->dir_table.back());
i.res = system->HasWriteAccess(*request->dir_tab.back());
}
@@ -97,7 +97,7 @@ void dir_can_remove(Info & i)
bool result = true;
if( request->dir_table.size() == 1 )
if( request->dir_tab.size() == 1 )
{
// rm for the root dir
// only the superuser can do it
@@ -106,7 +106,7 @@ bool result = true;
}
else
{
Item * last_but_one_dir = *(--(--request->dir_table.end()));
Item * last_but_one_dir = *(--(--request->dir_tab.end()));
if( !system->HasWriteAccess(*last_but_one_dir) )
result = false;
@@ -146,16 +146,16 @@ void dir_childs_tab(Info & i)
dir_childs_table.clear();
dir_childs_has_parent = false;
if( !request->dir_table.empty() )
if( !request->dir_tab.empty() )
{
if( request->dir_table.size() >= 2 && i.par == "with_parent")
if( request->dir_tab.size() >= 2 && i.par == "with_parent")
{
Item * dir_up = request->dir_table[request->dir_table.size()-2];
Item * dir_up = request->dir_tab[request->dir_tab.size()-2];
dir_childs_table.push_back(dir_up);
dir_childs_has_parent = true;
}
system->dirs.GetDirChilds(request->dir_table.back()->id, dir_childs_table);
system->dirs.GetDirChilds(request->dir_tab.back()->id, dir_childs_table);
}
}
@@ -182,7 +182,9 @@ void dir_childs_tab_url(Info & i)
void dir_childs_tab_privileges(Info & i)
{
if( dir_childs_index < dir_childs_table.size() )
i.out << "0" << std::setbase(8) << dir_childs_table[dir_childs_index]->privileges << std::setbase(10);
i.out << "0" << std::setbase(8)
<< dir_childs_table[dir_childs_index]->privileges
<< std::setbase(10);
}
@@ -234,14 +236,14 @@ 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_tab.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_tab.size() )
HtmlEscape(i.out, request->dir_tab[dir_index]->url);
}
@@ -249,9 +251,9 @@ void dir_tab_link(Info & i)
{
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_tab.size() ; ++a)
{
HtmlEscape(i.out, request->dir_table[a]->url);
HtmlEscape(i.out, request->dir_tab[a]->url);
i.out << '/';
}
}
@@ -271,21 +273,21 @@ void dir_last_default_item_init()
dir_last_default_item.Clear();
if( request->dir_table.empty() )
if( request->dir_tab.empty() )
return;
long default_item = request->dir_table.back()->default_item;
long default_item = request->dir_tab.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);
std::vector<Item> item_tab; // !! tymczasowo, nie bedzie tego po zmianie interfejsu dla Db
db->GetItem(item_tab, default_item);
if( item_table.empty() )
if( item_tab.empty() )
return;
dir_last_default_item = item_table[0];
dir_last_default_item = item_tab[0];
}
@@ -312,7 +314,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_tab.back()->subject);
}
@@ -328,7 +330,7 @@ void dir_last_info(Info & i)
void dir_last_user(Info & i)
{
User * puser = system->users.GetUser(request->dir_table.back()->user_id);
User * puser = system->users.GetUser(request->dir_tab.back()->user_id);
if( puser )
HtmlEscape(i.out, puser->name);
@@ -336,8 +338,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_tab.back()->guest_name.empty() )
HtmlEscape(i.out, request->dir_tab.back()->guest_name);
else
i.out << "guest"; // !! dodac do konfiga
}
@@ -346,19 +348,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_tab.back()->url);
}
void dir_last_url_is(Info & i)
{
i.res = request->dir_table.back()->url == i.par;
i.res = request->dir_tab.back()->url == i.par;
}
void dir_last_date_creation(Info & i)
{
tm * ptm = &request->dir_table.back()->date_creation;
tm * ptm = &request->dir_tab.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);
}
@@ -366,7 +368,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_tab.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);
}
@@ -374,8 +376,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_tab.back()->date_creation;
tm * ptm2 = &request->dir_tab.back()->date_modification;
i.res = ptm1->tm_year == ptm2->tm_year &&
ptm1->tm_mon == ptm2->tm_mon &&

6
templates/doc.cpp
View File

@@ -27,12 +27,12 @@ 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_tab.size() ; ++a)
{
HtmlEscape(i.out, request->dir_table[a]->subject);
HtmlEscape(i.out, request->dir_tab[a]->subject);
was_dir = true;
if( a < request->dir_table.size()-1 )
if( a < request->dir_tab.size()-1 )
i.out << config->title_separator;
}

129
templates/item.cpp
View File

@@ -82,27 +82,32 @@ void item_content_noescape(Info & i)
}
void item_content_type_is(Info & i)
void item_content_type_is(Item & item, Info & i)
{
i.res = false;
if( request->item.content_type == Item::ct_text && i.par == "text" )
if( 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" )
else
if( 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" )
else
if( item.content_type == Item::ct_html && i.par == "html" )
i.res = true;
if( request->item.content_type == Item::ct_bbcode && i.par == "bbcode" )
else
if( item.content_type == Item::ct_bbcode && i.par == "bbcode" )
i.res = true;
if( request->item.content_type == Item::ct_raw && i.par == "raw" )
else
if( item.content_type == Item::ct_raw && i.par == "raw" )
i.res = true;
}
void item_content_type_is(Info & i)
{
item_content_type_is(request->item, i);
}
void item_print_content(std::ostringstream & out, const std::string & content, Item::ContentType content_type)
{
@@ -210,7 +215,7 @@ void item_can_remove(Info & i)
{
// !! tutaj trzeba bedzie cos innego zrobic
// zwlaszcza jak dojdzie sticky bit
i.res = system->HasWriteAccess(*request->dir_table.back());
i.res = system->HasWriteAccess(*request->dir_tab.back());
}
@@ -331,51 +336,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_tab.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_tab.size() )
i.out << request->item_tab[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_tab.size() )
HtmlEscape(i.out, request->item_tab[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_tab.size() )
i.out << request->item_tab[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_tab.size() )
HtmlEscape(i.out, request->item_tab[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_tab.size() )
i.out << request->item_tab[item_index].content;
}
void item_tab_print_content(Info & i)
{
if( item_index >= request->item_table.size() )
if( item_index >= request->item_tab.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_tab[item_index].content;
Item::ContentType type = request->item_tab[item_index].content_type;
item_print_content(i.out, content, type);
}
@@ -383,19 +388,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_tab.size() )
i.out << "0" << std::setbase(8) << request->item_tab[item_index].privileges << std::setbase(10);
}
void item_tab_dir(Info & i)
{
if( item_index < request->item_table.size() )
if( item_index < request->item_tab.size() )
{
std::string path;
if( system->dirs.MakePath(request->item_table[item_index].parent_id, path) )
if( system->dirs.MakePath(request->item_tab[item_index].parent_id, path) )
HtmlEscape(i.out, path);
else
i.out << "/the path does not exist/";
@@ -405,14 +410,14 @@ 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_tab.size() )
HtmlEscape(i.out, request->item_tab[item_index].url);
}
void item_tab_link(Info & i)
{
if( item_index < request->item_table.size() )
if( item_index < request->item_tab.size() )
{
HtmlEscape(i.out, config->base_url);
item_tab_dir(i);
@@ -423,7 +428,7 @@ 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_tab.size() )
{
HtmlEscape(i.out, config->base_url_auth);
item_tab_dir(i);
@@ -434,9 +439,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_tab.size() )
{
if( system->HasReadAccess(request->item_table[item_index]) )
if( system->HasReadAccess(request->item_tab[item_index]) )
i.res = true;
}
}
@@ -444,9 +449,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_tab.size() )
{
if( system->HasWriteAccess(request->item_table[item_index]) )
if( system->HasWriteAccess(request->item_tab[item_index]) )
i.res = true;
}
}
@@ -464,10 +469,10 @@ void item_tab_info(Info & i)
void item_tab_user(Info & i)
{
if( item_index < request->item_table.size() )
if( item_index < request->item_tab.size() )
{
User * puser = system->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_tab[item_index].user_id);
print_user_name(i, puser, request->item_tab[item_index].guest_name);
}
}
@@ -475,10 +480,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_tab.size() )
{
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);
User * puser = system->users.GetUser(request->item_tab[item_index].modification_user_id);
print_user_name(i, puser, request->item_tab[item_index].guest_name);
}
}
@@ -486,9 +491,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_tab.size() )
{
i.res = (request->item_table[item_index].user_id != request->item_table[item_index].modification_user_id);
i.res = (request->item_tab[item_index].user_id != request->item_tab[item_index].modification_user_id);
}
}
@@ -496,9 +501,9 @@ 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_tab.size() )
{
long group_id = request->item_table[item_index].group_id;
long group_id = request->item_tab[item_index].group_id;
Group * pgroup = system->groups.GetGroup(group_id);
if( pgroup )
@@ -511,9 +516,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_tab.size() )
{
tm * ptm = &request->item_table[item_index].date_creation;
tm * ptm = &request->item_tab[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);
}
@@ -522,9 +527,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_tab.size() )
{
tm * ptm = &request->item_table[item_index].date_modification;
tm * ptm = &request->item_tab[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);
}
@@ -533,9 +538,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_tab.size() )
{
tm * ptm = &request->item_table[item_index].date_creation;
tm * ptm = &request->item_tab[item_index].date_creation;
print_date_nice(i, ptm);
}
}
@@ -544,9 +549,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_tab.size() )
{
tm * ptm = &request->item_table[item_index].date_modification;
tm * ptm = &request->item_tab[item_index].date_modification;
print_date_nice(i, ptm);
}
}
@@ -554,10 +559,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_tab.size() )
{
tm * ptm1 = &request->item_table[item_index].date_creation;
tm * ptm2 = &request->item_table[item_index].date_modification;
tm * ptm1 = &request->item_tab[item_index].date_creation;
tm * ptm2 = &request->item_tab[item_index].date_modification;
i.res = ptm1->tm_year == ptm2->tm_year &&
ptm1->tm_mon == ptm2->tm_mon &&
@@ -571,7 +576,7 @@ 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_tab.size() )
{
if( !system->HasReadExecAccess(request->item) )
{
@@ -579,7 +584,7 @@ void item_tab_run(Info & i)
return;
}
Ezc::Pattern * p = pattern_cacher.GetPattern(request->item_table[item_index]);
Ezc::Pattern * p = pattern_cacher.GetPattern(request->item_tab[item_index]);
Ezc::Generator gen(i.out, *p, ezc_functions);
gen.Generate();
}
@@ -588,10 +593,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_tab.size() )
{
// !!
//i.res = request->CanUseEmacs(request->item_table[item_index], true);
//i.res = request->CanUseEmacs(request->item_tab[item_index], true);
}
}

4
templates/localefilter.cpp
View File

@@ -102,9 +102,9 @@ void LocaleFilter::FilterText(Ezc::Pattern::Item & item)
if( !item.text.empty() )
Parse(item.text);
std::vector<Ezc::Pattern::Item*>::iterator i = item.item_table.begin();
std::vector<Ezc::Pattern::Item*>::iterator i = item.item_tab.begin();
for( ; i != item.item_table.end() ; ++i )
for( ; i != item.item_tab.end() ; ++i )
FilterText(**i);
}

8
templates/misc.cpp
View File

@@ -39,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_tab.empty() )
{
size_t last = request->get_table.size()-1;
size_t last = request->get_tab.size()-1;
if( !request->get_table[last].empty() )
if( !request->get_tab[last].empty() )
{
const char * str = request->get_table[last].c_str() + 1; // the first char is '?'
const char * str = request->get_tab[last].c_str() + 1; // the first char is '?'
ckeditor_getparser.Parse(str);
}
}

14
templates/priv.cpp
View File

@@ -57,7 +57,7 @@ void priv_user_tab_init()
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_tab.back());
}
@@ -110,7 +110,7 @@ void priv_user_tab_isdefault(Info & i)
}
else
{
if( uid == request->dir_table.back()->user_id )
if( uid == request->dir_tab.back()->user_id )
i.res = true;
}
}
@@ -182,7 +182,7 @@ void priv_group_tab_init()
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_tab.back());
}
@@ -235,7 +235,7 @@ void priv_group_tab_isdefault(Info & i)
}
else
{
if( gid == request->dir_table.back()->group_id )
if( gid == request->dir_tab.back()->group_id )
i.res = true;
}
}
@@ -247,7 +247,7 @@ void priv_privileges(Info & i)
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_tab.back()->privileges << std::setbase(10);
}
@@ -267,13 +267,13 @@ void priv_privileges_for_dirs(Info & i)
void priv_show_form_chown(Info & i)
{
i.res = (request->pfunction->fun.url == "priv" || request->pfunction->fun.url == "chown");
i.res = (request->function->fun.url == "priv" || request->function->fun.url == "chown");
}
void priv_show_form_chmod(Info & i)
{
i.res = (request->pfunction->fun.url == "priv" || request->pfunction->fun.url == "chmod");
i.res = (request->function->fun.url == "priv" || request->function->fun.url == "chmod");
}

23
templates/templates.cpp
View File

@@ -43,7 +43,7 @@ Ezc::Pattern * content_for_function()
{
Ezc::Pattern * p = 0;
if( !request->pfunction )
if( !request->function )
{
log << log1 << "Templates: no function" << logend;
return p;
@@ -84,7 +84,7 @@ Ezc::Pattern * p = 0;
for(i=0 ; i<len ; ++i)
{
if( strcmp(pat_name_tab[i].fun_name, request->pfunction->fun.url.c_str()) == 0 )
if( strcmp(pat_name_tab[i].fun_name, request->function->fun.url.c_str()) == 0 )
{
// !! locale.GetLang() bedzie brane indywidualnie dla kazdego uzytkownika
p = &patterns[locale.GetLang()][pat_name_tab[i].pat];
@@ -360,22 +360,25 @@ void Templates::CreateFunctions()
/*
thread
*/
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_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);
ezc_functions.Insert("thread_tab_last_item_user", thread_tab_last_item_user);
ezc_functions.Insert("thread_can_create", thread_can_create);
/*
ticket
*/
ezc_functions.Insert("ticket_is", ticket_is);
ezc_functions.Insert("ticket_item_content", ticket_item_content);
ezc_functions.Insert("ticket_item_content_type_is", ticket_item_content_type_is);
ezc_functions.Insert("ticket_item_print_content", ticket_item_print_content);
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);

4
templates/templates.h
View File

@@ -129,6 +129,7 @@ namespace TemplatesFunctions
void item_subject_noescape(Info & i);
void item_content(Info & i);
void item_content_noescape(Info & i);
void item_content_type_is(Item & item, Info & i);
void item_content_type_is(Info & i);
void item_content_is_empty(Info & i);
void item_print_content(std::ostringstream & out, const std::string & content, Item::ContentType content_type);
@@ -294,6 +295,9 @@ namespace TemplatesFunctions
ticket
*/
void ticket_is(Info & i); // !! change to is_ticket lub na ticket_defined
void ticket_item_content(Info & i);
void ticket_item_content_type_is(Info & i);
void ticket_item_print_content(Info & i);
void ticket_can_create(Info & i);
void ticket_can_edit(Info & i);
void ticket_type(Info & i);

50
templates/thread.cpp
View File

@@ -9,8 +9,9 @@
#include "templates.h"
#include "misc.h"
#include "../core/request.h"
#include "../core/misc.h"
#include "core/request.h"
#include "core/misc.h"
#include "functions/functions.h"
@@ -19,11 +20,14 @@ namespace TemplatesFunctions
void thread_is(Info & i)
{
i.res = request->is_thread;
i.res = functions->fun_thread.is_thread;
}
static size_t thread_tab_index;
@@ -32,15 +36,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 < functions->fun_thread.thread_tab.size();
}
void thread_tab_url(Info & i)
{
if( thread_tab_index < request->thread_tab.size() )
if( thread_tab_index < functions->fun_thread.thread_tab.size() )
{
Item * dir = system->dirs.GetDir( request->thread_tab[thread_tab_index].dir_id );
Item * dir = system->dirs.GetDir( functions->fun_thread.thread_tab[thread_tab_index].dir_id );
if( dir )
{
@@ -56,9 +60,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 < functions->fun_thread.thread_tab.size() )
{
Item * dir = system->dirs.GetDir( request->thread_tab[thread_tab_index].dir_id );
Item * dir = system->dirs.GetDir( functions->fun_thread.thread_tab[thread_tab_index].dir_id );
if( dir )
{
@@ -77,9 +81,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 < functions->fun_thread.thread_tab.size() )
{
long a = request->thread_tab[thread_tab_index].items;
long a = functions->fun_thread.thread_tab[thread_tab_index].items;
// the first is created by the author
// we count only the rest
@@ -96,9 +100,9 @@ void thread_tab_author(Info & i)
bool unknown = true;
if( thread_tab_index < request->thread_tab.size() )
if( thread_tab_index < functions->fun_thread.thread_tab.size() )
{
Item * dir = system->dirs.GetDir( request->thread_tab[thread_tab_index].dir_id );
Item * dir = system->dirs.GetDir( functions->fun_thread.thread_tab[thread_tab_index].dir_id );
if( dir )
{
@@ -129,27 +133,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 < functions->fun_thread.thread_tab.size() )
if( functions->fun_thread.thread_tab[thread_tab_index].last_item.id != -1 )
i.out << DateToStr( &functions->fun_thread.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 < functions->fun_thread.thread_tab.size() )
if( functions->fun_thread.thread_tab[thread_tab_index].last_item.id != -1 )
print_date_nice(i, &functions->fun_thread.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 < functions->fun_thread.thread_tab.size() )
{
if( request->thread_tab[thread_tab_index].last_item.id != -1 )
if( functions->fun_thread.thread_tab[thread_tab_index].last_item.id != -1 )
{
User * puser = system->users.GetUser( request->thread_tab[thread_tab_index].last_item.user_id );
User * puser = system->users.GetUser( functions->fun_thread.thread_tab[thread_tab_index].last_item.user_id );
if( puser )
HtmlEscape(i.out, puser->name);
@@ -157,8 +161,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( !functions->fun_thread.thread_tab[thread_tab_index].last_item.guest_name.empty() )
HtmlEscape(i.out, functions->fun_thread.thread_tab[thread_tab_index].last_item.guest_name);
else
i.out << "guest"; // !! dodac do konfiga
}

111
templates/ticket.cpp
View File

@@ -34,7 +34,26 @@ return percent;
void ticket_is(Info & i)
{
i.res = request->is_ticket;
i.res = functions->fun_ticket.is_ticket;
}
void ticket_item_content(Info & i)
{
HtmlEscape(i.out, functions->fun_ticket.item.content);
}
void ticket_item_content_type_is(Info & i)
{
item_content_type_is(functions->fun_ticket.item, i);
}
void ticket_item_print_content(Info & i)
{
item_print_content(i.out, functions->fun_ticket.item.content, functions->fun_ticket.item.content_type);
}
@@ -56,49 +75,49 @@ void ticket_can_edit(Info & i)
void ticket_type(Info & i)
{
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]);
if( functions->fun_ticket.ticket.type < system->mounts.pmount->param[Mount::par_ticket_type].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_type].arg[functions->fun_ticket.ticket.type]);
}
void ticket_status(Info & i)
{
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]);
if( functions->fun_ticket.ticket.status < system->mounts.pmount->param[Mount::par_ticket_status].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_status].arg[functions->fun_ticket.ticket.status]);
}
void ticket_priority(Info & i)
{
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]);
if( functions->fun_ticket.ticket.priority < system->mounts.pmount->param[Mount::par_ticket_priority].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_priority].arg[functions->fun_ticket.ticket.priority]);
}
void ticket_category(Info & i)
{
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]);
if( functions->fun_ticket.ticket.category < system->mounts.pmount->param[Mount::par_ticket_category].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_category].arg[functions->fun_ticket.ticket.category]);
}
void ticket_expected(Info & i)
{
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]);
if( functions->fun_ticket.ticket.expected < system->mounts.pmount->param[Mount::par_ticket_expected].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[Mount::par_ticket_expected].arg[functions->fun_ticket.ticket.expected]);
}
void ticket_progress(Info & i)
{
i.out << request->ticket.progress;
i.out << functions->fun_ticket.ticket.progress;
}
void ticket_progress_image_number(Info & i)
{
int percent = request->ticket.progress;
int percent = functions->fun_ticket.ticket.progress;
i.out << ticket_calc_progress_image_number(percent);
}
@@ -116,15 +135,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 < functions->fun_ticket.ticket_tab.size();
}
void ticket_tab_url(Info & i)
{
if( ticket_tab_index < request->ticket_tab.size() )
if( ticket_tab_index < functions->fun_ticket.ticket_tab.size() )
{
Item * dir = system->dirs.GetDir( request->ticket_tab[ticket_tab_index].dir_id );
Item * dir = system->dirs.GetDir( functions->fun_ticket.ticket_tab[ticket_tab_index].dir_id );
if( dir )
{
@@ -140,9 +159,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 < functions->fun_ticket.ticket_tab.size() )
{
Item * dir = system->dirs.GetDir( request->ticket_tab[ticket_tab_index].dir_id );
Item * dir = system->dirs.GetDir( functions->fun_ticket.ticket_tab[ticket_tab_index].dir_id );
if( dir )
{
@@ -163,9 +182,9 @@ void ticket_tab_subject_empty(Info & i)
{
i.res = true;
if( ticket_tab_index < request->ticket_tab.size() )
if( ticket_tab_index < functions->fun_ticket.ticket_tab.size() )
{
Item * dir = system->dirs.GetDir( request->ticket_tab[ticket_tab_index].dir_id );
Item * dir = system->dirs.GetDir( functions->fun_ticket.ticket_tab[ticket_tab_index].dir_id );
if( dir )
i.res = dir->subject.empty();
@@ -178,9 +197,9 @@ void ticket_tab_author(Info & i)
bool unknown = true;
if( ticket_tab_index < request->ticket_tab.size() )
if( ticket_tab_index < functions->fun_ticket.ticket_tab.size() )
{
Item * dir = system->dirs.GetDir( request->ticket_tab[ticket_tab_index].dir_id );
Item * dir = system->dirs.GetDir( functions->fun_ticket.ticket_tab[ticket_tab_index].dir_id );
if( dir )
{
@@ -212,10 +231,10 @@ bool unknown = true;
void ticket_tab_type(Info & i)
{
if( ticket_tab_index >= request->ticket_tab.size() )
if( ticket_tab_index >= functions->fun_ticket.ticket_tab.size() )
return;
Ticket & t = request->ticket_tab[ticket_tab_index];
Ticket & t = functions->fun_ticket.ticket_tab[ticket_tab_index];
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]);
@@ -224,10 +243,10 @@ void ticket_tab_type(Info & i)
void ticket_tab_status(Info & i)
{
if( ticket_tab_index >= request->ticket_tab.size() )
if( ticket_tab_index >= functions->fun_ticket.ticket_tab.size() )
return;
Ticket & t = request->ticket_tab[ticket_tab_index];
Ticket & t = functions->fun_ticket.ticket_tab[ticket_tab_index];
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]);
@@ -236,10 +255,10 @@ void ticket_tab_status(Info & i)
void ticket_tab_priority(Info & i)
{
if( ticket_tab_index >= request->ticket_tab.size() )
if( ticket_tab_index >= functions->fun_ticket.ticket_tab.size() )
return;
Ticket & t = request->ticket_tab[ticket_tab_index];
Ticket & t = functions->fun_ticket.ticket_tab[ticket_tab_index];
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]);
@@ -248,10 +267,10 @@ void ticket_tab_priority(Info & i)
void ticket_tab_category(Info & i)
{
if( ticket_tab_index >= request->ticket_tab.size() )
if( ticket_tab_index >= functions->fun_ticket.ticket_tab.size() )
return;
Ticket & t = request->ticket_tab[ticket_tab_index];
Ticket & t = functions->fun_ticket.ticket_tab[ticket_tab_index];
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]);
@@ -260,10 +279,10 @@ void ticket_tab_category(Info & i)
void ticket_tab_expected(Info & i)
{
if( ticket_tab_index >= request->ticket_tab.size() )
if( ticket_tab_index >= functions->fun_ticket.ticket_tab.size() )
return;
Ticket & t = request->ticket_tab[ticket_tab_index];
Ticket & t = functions->fun_ticket.ticket_tab[ticket_tab_index];
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]);
@@ -272,19 +291,19 @@ void ticket_tab_expected(Info & i)
void ticket_tab_progress(Info & i)
{
if( ticket_tab_index >= request->ticket_tab.size() )
if( ticket_tab_index >= functions->fun_ticket.ticket_tab.size() )
return;
i.out << request->ticket_tab[ticket_tab_index].progress;
i.out << functions->fun_ticket.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 >= functions->fun_ticket.ticket_tab.size() )
return;
int percent = request->ticket_tab[ticket_tab_index].progress;
int percent = functions->fun_ticket.ticket_tab[ticket_tab_index].progress;
i.out << ticket_calc_progress_image_number(percent);
}
@@ -311,9 +330,9 @@ void ticket_type_tab_defined(Info & i)
void ticket_type_tab_isdefault(Info & i)
{
if( request->is_ticket )
if( functions->fun_ticket.is_ticket )
{
i.res = (ticket_type_tab_ind == request->ticket.type);
i.res = (ticket_type_tab_ind == functions->fun_ticket.ticket.type);
}
else
{
@@ -363,9 +382,9 @@ void ticket_status_tab_defined(Info & i)
void ticket_status_tab_isdefault(Info & i)
{
if( request->is_ticket )
if( functions->fun_ticket.is_ticket )
{
i.res = (ticket_status_tab_ind == request->ticket.status);
i.res = (ticket_status_tab_ind == functions->fun_ticket.ticket.status);
}
else
{
@@ -414,9 +433,9 @@ void ticket_priority_tab_defined(Info & i)
void ticket_priority_tab_isdefault(Info & i)
{
if( request->is_ticket )
if( functions->fun_ticket.is_ticket )
{
i.res = (ticket_priority_tab_ind == request->ticket.priority);
i.res = (ticket_priority_tab_ind == functions->fun_ticket.ticket.priority);
}
else
{
@@ -465,9 +484,9 @@ void ticket_category_tab_defined(Info & i)
void ticket_category_tab_isdefault(Info & i)
{
if( request->is_ticket )
if( functions->fun_ticket.is_ticket )
{
i.res = (ticket_category_tab_ind == request->ticket.category);
i.res = (ticket_category_tab_ind == functions->fun_ticket.ticket.category);
}
else
{
@@ -517,9 +536,9 @@ void ticket_expected_tab_defined(Info & i)
void ticket_expected_tab_isdefault(Info & i)
{
if( request->is_ticket )
if( functions->fun_ticket.is_ticket )
{
i.res = (ticket_expected_tab_ind == request->ticket.expected);
i.res = (ticket_expected_tab_ind == functions->fun_ticket.ticket.expected);
}
else
{

10
templates/winix.cpp
View File

@@ -40,16 +40,16 @@ void winix_users_logged(Info & i)
void winix_function(Info & i)
{
i.out << request->pfunction->fun.url;
i.out << request->function->fun.url;
}
void winix_function_is(Info & i)
{
if( !request->pfunction )
if( !request->function )
return;
i.res = (request->pfunction->fun.url == i.par);
i.res = (request->function->fun.url == i.par);
}
@@ -173,8 +173,8 @@ char buff[40];
void winix_show_content_in_full_window(Info & i)
{
if( request->pfunction )
i.res = (request->pfunction->fun.url == "ckeditor" || request->pfunction->fun.url == "tinymce");
if( request->function )
i.res = (request->function->fun.url == "ckeditor" || request->function->fun.url == "tinymce");
}