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

changed: mount points

Browse Source 
mount type and mount fs are of type 'int' now
they can be added by plugins


git-svn-id: svn://ttmath.org/publicrep/winix/trunk@652 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2010-09-12 23:33:27 +00:00
parent f48f08a98b
commit 23aedd68b0
36 changed files with 979 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

173
templates/Makefile.dep
View File

@@ -10,10 +10,10 @@ adduser.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
adduser.o: ../core/config.h ../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
adduser.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
adduser.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
adduser.o: ../core/loadavg.h ../core/sessionmanager.h
adduser.o: ../core/sessioncontainer.h ../core/system.h
dir.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
dir.o: localefilter.h ../core/locale.h ../core/confparser.h
dir.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -24,11 +24,11 @@ dir.o: ../core/plugindata.h ../core/rebus.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: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
dir.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
dir.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
dir.o: ../functions/functions.h ../functions/functionbase.h ../core/item.h
dir.o: ../core/notify.h ../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
@@ -53,9 +53,10 @@ doc.o: ../core/plugindata.h ../core/rebus.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
doc.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
doc.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
doc.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
doc.o: ../core/misc.h
indexpatterns.o: indexpatterns.h ../../ezc/src/ezc.h localefilter.h
indexpatterns.o: ../core/locale.h ../core/confparser.h ../core/locale.h
indexpatterns.o: ../core/config.h ../core/htmlfilter.h ../core/log.h
@@ -69,10 +70,10 @@ item.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
item.o: ../core/db.h ../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
item.o: ../core/mount.h ../core/mountparser.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 ../core/confparser.h
last.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -83,10 +84,10 @@ last.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
last.o: ../core/db.h ../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
last.o: ../core/mount.h ../core/mountparser.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
@@ -99,9 +100,9 @@ ls.o: ../core/plugindata.h ../core/rebus.h ../core/config.h ../core/db.h
ls.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
ls.o: ../core/ugcontainer.h ../core/ticket.h ../core/system.h ../core/dirs.h
ls.o: ../core/db.h ../core/request.h ../core/mounts.h ../core/mount.h
ls.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
ls.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
ls.o: ../core/system.h ../core/request.h
ls.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
ls.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
ls.o: ../core/sessioncontainer.h ../core/system.h ../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 ../core/confparser.h
@@ -113,9 +114,9 @@ misc.o: ../core/plugindata.h ../core/rebus.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
misc.o: ../core/mount.h ../core/mountparser.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 ../core/confparser.h
mount.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -126,9 +127,10 @@ mount.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
mount.o: ../core/db.h ../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 ../core/misc.h
mount.o: ../core/mount.h ../core/mountparser.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/misc.h
patterncacher.o: patterncacher.h ../core/item.h ../../ezc/src/ezc.h
patterncacher.o: ../core/log.h
priv.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
@@ -141,12 +143,12 @@ priv.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
priv.o: ../core/db.h ../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: ../core/mount.h ../core/mountparser.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
priv.o: ../functions/ckeditor.h ../functions/cp.h ../functions/createthread.h
@@ -170,9 +172,9 @@ rebus.o: ../core/user.h ../core/plugindata.h ../core/rebus.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
rebus.o: ../core/mount.h ../core/mountparser.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 ../core/confparser.h
sys.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -183,9 +185,10 @@ sys.o: ../core/plugindata.h ../core/rebus.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
sys.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
sys.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
sys.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
sys.o: ../core/version.h
template.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h
template.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h
template.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -196,10 +199,10 @@ template.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
template.o: ../core/config.h ../core/db.h ../core/group.h ../core/thread.h
template.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
template.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
template.o: ../core/mounts.h ../core/mount.h ../core/users.h
template.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
template.o: ../core/sessionmanager.h ../core/sessioncontainer.h
template.o: ../core/system.h ../core/misc.h
template.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
template.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
template.o: ../core/loadavg.h ../core/sessionmanager.h
template.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
templates.o: templates.h ../../ezc/src/ezc.h 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
@@ -210,11 +213,11 @@ templates.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
templates.o: ../core/config.h ../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: ../core/mounts.h ../core/mount.h ../core/mountparser.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
@@ -244,13 +247,13 @@ thread.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
thread.o: ../core/config.h ../core/db.h ../core/group.h ../core/thread.h
thread.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
thread.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
thread.o: ../core/mounts.h ../core/mount.h ../core/users.h
thread.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
thread.o: ../core/sessionmanager.h ../core/sessioncontainer.h
thread.o: ../core/system.h ../core/misc.h ../functions/functions.h
thread.o: ../functions/functionbase.h ../core/item.h ../core/notify.h
thread.o: ../templatesnotify/templatesnotify.h ../core/mount.h
thread.o: ../templates/misc.h ../functions/functionparser.h
thread.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
thread.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
thread.o: ../core/loadavg.h ../core/sessionmanager.h
thread.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
thread.o: ../functions/functions.h ../functions/functionbase.h ../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
@@ -275,13 +278,13 @@ ticket.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
ticket.o: ../core/config.h ../core/db.h ../core/group.h ../core/thread.h
ticket.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
ticket.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
ticket.o: ../core/mounts.h ../core/mount.h ../core/users.h
ticket.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
ticket.o: ../core/sessionmanager.h ../core/sessioncontainer.h
ticket.o: ../core/system.h ../core/misc.h ../functions/functions.h
ticket.o: ../functions/functionbase.h ../core/item.h ../core/notify.h
ticket.o: ../templatesnotify/templatesnotify.h ../core/mount.h
ticket.o: ../templates/misc.h ../functions/functionparser.h
ticket.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
ticket.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
ticket.o: ../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
ticket.o: ../functions/ckeditor.h ../functions/cp.h
@@ -306,10 +309,10 @@ upload.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
upload.o: ../core/config.h ../core/db.h ../core/group.h ../core/thread.h
upload.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
upload.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
upload.o: ../core/mounts.h ../core/mount.h ../core/users.h
upload.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
upload.o: ../core/sessionmanager.h ../core/sessioncontainer.h
upload.o: ../core/system.h ../core/request.h
upload.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
upload.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
upload.o: ../core/loadavg.h ../core/sessionmanager.h
upload.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
uptime.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h
uptime.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h
uptime.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -320,10 +323,10 @@ uptime.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
uptime.o: ../core/config.h ../core/db.h ../core/group.h ../core/thread.h
uptime.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h
uptime.o: ../core/system.h ../core/dirs.h ../core/db.h ../core/request.h
uptime.o: ../core/mounts.h ../core/mount.h ../core/users.h
uptime.o: ../core/lastcontainer.h ../core/groups.h ../core/loadavg.h
uptime.o: ../core/sessionmanager.h ../core/sessioncontainer.h
uptime.o: ../core/system.h
uptime.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
uptime.o: ../core/users.h ../core/lastcontainer.h ../core/groups.h
uptime.o: ../core/loadavg.h ../core/sessionmanager.h
uptime.o: ../core/sessioncontainer.h ../core/system.h
user.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
user.o: localefilter.h ../core/locale.h ../core/confparser.h
user.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -334,10 +337,10 @@ user.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
user.o: ../core/db.h ../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
user.o: ../core/mount.h ../core/mountparser.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 ../core/confparser.h
who.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -348,9 +351,9 @@ who.o: ../core/plugindata.h ../core/rebus.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
who.o: ../core/mountparser.h ../core/users.h ../core/lastcontainer.h
who.o: ../core/groups.h ../core/loadavg.h ../core/sessionmanager.h
who.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
winix.o: templates.h ../../ezc/src/ezc.h 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
@@ -361,12 +364,12 @@ winix.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
winix.o: ../core/db.h ../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: ../core/mount.h ../core/mountparser.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
winix.o: ../functions/ckeditor.h ../functions/cp.h

14
templates/mount.cpp
View File

@@ -20,42 +20,42 @@ namespace TemplatesFunctions
void mount_page_is(Info & i)
{
i.res = system->mounts.pmount->IsArg(Mount::par_page, i.par);
i.res = system->mounts.pmount->IsArg(system->mounts.MountParPage(), i.par);
}
void mount_thread_is(Info & i)
{
i.res = system->mounts.pmount->IsArg(Mount::par_thread, i.par);
i.res = system->mounts.pmount->IsArg(system->mounts.MountParThread(), i.par);
}
void mount_type_is_thread(Info & i)
{
i.res = system->mounts.pmount->type == Mount::thread;
i.res = system->mounts.pmount->type == system->mounts.MountTypeThread();
}
void mount_type_is_ticket(Info & i)
{
i.res = system->mounts.pmount->type == Mount::ticket;
i.res = system->mounts.pmount->type == system->mounts.MountTypeTicket();
}
void mount_type_is_cms(Info & i)
{
i.res = system->mounts.pmount->type == Mount::cms;
i.res = system->mounts.pmount->type == system->mounts.MountTypeCms();
}
void mount_has_html_template(Info & i)
{
i.res = system->mounts.pmount->param[Mount::par_html_template].defined;
i.res = system->mounts.pmount->param[system->mounts.MountParHtmlTemplate()].defined;
}
void mount_first_html_template(Info & i)
{
Mount::ParamRow & par = system->mounts.pmount->param[Mount::par_html_template];
Mount::ParamRow & par = system->mounts.pmount->param[system->mounts.MountParHtmlTemplate()];
if( par.defined && !par.arg.empty() )
HtmlEscape(i.out, par.arg[0]);

2
templates/template.cpp
View File

@@ -66,7 +66,7 @@ void template_init()
temp_tab.clear();
temp_tab.push_back(config->templates_index);
Mount::ParamRow & par = system->mounts.pmount->param[Mount::par_html_template];
Mount::ParamRow & par = system->mounts.pmount->param[system->mounts.MountParHtmlTemplate()];
if( par.defined )
{

15
templates/templates.cpp
View File

@@ -574,15 +574,15 @@ using namespace TemplatesFunctions;
{
const Mount & mount = i->second;
if( mount.param[Mount::par_html_template].defined )
if( mount.param[TemplatesFunctions::system->mounts.MountParHtmlTemplate()].defined )
{
size_t len = mount.param[Mount::par_html_template].arg.size();
size_t len = mount.param[TemplatesFunctions::system->mounts.MountParHtmlTemplate()].arg.size();
size_t a;
// loop through all html_templates() values
for(a=0 ; a<len ; ++a)
{
const std::string & file_name = mount.param[Mount::par_html_template].arg[a];
const std::string & file_name = mount.param[TemplatesFunctions::system->mounts.MountParHtmlTemplate()].arg[a];
if( add_pattern )
index_patterns.AddPatternIfNotExists(file_name, locale, locale_filter, false); // file pattern will be unmarked
@@ -628,7 +628,14 @@ using namespace TemplatesFunctions;
if( !index_file_local )
index_file_local = TemplatesFunctions::system->mounts.pmount->FirstHtmlTemplate();
{
const std::string & temp = TemplatesFunctions::system->mounts.pmount->FirstArg(
TemplatesFunctions::system->mounts.MountParHtmlTemplate() );
if( !temp.empty() )
index_file_local = &temp;
}
if( index_file_local && *index_file_local != config->templates_index )

90
templates/ticket.cpp
View File

@@ -74,36 +74,36 @@ void ticket_can_edit(Info & i)
void ticket_type(Info & i)
{
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]);
if( functions->fun_ticket.ticket.type < system->mounts.pmount->param[system->mounts.MountParTicketType()].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketType()].arg[functions->fun_ticket.ticket.type]);
}
void ticket_status(Info & i)
{
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]);
if( functions->fun_ticket.ticket.status < system->mounts.pmount->param[system->mounts.MountParTicketStatus()].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketStatus()].arg[functions->fun_ticket.ticket.status]);
}
void ticket_priority(Info & i)
{
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]);
if( functions->fun_ticket.ticket.priority < system->mounts.pmount->param[system->mounts.MountParTicketPriority()].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketPriority()].arg[functions->fun_ticket.ticket.priority]);
}
void ticket_category(Info & i)
{
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]);
if( functions->fun_ticket.ticket.category < system->mounts.pmount->param[system->mounts.MountParTicketCategory()].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketCategory()].arg[functions->fun_ticket.ticket.category]);
}
void ticket_expected(Info & i)
{
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]);
if( functions->fun_ticket.ticket.expected < system->mounts.pmount->param[system->mounts.MountParTicketExpected()].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketExpected()].arg[functions->fun_ticket.ticket.expected]);
}
@@ -235,8 +235,8 @@ void ticket_tab_type(Info & i)
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]);
if( t.type < system->mounts.pmount->param[system->mounts.MountParTicketType()].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketType()].arg[t.type]);
}
@@ -247,8 +247,8 @@ void ticket_tab_status(Info & i)
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]);
if( t.status < system->mounts.pmount->param[system->mounts.MountParTicketStatus()].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketStatus()].arg[t.status]);
}
@@ -259,8 +259,8 @@ void ticket_tab_priority(Info & i)
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]);
if( t.priority < system->mounts.pmount->param[system->mounts.MountParTicketPriority()].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketPriority()].arg[t.priority]);
}
@@ -271,8 +271,8 @@ void ticket_tab_category(Info & i)
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]);
if( t.category < system->mounts.pmount->param[system->mounts.MountParTicketCategory()].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketCategory()].arg[t.category]);
}
@@ -283,8 +283,8 @@ void ticket_tab_expected(Info & i)
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]);
if( t.expected < system->mounts.pmount->param[system->mounts.MountParTicketExpected()].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketExpected()].arg[t.expected]);
}
@@ -317,13 +317,13 @@ void ticket_type_tab(Info & i)
{
ticket_type_tab_ind = i.iter;
i.res = ticket_type_tab_ind < system->mounts.pmount->param[Mount::par_ticket_type].arg.size();
i.res = ticket_type_tab_ind < system->mounts.pmount->param[system->mounts.MountParTicketType()].arg.size();
}
void ticket_type_tab_defined(Info & i)
{
i.res = system->mounts.pmount->param[Mount::par_ticket_type].defined;
i.res = system->mounts.pmount->param[system->mounts.MountParTicketType()].defined;
}
@@ -335,7 +335,7 @@ void ticket_type_tab_isdefault(Info & i)
}
else
{
Mount::ParamRow & p = system->mounts.pmount->param[Mount::par_ticket_type_default];
Mount::ParamRow & p = system->mounts.pmount->param[system->mounts.MountParTicketTypeDefault()];
if( !p.defined || p.arg.empty() )
return; // default false
@@ -354,8 +354,8 @@ void ticket_type_tab_index(Info & i)
void ticket_type_tab_name(Info & i)
{
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]);
if( ticket_type_tab_ind < system->mounts.pmount->param[system->mounts.MountParTicketType()].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketType()].arg[ticket_type_tab_ind]);
}
@@ -369,13 +369,13 @@ void ticket_status_tab(Info & i)
{
ticket_status_tab_ind = i.iter;
i.res = ticket_status_tab_ind < system->mounts.pmount->param[Mount::par_ticket_status].arg.size();
i.res = ticket_status_tab_ind < system->mounts.pmount->param[system->mounts.MountParTicketStatus()].arg.size();
}
void ticket_status_tab_defined(Info & i)
{
i.res = system->mounts.pmount->param[Mount::par_ticket_status].defined;
i.res = system->mounts.pmount->param[system->mounts.MountParTicketStatus()].defined;
}
@@ -387,7 +387,7 @@ void ticket_status_tab_isdefault(Info & i)
}
else
{
Mount::ParamRow & p = system->mounts.pmount->param[Mount::par_ticket_status_default];
Mount::ParamRow & p = system->mounts.pmount->param[system->mounts.MountParTicketStatusDefault()];
if( !p.defined || p.arg.empty() )
return; // default false
@@ -406,8 +406,8 @@ void ticket_status_tab_index(Info & i)
void ticket_status_tab_name(Info & i)
{
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]);
if( ticket_status_tab_ind < system->mounts.pmount->param[system->mounts.MountParTicketStatus()].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketStatus()].arg[ticket_status_tab_ind]);
}
@@ -420,13 +420,13 @@ void ticket_priority_tab(Info & i)
{
ticket_priority_tab_ind = i.iter;
i.res = ticket_priority_tab_ind < system->mounts.pmount->param[Mount::par_ticket_priority].arg.size();
i.res = ticket_priority_tab_ind < system->mounts.pmount->param[system->mounts.MountParTicketPriority()].arg.size();
}
void ticket_priority_tab_defined(Info & i)
{
i.res = system->mounts.pmount->param[Mount::par_ticket_priority].defined;
i.res = system->mounts.pmount->param[system->mounts.MountParTicketPriority()].defined;
}
@@ -438,7 +438,7 @@ void ticket_priority_tab_isdefault(Info & i)
}
else
{
Mount::ParamRow & p = system->mounts.pmount->param[Mount::par_ticket_priority_default];
Mount::ParamRow & p = system->mounts.pmount->param[system->mounts.MountParTicketPriorityDefault()];
if( !p.defined || p.arg.empty() )
return; // default false
@@ -457,8 +457,8 @@ void ticket_priority_tab_index(Info & i)
void ticket_priority_tab_name(Info & i)
{
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]);
if( ticket_priority_tab_ind < system->mounts.pmount->param[system->mounts.MountParTicketPriority()].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketPriority()].arg[ticket_priority_tab_ind]);
}
@@ -471,13 +471,13 @@ void ticket_category_tab(Info & i)
{
ticket_category_tab_ind = i.iter;
i.res = ticket_category_tab_ind < system->mounts.pmount->param[Mount::par_ticket_category].arg.size();
i.res = ticket_category_tab_ind < system->mounts.pmount->param[system->mounts.MountParTicketCategory()].arg.size();
}
void ticket_category_tab_defined(Info & i)
{
i.res = system->mounts.pmount->param[Mount::par_ticket_category].defined;
i.res = system->mounts.pmount->param[system->mounts.MountParTicketCategory()].defined;
}
@@ -489,7 +489,7 @@ void ticket_category_tab_isdefault(Info & i)
}
else
{
Mount::ParamRow & p = system->mounts.pmount->param[Mount::par_ticket_category_default];
Mount::ParamRow & p = system->mounts.pmount->param[system->mounts.MountParTicketCategoryDefault()];
if( !p.defined || p.arg.empty() )
return; // default false
@@ -508,8 +508,8 @@ void ticket_category_tab_index(Info & i)
void ticket_category_tab_name(Info & i)
{
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]);
if( ticket_category_tab_ind < system->mounts.pmount->param[system->mounts.MountParTicketCategory()].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketCategory()].arg[ticket_category_tab_ind]);
}
@@ -523,13 +523,13 @@ void ticket_expected_tab(Info & i)
{
ticket_expected_tab_ind = i.iter;
i.res = ticket_expected_tab_ind < system->mounts.pmount->param[Mount::par_ticket_expected].arg.size();
i.res = ticket_expected_tab_ind < system->mounts.pmount->param[system->mounts.MountParTicketExpected()].arg.size();
}
void ticket_expected_tab_defined(Info & i)
{
i.res = system->mounts.pmount->param[Mount::par_ticket_expected].defined;
i.res = system->mounts.pmount->param[system->mounts.MountParTicketExpected()].defined;
}
@@ -541,7 +541,7 @@ void ticket_expected_tab_isdefault(Info & i)
}
else
{
Mount::ParamRow & p = system->mounts.pmount->param[Mount::par_ticket_expected_default];
Mount::ParamRow & p = system->mounts.pmount->param[system->mounts.MountParTicketExpectedDefault()];
if( !p.defined || p.arg.empty() )
return; // default false
@@ -560,8 +560,8 @@ void ticket_expected_tab_index(Info & i)
void ticket_expected_tab_name(Info & i)
{
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]);
if( ticket_expected_tab_ind < system->mounts.pmount->param[system->mounts.MountParTicketExpected()].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[system->mounts.MountParTicketExpected()].arg[ticket_expected_tab_ind]);
}