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

changed: added Cur structure

Browse Source 
we have there two pointers: 
 Request * request;
 Session * session;
these are the current request and the current session


the session GC was moved to SessionManager (was in SessionContainer)



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@708 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2011-01-23 14:15:30 +00:00
parent 61ac29b2de
commit 915cabdf97
171 changed files with 2822 additions and 2650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

344
templates/Makefile.dep
View File

@@ -12,18 +12,19 @@ adduser.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h
adduser.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
adduser.o: ../core/log.h ../db/dbitemquery.h ../db/dbitemcolumns.h
adduser.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h
adduser.o: ../core/request.h ../core/requesttypes.h ../core/session.h
adduser.o: ../core/error.h ../core/user.h ../core/plugindata.h
adduser.o: ../core/rebus.h ../core/config.h ../templates/htmltextstream.h
adduser.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
adduser.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h
adduser.o: ../core/cur.h ../core/request.h ../core/requesttypes.h
adduser.o: ../core/error.h ../core/config.h ../templates/htmltextstream.h
adduser.o: ../core/session.h ../core/user.h ../core/plugindata.h
adduser.o: ../core/rebus.h ../core/system.h ../core/dirs.h
adduser.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
adduser.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h
adduser.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
adduser.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
adduser.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
adduser.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
adduser.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h
adduser.o: ../core/sessioncontainer.h ../core/system.h
adduser.o: ../core/cur.h ../core/mounts.h ../core/mount.h
adduser.o: ../core/mountparser.h ../core/users.h ../core/groups.h
adduser.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
adduser.o: ../core/basethread.h ../core/sessionmanager.h
adduser.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
dir.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
dir.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
dir.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
@@ -35,20 +36,20 @@ dir.o: indexpatterns.h ../core/config.h ../core/confparser.h
dir.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
dir.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h
dir.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
dir.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
dir.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h
dir.o: ../core/rebus.h ../core/config.h ../templates/htmltextstream.h
dir.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
dir.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h
dir.o: ../core/ugcontainer.h ../core/cur.h ../core/request.h
dir.o: ../core/requesttypes.h ../core/error.h ../core/config.h
dir.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
dir.o: ../core/plugindata.h ../core/rebus.h ../core/system.h ../core/dirs.h
dir.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
dir.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h
dir.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
dir.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
dir.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h ../core/users.h
dir.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
dir.o: ../core/basethread.h ../core/sessionmanager.h
dir.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h
dir.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
dir.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h
dir.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
dir.o: ../functions/functions.h ../functions/functionbase.h ../core/synchro.h
dir.o: ../functions/functionparser.h ../functions/adduser.h
dir.o: ../functions/functions.h ../functions/functionbase.h ../core/request.h
dir.o: ../core/synchro.h ../functions/functionparser.h ../functions/adduser.h
dir.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
dir.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
dir.o: ../functions/default.h ../functions/download.h ../functions/emacs.h
@@ -71,17 +72,17 @@ doc.o: indexpatterns.h ../core/config.h ../core/confparser.h
doc.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
doc.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h
doc.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
doc.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
doc.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h
doc.o: ../core/rebus.h ../core/config.h ../templates/htmltextstream.h
doc.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
doc.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h
doc.o: ../core/ugcontainer.h ../core/cur.h ../core/request.h
doc.o: ../core/requesttypes.h ../core/error.h ../core/config.h
doc.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
doc.o: ../core/plugindata.h ../core/rebus.h ../core/system.h ../core/dirs.h
doc.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
doc.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h
doc.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
doc.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
doc.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h ../core/users.h
doc.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
doc.o: ../core/basethread.h ../core/sessionmanager.h
doc.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h
doc.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
doc.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h
doc.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
doc.o: ../core/misc.h
htmltextstream.o: htmltextstream.h ../core/textstream.h misc.h localefilter.h
@@ -109,20 +110,20 @@ item.o: ../core/textstream.h indexpatterns.h ../core/config.h
item.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
item.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
item.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
item.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
item.o: ../core/requesttypes.h ../core/session.h ../core/error.h
item.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
item.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h
item.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h
item.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
item.o: ../core/request.h ../core/requesttypes.h ../core/error.h
item.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h
item.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/system.h
item.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
item.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h
item.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
item.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
item.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
item.o: ../core/mountparser.h ../core/users.h ../core/groups.h
item.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
item.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h
item.o: ../core/mount.h ../core/mountparser.h ../core/users.h
item.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
item.o: ../core/basethread.h ../core/sessionmanager.h
item.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
item.o: ../core/bbcodeparser.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 ../../ezc/src/utf8.h
last.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
last.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
@@ -134,17 +135,17 @@ last.o: ../core/textstream.h indexpatterns.h ../core/config.h
last.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
last.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
last.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
last.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
last.o: ../core/requesttypes.h ../core/session.h ../core/error.h
last.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
last.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h
last.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h
last.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
last.o: ../core/request.h ../core/requesttypes.h ../core/error.h
last.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h
last.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/system.h
last.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
last.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h
last.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
last.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
last.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
last.o: ../core/mountparser.h ../core/users.h ../core/groups.h
last.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
last.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h
last.o: ../core/mount.h ../core/mountparser.h ../core/users.h
last.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
last.o: ../core/basethread.h ../core/sessionmanager.h
last.o: ../core/sessioncontainer.h ../core/system.h ../core/lastcontainer.h
last.o: ../core/request.h ../core/misc.h
@@ -166,17 +167,17 @@ ls.o: indexpatterns.h ../core/config.h ../core/confparser.h
ls.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
ls.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h
ls.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
ls.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
ls.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h
ls.o: ../core/rebus.h ../core/config.h ../templates/htmltextstream.h
ls.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
ls.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h
ls.o: ../core/ugcontainer.h ../core/cur.h ../core/request.h
ls.o: ../core/requesttypes.h ../core/error.h ../core/config.h
ls.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
ls.o: ../core/plugindata.h ../core/rebus.h ../core/system.h ../core/dirs.h
ls.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
ls.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h
ls.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
ls.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
ls.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h ../core/users.h
ls.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
ls.o: ../core/basethread.h ../core/sessionmanager.h
ls.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h
ls.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
ls.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h
ls.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
misc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
misc.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
@@ -189,19 +190,20 @@ misc.o: ../core/textstream.h indexpatterns.h ../core/config.h
misc.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
misc.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
misc.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
misc.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
misc.o: ../core/requesttypes.h ../core/session.h ../core/error.h
misc.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
misc.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h
misc.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h
misc.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
misc.o: ../core/request.h ../core/requesttypes.h ../core/error.h
misc.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h
misc.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/system.h
misc.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
misc.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h
misc.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
misc.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
misc.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
misc.o: ../core/mountparser.h ../core/users.h ../core/groups.h
misc.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
misc.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h
misc.o: ../core/mount.h ../core/mountparser.h ../core/users.h
misc.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
misc.o: ../core/basethread.h ../core/sessionmanager.h
misc.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
misc.o: ../core/request.h
mount.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
mount.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
mount.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
@@ -213,17 +215,17 @@ mount.o: ../core/textstream.h indexpatterns.h ../core/config.h
mount.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
mount.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
mount.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
mount.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
mount.o: ../core/requesttypes.h ../core/session.h ../core/error.h
mount.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
mount.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h
mount.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h
mount.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
mount.o: ../core/request.h ../core/requesttypes.h ../core/error.h
mount.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h
mount.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/system.h
mount.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
mount.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h
mount.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
mount.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
mount.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
mount.o: ../core/mountparser.h ../core/users.h ../core/groups.h
mount.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
mount.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h
mount.o: ../core/mount.h ../core/mountparser.h ../core/users.h
mount.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
mount.o: ../core/basethread.h ../core/sessionmanager.h
mount.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
patterncacher.o: patterncacher.h ../core/item.h misc.h localefilter.h
@@ -245,20 +247,20 @@ priv.o: ../core/textstream.h indexpatterns.h ../core/config.h
priv.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
priv.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
priv.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
priv.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
priv.o: ../core/requesttypes.h ../core/session.h ../core/error.h
priv.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
priv.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h
priv.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h
priv.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
priv.o: ../core/request.h ../core/requesttypes.h ../core/error.h
priv.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h
priv.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/system.h
priv.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
priv.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h
priv.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
priv.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
priv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
priv.o: ../core/mountparser.h ../core/users.h ../core/groups.h
priv.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
priv.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h
priv.o: ../core/mount.h ../core/mountparser.h ../core/users.h
priv.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
priv.o: ../core/basethread.h ../core/sessionmanager.h
priv.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
priv.o: ../functions/functions.h ../functions/functionbase.h
priv.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
priv.o: ../core/misc.h ../functions/functions.h ../functions/functionbase.h
priv.o: ../core/synchro.h ../functions/functionparser.h
priv.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
priv.o: ../functions/privchanger.h ../functions/chown.h
@@ -283,17 +285,17 @@ rebus.o: ../core/textstream.h indexpatterns.h ../core/config.h
rebus.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
rebus.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
rebus.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
rebus.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
rebus.o: ../core/requesttypes.h ../core/session.h ../core/error.h
rebus.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
rebus.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h
rebus.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h
rebus.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
rebus.o: ../core/request.h ../core/requesttypes.h ../core/error.h
rebus.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h
rebus.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/system.h
rebus.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
rebus.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h
rebus.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
rebus.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
rebus.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
rebus.o: ../core/mountparser.h ../core/users.h ../core/groups.h
rebus.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
rebus.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h
rebus.o: ../core/mount.h ../core/mountparser.h ../core/users.h
rebus.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
rebus.o: ../core/basethread.h ../core/sessionmanager.h
rebus.o: ../core/sessioncontainer.h ../core/system.h
stat.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
@@ -307,19 +309,20 @@ stat.o: ../core/textstream.h indexpatterns.h ../core/config.h
stat.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
stat.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
stat.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
stat.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
stat.o: ../core/requesttypes.h ../core/session.h ../core/error.h
stat.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
stat.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h
stat.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h
stat.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
stat.o: ../core/request.h ../core/requesttypes.h ../core/error.h
stat.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h
stat.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/system.h
stat.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
stat.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h
stat.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
stat.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
stat.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
stat.o: ../core/mountparser.h ../core/users.h ../core/groups.h
stat.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
stat.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h
stat.o: ../core/mount.h ../core/mountparser.h ../core/users.h
stat.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
stat.o: ../core/basethread.h ../core/sessionmanager.h
stat.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
stat.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
stat.o: ../core/misc.h
sys.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
sys.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
sys.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
@@ -331,17 +334,17 @@ sys.o: indexpatterns.h ../core/config.h ../core/confparser.h
sys.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
sys.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h
sys.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
sys.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
sys.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h
sys.o: ../core/rebus.h ../core/config.h ../templates/htmltextstream.h
sys.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
sys.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h
sys.o: ../core/ugcontainer.h ../core/cur.h ../core/request.h
sys.o: ../core/requesttypes.h ../core/error.h ../core/config.h
sys.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
sys.o: ../core/plugindata.h ../core/rebus.h ../core/system.h ../core/dirs.h
sys.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
sys.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h
sys.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
sys.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
sys.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h ../core/users.h
sys.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
sys.o: ../core/basethread.h ../core/sessionmanager.h
sys.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h
sys.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
sys.o: ../core/thumb.h ../core/basethread.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 ../../ezc/src/utf8.h
@@ -356,18 +359,18 @@ template.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
template.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
template.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
template.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
template.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
template.o: ../core/session.h ../core/error.h ../core/user.h
template.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
template.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h
template.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h
template.o: ../core/ugcontainer.h ../core/cur.h ../core/request.h
template.o: ../core/requesttypes.h ../core/error.h ../core/config.h
template.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
template.o: ../core/plugindata.h ../core/rebus.h ../core/system.h
template.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
template.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h
template.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
template.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
template.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
template.o: ../core/mountparser.h ../core/users.h ../core/groups.h
template.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
template.o: ../core/basethread.h ../core/sessionmanager.h
template.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h
template.o: ../core/mount.h ../core/mountparser.h ../core/users.h
template.o: ../core/groups.h ../core/group.h ../core/loadavg.h
template.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h
template.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
templates.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
templates.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
@@ -381,23 +384,25 @@ templates.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
templates.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
templates.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
templates.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
templates.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
templates.o: ../core/session.h ../core/error.h ../core/user.h
templates.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
templates.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h
templates.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h
templates.o: ../core/ugcontainer.h ../core/cur.h ../core/request.h
templates.o: ../core/requesttypes.h ../core/error.h ../core/config.h
templates.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
templates.o: ../core/plugindata.h ../core/rebus.h ../core/system.h
templates.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
templates.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h
templates.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
templates.o: ../notify/templatesnotify.h ../core/users.h
templates.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
templates.o: ../core/mount.h ../core/mountparser.h ../core/users.h
templates.o: ../core/groups.h ../core/group.h ../core/loadavg.h
templates.o: ../core/thumb.h ../core/basethread.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/ugcontainer.h ../core/lastcontainer.h ../core/cur.h
templates.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
templates.o: ../core/users.h ../core/groups.h ../core/group.h
templates.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.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/synchro.h ../functions/functionparser.h
templates.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
templates.o: ../core/request.h ../core/synchro.h
templates.o: ../functions/functionparser.h ../functions/adduser.h
templates.o: ../functions/cat.h ../functions/chmod.h
templates.o: ../functions/privchanger.h ../functions/chown.h
templates.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h
templates.o: ../functions/download.h ../functions/emacs.h ../functions/last.h
@@ -421,18 +426,18 @@ upload.o: ../core/textstream.h indexpatterns.h ../core/config.h
upload.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
upload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
upload.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
upload.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
upload.o: ../core/requesttypes.h ../core/session.h ../core/error.h
upload.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
upload.o: ../core/request.h ../core/requesttypes.h ../core/error.h
upload.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h
upload.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
upload.o: ../core/config.h ../templates/htmltextstream.h ../core/system.h
upload.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
upload.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
upload.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h
upload.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h
upload.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h
upload.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
upload.o: ../core/mount.h ../core/mountparser.h ../core/users.h
upload.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
upload.o: ../core/basethread.h ../core/sessionmanager.h
upload.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/cur.h
upload.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
upload.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
upload.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h
upload.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
uptime.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
uptime.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
@@ -445,18 +450,18 @@ uptime.o: ../core/textstream.h indexpatterns.h ../core/config.h
uptime.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
uptime.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
uptime.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
uptime.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
uptime.o: ../core/requesttypes.h ../core/session.h ../core/error.h
uptime.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
uptime.o: ../core/request.h ../core/requesttypes.h ../core/error.h
uptime.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h
uptime.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
uptime.o: ../core/config.h ../templates/htmltextstream.h ../core/system.h
uptime.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
uptime.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
uptime.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h
uptime.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h
uptime.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h
uptime.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h
uptime.o: ../core/mount.h ../core/mountparser.h ../core/users.h
uptime.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
uptime.o: ../core/basethread.h ../core/sessionmanager.h
uptime.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/cur.h
uptime.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
uptime.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
uptime.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h
uptime.o: ../core/sessioncontainer.h ../core/system.h
user.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
user.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
@@ -469,17 +474,17 @@ user.o: ../core/textstream.h indexpatterns.h ../core/config.h
user.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
user.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
user.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
user.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
user.o: ../core/requesttypes.h ../core/session.h ../core/error.h
user.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
user.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h
user.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h
user.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
user.o: ../core/request.h ../core/requesttypes.h ../core/error.h
user.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h
user.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/system.h
user.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
user.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h
user.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
user.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
user.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
user.o: ../core/mountparser.h ../core/users.h ../core/groups.h
user.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
user.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h
user.o: ../core/mount.h ../core/mountparser.h ../core/users.h
user.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
user.o: ../core/basethread.h ../core/sessionmanager.h
user.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
user.o: ../core/misc.h
@@ -494,18 +499,19 @@ who.o: indexpatterns.h ../core/config.h ../core/confparser.h
who.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
who.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h
who.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h
who.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
who.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h
who.o: ../core/rebus.h ../core/config.h ../templates/htmltextstream.h
who.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
who.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h
who.o: ../core/ugcontainer.h ../core/cur.h ../core/request.h
who.o: ../core/requesttypes.h ../core/error.h ../core/config.h
who.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h
who.o: ../core/plugindata.h ../core/rebus.h ../core/system.h ../core/dirs.h
who.o: ../core/dircontainer.h ../notify/notify.h ../notify/notifypool.h
who.o: ../templates/locale.h ../templates/misc.h ../notify/notifythread.h
who.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h
who.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
who.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h ../core/users.h
who.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
who.o: ../core/basethread.h ../core/sessionmanager.h
who.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
who.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h
who.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h
who.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h
who.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
who.o: ../core/misc.h
winix.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
winix.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
winix.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
@@ -517,20 +523,20 @@ winix.o: ../core/textstream.h indexpatterns.h ../core/config.h
winix.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
winix.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h ../core/log.h
winix.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
winix.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
winix.o: ../core/requesttypes.h ../core/session.h ../core/error.h
winix.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
winix.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h
winix.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h
winix.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h
winix.o: ../core/request.h ../core/requesttypes.h ../core/error.h
winix.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h
winix.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/system.h
winix.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h
winix.o: ../notify/notifypool.h ../templates/locale.h ../templates/misc.h
winix.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h
winix.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h
winix.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
winix.o: ../core/mountparser.h ../core/users.h ../core/groups.h
winix.o: ../core/group.h ../core/loadavg.h ../core/thumb.h
winix.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h
winix.o: ../core/mount.h ../core/mountparser.h ../core/users.h
winix.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h
winix.o: ../core/basethread.h ../core/sessionmanager.h
winix.o: ../core/sessioncontainer.h ../core/system.h ../core/plugin.h
winix.o: ../core/pluginmsg.h ../core/sessionmanager.h
winix.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
winix.o: ../core/plugin.h ../core/pluginmsg.h ../core/sessionmanager.h
winix.o: ../functions/functions.h ../functions/functionbase.h
winix.o: ../core/synchro.h ../functions/functionparser.h
winix.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h

4
templates/adduser.cpp
View File

@@ -17,13 +17,13 @@ namespace TemplatesFunctions
void adduser_last_login(Info & i)
{
i.out << request->PostVar(L"login");
i.out << cur->request->PostVar(L"login");
}
void adduser_last_email(Info & i)
{
i.out << request->PostVar(L"email");
i.out << cur->request->PostVar(L"email");
}

4
templates/ckeditorgetparser.h
View File

@@ -7,8 +7,8 @@
*
*/
#ifndef headerfilecmslutemplatesckeditorgetparser
#define headerfilecmslutemplatesckeditorgetparser
#ifndef headerfile_winix_templates_ckeditorgetparser
#define headerfile_winix_templates_ckeditorgetparser
#include <string>

100
templates/dir.cpp
View File

@@ -19,18 +19,18 @@ namespace TemplatesFunctions
void dir(Info & i)
{
for(size_t a=0 ; a<request->dir_tab.size() ; ++a)
i.out << request->dir_tab[a]->url << '/';
for(size_t a=0 ; a<cur->request->dir_tab.size() ; ++a)
i.out << cur->request->dir_tab[a]->url << '/';
}
void dir_without_slash(Info & i)
{
for(size_t a=0 ; a<request->dir_tab.size() ; ++a)
for(size_t a=0 ; a<cur->request->dir_tab.size() ; ++a)
{
i.out << request->dir_tab[a]->url;
i.out << cur->request->dir_tab[a]->url;
if( a < request->dir_tab.size()-1 )
if( a < cur->request->dir_tab.size()-1 )
i.out << '/';
}
}
@@ -38,32 +38,32 @@ void dir_without_slash(Info & i)
void dir_is_root(Info & i)
{
i.res = request->dir_tab.size() == 1;
i.res = cur->request->dir_tab.size() == 1;
}
void dir_parent(Info & i)
{
if( request->dir_tab.empty() )
if( cur->request->dir_tab.empty() )
return;
for(size_t a=0 ; a<request->dir_tab.size()-1 ; ++a)
for(size_t a=0 ; a<cur->request->dir_tab.size()-1 ; ++a)
{
i.out << request->dir_tab[a]->url << '/';
i.out << cur->request->dir_tab[a]->url << '/';
}
}
void dir_parent_without_slash(Info & i)
{
if( request->dir_tab.empty() )
if( cur->request->dir_tab.empty() )
return;
for(size_t a=0 ; a<request->dir_tab.size()-1 ; ++a)
for(size_t a=0 ; a<cur->request->dir_tab.size()-1 ; ++a)
{
i.out << request->dir_tab[a]->url;
i.out << cur->request->dir_tab[a]->url;
if( request->dir_tab.size()>=2 && a<request->dir_tab.size()-2 )
if( cur->request->dir_tab.size()>=2 && a<cur->request->dir_tab.size()-2 )
i.out << '/';
}
}
@@ -75,9 +75,9 @@ void dir_can_read_exec(Info & i)
{
bool result = true;
for(size_t a=0 ; a<request->dir_tab.size() ; ++a)
for(size_t a=0 ; a<cur->request->dir_tab.size() ; ++a)
{
if( !system->HasReadExecAccess(*request->dir_tab[a]) )
if( !system->HasReadExecAccess(*cur->request->dir_tab[a]) )
{
result = false;
break;
@@ -90,7 +90,7 @@ bool result = true;
void dir_can_write(Info & i)
{
i.res = system->HasWriteAccess(*request->dir_tab.back());
i.res = system->HasWriteAccess(*cur->request->dir_tab.back());
}
@@ -99,16 +99,16 @@ void dir_can_remove(Info & i)
bool result = true;
if( request->dir_tab.size() == 1 )
if( cur->request->dir_tab.size() == 1 )
{
// rm for the root dir
// only the superuser can do it
if( !request->session->puser || !request->session->puser->super_user )
if( !cur->session->puser || !cur->session->puser->super_user )
result = false;
}
else
{
Item * last_but_one_dir = *(--(--request->dir_tab.end()));
Item * last_but_one_dir = *(--(--cur->request->dir_tab.end()));
if( !system->HasWriteAccess(*last_but_one_dir) )
result = false;
@@ -133,7 +133,7 @@ void dir_can_use_mkdir(Info & i)
static std::vector<Item*> dir_childs_table;
static size_t dir_childs_index;
// request->id is never 0 and we can start dir_childs_reqid from 0
// cur->request->id is never 0 and we can start dir_childs_reqid from 0
static size_t dir_childs_reqid = 0;
// is the first directory the parent ('..')
@@ -142,22 +142,22 @@ static bool dir_childs_has_parent;
void dir_childs_tab(Info & i)
{
if( dir_childs_reqid != request->id )
if( dir_childs_reqid != cur->request->id )
{
dir_childs_reqid = request->id;
dir_childs_reqid = cur->request->id;
dir_childs_table.clear();
dir_childs_has_parent = false;
if( !request->dir_tab.empty() )
if( !cur->request->dir_tab.empty() )
{
if( request->dir_tab.size() >= 2 && i.par == L"with_parent")
if( cur->request->dir_tab.size() >= 2 && i.par == L"with_parent")
{
Item * dir_up = request->dir_tab[request->dir_tab.size()-2];
Item * dir_up = cur->request->dir_tab[cur->request->dir_tab.size()-2];
dir_childs_table.push_back(dir_up);
dir_childs_has_parent = true;
}
system->dirs.GetDirChilds(request->dir_tab.back()->id, dir_childs_table);
system->dirs.GetDirChilds(cur->request->dir_tab.back()->id, dir_childs_table);
}
}
@@ -236,14 +236,14 @@ static size_t dir_index;
void dir_tab(Info & i)
{
dir_index = i.iter;
i.res = dir_index < request->dir_tab.size();
i.res = dir_index < cur->request->dir_tab.size();
}
void dir_tab_url(Info & i)
{
if( dir_index < request->dir_tab.size() )
i.out << request->dir_tab[dir_index]->url;
if( dir_index < cur->request->dir_tab.size() )
i.out << cur->request->dir_tab[dir_index]->url;
}
@@ -251,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_tab.size() ; ++a)
for(size_t a = 0 ; a <= dir_index && a < cur->request->dir_tab.size() ; ++a)
{
i.out << request->dir_tab[a]->url;
i.out << cur->request->dir_tab[a]->url;
i.out << '/';
}
}
@@ -262,25 +262,25 @@ void dir_tab_link(Info & i)
void dir_last_link_to(Info & i)
{
i.out << request->dir_tab.back()->link_to;
i.out << cur->request->dir_tab.back()->link_to;
}
void dir_last_is_link_redirect(Info & i)
{
i.res = request->dir_tab.back()->link_redirect == 1;
i.res = cur->request->dir_tab.back()->link_redirect == 1;
}
void dir_last_subject(Info & i)
{
i.out << request->dir_tab.back()->subject;
i.out << cur->request->dir_tab.back()->subject;
}
void dir_last_user(Info & i)
{
User * puser = system->users.GetUser(request->dir_tab.back()->user_id);
User * puser = system->users.GetUser(cur->request->dir_tab.back()->user_id);
if( puser )
i.out << puser->name;
@@ -288,8 +288,8 @@ void dir_last_user(Info & i)
{
i.out << "~";
if( !request->dir_tab.back()->guest_name.empty() )
i.out << request->dir_tab.back()->guest_name;
if( !cur->request->dir_tab.back()->guest_name.empty() )
i.out << cur->request->dir_tab.back()->guest_name;
else
i.out << "guest"; // !! dodac do konfiga
}
@@ -298,47 +298,47 @@ void dir_last_user(Info & i)
void dir_last_url(Info & i)
{
i.out << request->dir_tab.back()->url;
i.out << cur->request->dir_tab.back()->url;
}
void dir_last_url_is(Info & i)
{
i.res = request->dir_tab.back()->url == i.par;
i.res = cur->request->dir_tab.back()->url == i.par;
}
void dir_last_date_creation(Info & i)
{
tm rtm = system->LocalTime(request->dir_tab.back()->date_creation);
tm rtm = system->LocalTime(cur->request->dir_tab.back()->date_creation);
i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
}
void dir_last_date_modification(Info & i)
{
tm rtm = system->LocalTime(request->dir_tab.back()->date_modification);
tm rtm = system->LocalTime(cur->request->dir_tab.back()->date_modification);
i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
}
void dir_last_date_creation_nice(Info & i)
{
print_date_nice(i, request->dir_tab.back()->date_creation);
print_date_nice(i, cur->request->dir_tab.back()->date_creation);
}
void dir_last_date_modification_nice(Info & i)
{
print_date_nice(i, request->dir_tab.back()->date_modification);
print_date_nice(i, cur->request->dir_tab.back()->date_modification);
}
void dir_last_dates_equal(Info & i)
{
tm * ptm1 = &request->dir_tab.back()->date_creation;
tm * ptm2 = &request->dir_tab.back()->date_modification;
tm * ptm1 = &cur->request->dir_tab.back()->date_creation;
tm * ptm2 = &cur->request->dir_tab.back()->date_modification;
i.res = ptm1->tm_year == ptm2->tm_year &&
ptm1->tm_mon == ptm2->tm_mon &&
@@ -351,26 +351,26 @@ void dir_last_dates_equal(Info & i)
void dir_last_users_different(Info & i)
{
i.res = (request->dir_tab.back()->user_id != request->dir_tab.back()->modification_user_id);
i.res = (cur->request->dir_tab.back()->user_id != cur->request->dir_tab.back()->modification_user_id);
}
void dir_last_modification_user(Info & i)
{
User * puser = system->users.GetUser(request->dir_tab.back()->modification_user_id);
print_user_name(i, puser, request->dir_tab.back()->guest_name);
User * puser = system->users.GetUser(cur->request->dir_tab.back()->modification_user_id);
print_user_name(i, puser, cur->request->dir_tab.back()->guest_name);
}
void dir_last_html_template(Info & i)
{
i.out << request->dir_tab.back()->html_template;
i.out << cur->request->dir_tab.back()->html_template;
}
void dir_last_has_html_template(Info & i)
{
i.res = !request->dir_tab.back()->html_template.empty();
i.res = !cur->request->dir_tab.back()->html_template.empty();
}

12
templates/doc.cpp
View File

@@ -27,21 +27,21 @@ void doc_title(Info & i)
bool was_dir = false;
// from 1 means skipping the root directory
for(a = 1 ; a<request->dir_tab.size() ; ++a)
for(a = 1 ; a<cur->request->dir_tab.size() ; ++a)
{
i.out << request->dir_tab[a]->subject;
i.out << cur->request->dir_tab[a]->subject;
was_dir = true;
if( a < request->dir_tab.size()-1 )
if( a < cur->request->dir_tab.size()-1 )
i.out << config->title_separator;
}
if( request->is_item )
if( cur->request->is_item )
{
if( was_dir )
i.out << config->title_separator;
i.out << request->item.subject;
i.out << cur->request->item.subject;
}
}
@@ -71,7 +71,7 @@ void doc_base_url_common(Info & i)
void doc_current_url(Info & i)
{
i.out << request->env_request_uri;
i.out << cur->request->env_request_uri;
}

4
templates/indexpatterns.h
View File

@@ -7,8 +7,8 @@
*
*/
#ifndef headerfilecmslutemplatesindexpatterns
#define headerfilecmslutemplatesindexpatterns
#ifndef headerfile_winix_templates_indexpatterns
#define headerfile_winix_templates_indexpatterns
#include <string>
#include <vector>

226
templates/item.cpp
View File

@@ -28,41 +28,41 @@ static EzcGen ezc_generator;
void item_is(Info & i)
{
i.res = request->is_item;
i.res = cur->request->is_item;
}
void item_id(Info & i)
{
i.out << request->item.id;
i.out << cur->request->item.id;
}
void item_subject(Info & i)
{
i.out << request->item.subject;
i.out << cur->request->item.subject;
}
void item_subject_noescape(Info & i)
{
i.out << R(request->item.subject);
i.out << R(cur->request->item.subject);
}
void item_content(Info & i)
{
i.out << request->item.content;
i.out << cur->request->item.content;
}
void item_content_noescape(Info & i)
{
i.out << R(request->item.content);
i.out << R(cur->request->item.content);
}
@@ -89,7 +89,7 @@ void item_content_type_is(Item & item, Info & i)
void item_content_type_is(Info & i)
{
item_content_type_is(request->item, i);
item_content_type_is(cur->request->item, i);
}
@@ -124,19 +124,19 @@ void item_print_content(HtmlTextStream & out, const std::wstring & content, Item
void item_content_is_empty(Info & i)
{
i.res = request->item.content.empty();
i.res = cur->request->item.content.empty();
}
void item_print_content(Info & i)
{
item_print_content(i.out, request->item.content, request->item.content_type);
item_print_content(i.out, cur->request->item.content, cur->request->item.content_type);
}
void item_privileges(Info & i)
{
i.out << Toa(request->item.privileges, 8);
i.out << Toa(cur->request->item.privileges, 8);
}
@@ -148,16 +148,16 @@ void item_dir(Info & i)
void item_url(Info & i)
{
i.out << request->item.url;
i.out << cur->request->item.url;
}
void item_url_is(Info & i)
{
if( !request->is_item )
if( !cur->request->is_item )
return; // default false
i.res = (request->item.url == i.par);
i.res = (cur->request->item.url == i.par);
}
@@ -173,37 +173,37 @@ void item_link(Info & i)
void item_filetype_is_none(Info & i)
{
i.res = request->item.file_type == WINIX_ITEM_FILETYPE_NONE;
i.res = cur->request->item.file_type == WINIX_ITEM_FILETYPE_NONE;
}
void item_filetype_is_image(Info & i)
{
i.res = request->item.file_type == WINIX_ITEM_FILETYPE_IMAGE;
i.res = cur->request->item.file_type == WINIX_ITEM_FILETYPE_IMAGE;
}
void item_has_static_file(Info & i)
{
i.res = request->item.file_type != WINIX_ITEM_FILETYPE_NONE && !request->item.file_path.empty();
i.res = cur->request->item.file_type != WINIX_ITEM_FILETYPE_NONE && !cur->request->item.file_path.empty();
}
void item_has_thumb(Info & i)
{
i.res = request->item.has_thumb;
i.res = cur->request->item.has_thumb;
}
void item_can_read(Info & i)
{
i.res = system->HasReadAccess(request->item);
i.res = system->HasReadAccess(cur->request->item);
}
void item_can_write(Info & i)
{
i.res = system->HasWriteAccess(request->item);
i.res = system->HasWriteAccess(cur->request->item);
}
@@ -211,61 +211,61 @@ void item_can_remove(Info & i)
{
// !! tutaj trzeba bedzie cos innego zrobic
// zwlaszcza jak dojdzie sticky bit
i.res = system->HasWriteAccess(*request->dir_tab.back());
i.res = system->HasWriteAccess(*cur->request->dir_tab.back());
}
void item_user(Info & i)
{
User * puser = system->users.GetUser(request->item.user_id);
print_user_name(i, puser, request->item.guest_name);
User * puser = system->users.GetUser(cur->request->item.user_id);
print_user_name(i, puser, cur->request->item.guest_name);
}
void item_modification_user(Info & i)
{
User * puser = system->users.GetUser(request->item.modification_user_id);
print_user_name(i, puser, request->item.guest_name);
User * puser = system->users.GetUser(cur->request->item.modification_user_id);
print_user_name(i, puser, cur->request->item.guest_name);
}
void item_users_different(Info & i)
{
i.res = (request->item.user_id != request->item.modification_user_id);
i.res = (cur->request->item.user_id != cur->request->item.modification_user_id);
}
void item_date_creation(Info & i)
{
tm rtm = system->LocalTime(request->item.date_creation);
tm rtm = system->LocalTime(cur->request->item.date_creation);
i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
}
void item_date_modification(Info & i)
{
tm rtm = system->LocalTime(request->item.date_modification);
tm rtm = system->LocalTime(cur->request->item.date_modification);
i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
}
void item_date_creation_nice(Info & i)
{
print_date_nice(i, request->item.date_creation);
print_date_nice(i, cur->request->item.date_creation);
}
void item_date_modification_nice(Info & i)
{
print_date_nice(i, request->item.date_modification);
print_date_nice(i, cur->request->item.date_modification);
}
void item_dates_equal(Info & i)
{
tm * ptm1 = &request->item.date_creation;
tm * ptm2 = &request->item.date_modification;
tm * ptm1 = &cur->request->item.date_creation;
tm * ptm2 = &cur->request->item.date_modification;
i.res = ptm1->tm_year == ptm2->tm_year &&
ptm1->tm_mon == ptm2->tm_mon &&
@@ -279,20 +279,20 @@ void item_dates_equal(Info & i)
void item_run(Info & i)
{
if( !request->is_item )
if( !cur->request->is_item )
{
i.out << "<!-- there is no an item to run -->";
return;
}
if( system->HasReadExecAccess(request->item) )
if( system->HasReadExecAccess(cur->request->item) )
{
Ezc::Pattern * p = pattern_cacher.GetPattern(request->item);
Ezc::Pattern * p = pattern_cacher.GetPattern(cur->request->item);
item_run_content.Clear();
ezc_generator.Generate(item_run_content, *p);
item_print_content(i.out, item_run_content.Str(), request->item.content_type);
item_print_content(i.out, item_run_content.Str(), cur->request->item.content_type);
}
else
{
@@ -303,55 +303,55 @@ void item_run(Info & i)
void item_guest_name(Info & i)
{
i.out << request->item.guest_name;
i.out << cur->request->item.guest_name;
}
void item_html_template(Info & i)
{
i.out << request->item.html_template;
i.out << cur->request->item.html_template;
}
void item_has_html_template(Info & i)
{
i.res = !request->item.html_template.empty();
i.res = !cur->request->item.html_template.empty();
}
void item_type_is_dir(Info & i)
{
i.res = request->item.type == Item::dir;
i.res = cur->request->item.type == Item::dir;
}
void item_type_is_file(Info & i)
{
i.res = request->item.type == Item::file;
i.res = cur->request->item.type == Item::file;
}
void item_type_is_symlink(Info & i)
{
i.res = request->item.type == Item::symlink;
i.res = cur->request->item.type == Item::symlink;
}
void item_is_link_to(Info & i)
{
i.res = !request->item.link_to.empty();
i.res = !cur->request->item.link_to.empty();
}
void item_link_to(Info & i)
{
i.out << request->item.link_to;
i.out << cur->request->item.link_to;
}
void item_is_link_redirect(Info & i)
{
i.res = request->item.link_redirect == 1;
i.res = cur->request->item.link_redirect == 1;
}
@@ -364,51 +364,51 @@ static size_t item_index;
void item_tab(Info & i)
{
item_index = i.iter;
i.res = item_index < request->item_tab.size();
i.res = item_index < cur->request->item_tab.size();
}
void item_tab_id(Info & i)
{
if( item_index < request->item_tab.size() )
i.out << request->item_tab[item_index].id;
if( item_index < cur->request->item_tab.size() )
i.out << cur->request->item_tab[item_index].id;
}
void item_tab_subject(Info & i)
{
if( item_index < request->item_tab.size() )
i.out << request->item_tab[item_index].subject;
if( item_index < cur->request->item_tab.size() )
i.out << cur->request->item_tab[item_index].subject;
}
void item_tab_subject_noescape(Info & i)
{
if( item_index < request->item_tab.size() )
i.out << R(request->item_tab[item_index].subject);
if( item_index < cur->request->item_tab.size() )
i.out << R(cur->request->item_tab[item_index].subject);
}
void item_tab_content(Info & i)
{
if( item_index < request->item_tab.size() )
i.out << request->item_tab[item_index].content;
if( item_index < cur->request->item_tab.size() )
i.out << cur->request->item_tab[item_index].content;
}
void item_tab_content_noescape(Info & i)
{
if( item_index < request->item_tab.size() )
i.out << R(request->item_tab[item_index].content);
if( item_index < cur->request->item_tab.size() )
i.out << R(cur->request->item_tab[item_index].content);
}
void item_tab_print_content(Info & i)
{
if( item_index >= request->item_tab.size() )
if( item_index >= cur->request->item_tab.size() )
return;
std::wstring & content = request->item_tab[item_index].content;
Item::ContentType type = request->item_tab[item_index].content_type;
std::wstring & content = cur->request->item_tab[item_index].content;
Item::ContentType type = cur->request->item_tab[item_index].content_type;
item_print_content(i.out, content, type);
}
@@ -416,19 +416,19 @@ void item_tab_print_content(Info & i)
void item_tab_privileges(Info & i)
{
if( item_index < request->item_tab.size() )
i.out << "0" << Toa(request->item_tab[item_index].privileges, 8);
if( item_index < cur->request->item_tab.size() )
i.out << "0" << Toa(cur->request->item_tab[item_index].privileges, 8);
}
void item_tab_dir(Info & i)
{
if( item_index < request->item_tab.size() )
if( item_index < cur->request->item_tab.size() )
{
std::wstring path;
if( system->dirs.MakePath(request->item_tab[item_index].parent_id, path) )
if( system->dirs.MakePath(cur->request->item_tab[item_index].parent_id, path) )
i.out << path;
else
i.out << "/the path does not exist/"; // !! do konfiga
@@ -438,14 +438,14 @@ void item_tab_dir(Info & i)
void item_tab_url(Info & i)
{
if( item_index < request->item_tab.size() )
i.out << request->item_tab[item_index].url;
if( item_index < cur->request->item_tab.size() )
i.out << cur->request->item_tab[item_index].url;
}
void item_tab_link(Info & i)
{
if( item_index < request->item_tab.size() )
if( item_index < cur->request->item_tab.size() )
{
i.out << config->base_url;
item_tab_dir(i);
@@ -458,9 +458,9 @@ void item_tab_link(Info & i)
void item_tab_can_read(Info & i)
{
if( item_index < request->item_tab.size() )
if( item_index < cur->request->item_tab.size() )
{
if( system->HasReadAccess(request->item_tab[item_index]) )
if( system->HasReadAccess(cur->request->item_tab[item_index]) )
i.res = true;
}
}
@@ -468,9 +468,9 @@ void item_tab_can_read(Info & i)
void item_tab_can_write(Info & i)
{
if( item_index < request->item_tab.size() )
if( item_index < cur->request->item_tab.size() )
{
if( system->HasWriteAccess(request->item_tab[item_index]) )
if( system->HasWriteAccess(cur->request->item_tab[item_index]) )
i.res = true;
}
}
@@ -478,10 +478,10 @@ void item_tab_can_write(Info & i)
void item_tab_user(Info & i)
{
if( item_index < request->item_tab.size() )
if( item_index < cur->request->item_tab.size() )
{
User * puser = system->users.GetUser(request->item_tab[item_index].user_id);
print_user_name(i, puser, request->item_tab[item_index].guest_name);
User * puser = system->users.GetUser(cur->request->item_tab[item_index].user_id);
print_user_name(i, puser, cur->request->item_tab[item_index].guest_name);
}
}
@@ -489,10 +489,10 @@ void item_tab_user(Info & i)
void item_tab_modification_user(Info & i)
{
if( item_index < request->item_tab.size() )
if( item_index < cur->request->item_tab.size() )
{
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);
User * puser = system->users.GetUser(cur->request->item_tab[item_index].modification_user_id);
print_user_name(i, puser, cur->request->item_tab[item_index].guest_name);
}
}
@@ -500,9 +500,9 @@ void item_tab_modification_user(Info & i)
void item_tab_users_different(Info & i)
{
if( item_index < request->item_tab.size() )
if( item_index < cur->request->item_tab.size() )
{
i.res = (request->item_tab[item_index].user_id != request->item_tab[item_index].modification_user_id);
i.res = (cur->request->item_tab[item_index].user_id != cur->request->item_tab[item_index].modification_user_id);
}
}
@@ -510,9 +510,9 @@ void item_tab_users_different(Info & i)
void item_tab_group(Info & i)
{
if( item_index < request->item_tab.size() )
if( item_index < cur->request->item_tab.size() )
{
long group_id = request->item_tab[item_index].group_id;
long group_id = cur->request->item_tab[item_index].group_id;
Group * pgroup = system->groups.GetGroup(group_id);
if( pgroup )
@@ -525,9 +525,9 @@ void item_tab_group(Info & i)
void item_tab_date_creation(Info & i)
{
if( item_index < request->item_tab.size() )
if( item_index < cur->request->item_tab.size() )
{
tm rtm = system->LocalTime(request->item_tab[item_index].date_creation);
tm rtm = system->LocalTime(cur->request->item_tab[item_index].date_creation);
i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
}
}
@@ -535,9 +535,9 @@ void item_tab_date_creation(Info & i)
void item_tab_date_modification(Info & i)
{
if( item_index < request->item_tab.size() )
if( item_index < cur->request->item_tab.size() )
{
tm rtm = system->LocalTime(request->item_tab[item_index].date_modification);
tm rtm = system->LocalTime(cur->request->item_tab[item_index].date_modification);
i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
}
}
@@ -545,9 +545,9 @@ void item_tab_date_modification(Info & i)
void item_tab_date_creation_nice(Info & i)
{
if( item_index < request->item_tab.size() )
if( item_index < cur->request->item_tab.size() )
{
print_date_nice(i, request->item_tab[item_index].date_creation);
print_date_nice(i, cur->request->item_tab[item_index].date_creation);
}
}
@@ -555,19 +555,19 @@ void item_tab_date_creation_nice(Info & i)
void item_tab_date_modification_nice(Info & i)
{
if( item_index < request->item_tab.size() )
if( item_index < cur->request->item_tab.size() )
{
print_date_nice(i, request->item_tab[item_index].date_modification);
print_date_nice(i, cur->request->item_tab[item_index].date_modification);
}
}
void item_tab_dates_equal(Info & i)
{
if( item_index < request->item_tab.size() )
if( item_index < cur->request->item_tab.size() )
{
tm * ptm1 = &request->item_tab[item_index].date_creation;
tm * ptm2 = &request->item_tab[item_index].date_modification;
tm * ptm1 = &cur->request->item_tab[item_index].date_creation;
tm * ptm2 = &cur->request->item_tab[item_index].date_modification;
i.res = ptm1->tm_year == ptm2->tm_year &&
ptm1->tm_mon == ptm2->tm_mon &&
@@ -581,14 +581,14 @@ void item_tab_dates_equal(Info & i)
void item_tab_run(Info & i)
{
if( item_index < request->item_tab.size() )
if( item_index < cur->request->item_tab.size() )
{
if( system->HasReadExecAccess(request->item_tab[item_index]) )
if( system->HasReadExecAccess(cur->request->item_tab[item_index]) )
{
Ezc::Pattern * p = pattern_cacher.GetPattern(request->item_tab[item_index]);
Ezc::Pattern * p = pattern_cacher.GetPattern(cur->request->item_tab[item_index]);
item_run_content.Clear();
ezc_generator.Generate(item_run_content, *p);
item_print_content(i.out, item_run_content.Str(), request->item_tab[item_index].content_type);
item_print_content(i.out, item_run_content.Str(), cur->request->item_tab[item_index].content_type);
}
else
{
@@ -600,70 +600,70 @@ void item_tab_run(Info & i)
void item_tab_can_use_emacs(Info & i)
{
if( item_index < request->item_tab.size() )
if( item_index < cur->request->item_tab.size() )
{
// !!
//i.res = request->CanUseEmacs(request->item_tab[item_index], true);
//i.res = cur->request->CanUseEmacs(cur->request->item_tab[item_index], true);
}
}
void item_tab_has_static_file(Info & i)
{
if( item_index < request->item_tab.size() )
if( item_index < cur->request->item_tab.size() )
{
i.res = request->item_tab[item_index].file_type != WINIX_ITEM_FILETYPE_NONE &&
!request->item_tab[item_index].file_path.empty();
i.res = cur->request->item_tab[item_index].file_type != WINIX_ITEM_FILETYPE_NONE &&
!cur->request->item_tab[item_index].file_path.empty();
}
}
void item_tab_has_thumb(Info & i)
{
if( item_index < request->item_tab.size() )
i.res = request->item_tab[item_index].has_thumb;
if( item_index < cur->request->item_tab.size() )
i.res = cur->request->item_tab[item_index].has_thumb;
}
void item_tab_type_is_dir(Info & i)
{
if( item_index < request->item_tab.size() )
i.res = request->item_tab[item_index].type == Item::dir;
if( item_index < cur->request->item_tab.size() )
i.res = cur->request->item_tab[item_index].type == Item::dir;
}
void item_tab_type_is_file(Info & i)
{
if( item_index < request->item_tab.size() )
i.res = request->item_tab[item_index].type == Item::file;
if( item_index < cur->request->item_tab.size() )
i.res = cur->request->item_tab[item_index].type == Item::file;
}
void item_tab_type_is_symlink(Info & i)
{
if( item_index < request->item_tab.size() )
i.res = request->item_tab[item_index].type == Item::symlink;
if( item_index < cur->request->item_tab.size() )
i.res = cur->request->item_tab[item_index].type == Item::symlink;
}
void item_tab_is_link_to(Info & i)
{
if( item_index < request->item_tab.size() )
i.res = !request->item_tab[item_index].link_to.empty();
if( item_index < cur->request->item_tab.size() )
i.res = !cur->request->item_tab[item_index].link_to.empty();
}
void item_tab_link_to(Info & i)
{
if( item_index < request->item_tab.size() )
i.out << request->item_tab[item_index].link_to;
if( item_index < cur->request->item_tab.size() )
i.out << cur->request->item_tab[item_index].link_to;
}
void item_tab_is_link_redirect(Info & i)
{
if( item_index < request->item_tab.size() )
i.res = request->item_tab[item_index].link_redirect == 1;
if( item_index < cur->request->item_tab.size() )
i.res = cur->request->item_tab[item_index].link_redirect == 1;
}

4
templates/last.cpp
View File

@@ -23,9 +23,9 @@ static LastContainer::Iterator last_iterator;
bool last_init()
{
if( last_reqid != request->id )
if( last_reqid != cur->request->id )
{
last_reqid = request->id;
last_reqid = cur->request->id;
last_iterator = system->users.last.Begin();
}

4
templates/locale.h
View File

@@ -7,8 +7,8 @@
*
*/
#ifndef headerfilecmslucorelocale
#define headerfilecmslucorelocale
#ifndef headerfile_winix_templates_locale
#define headerfile_winix_templates_locale
#include <vector>
#include <string>

4
templates/localefilter.h
View File

@@ -7,8 +7,8 @@
*
*/
#ifndef headerfilecmslutemplateslocalefilter
#define headerfilecmslutemplateslocalefilter
#ifndef headerfile_winix_templates_localefilter
#define headerfile_winix_templates_localefilter
#include "locale.h"

4
templates/ls.cpp
View File

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

8
templates/misc.cpp
View File

@@ -154,14 +154,14 @@ int ParseCKeditorFun()
{
ckeditor_getparser.fun_num = 2; // default if there is a problem with parsing info
if( !request->get_tab.empty() )
if( !cur->request->get_tab.empty() )
{
size_t last = request->get_tab.size()-1;
size_t last = cur->request->get_tab.size()-1;
if( !request->get_tab[last].empty() )
if( !cur->request->get_tab[last].empty() )
{
static std::string get;
AssignString(request->get_tab[last], get);
AssignString(cur->request->get_tab[last], get);
ckeditor_getparser.Parse(get.c_str() + 1); // the first char is '?'
}
}

4
templates/misc.h
View File

@@ -7,8 +7,8 @@
*
*/
#ifndef headerfilecmslutemplatesmisc
#define headerfilecmslutemplatesmisc
#ifndef headerfile_winix_templates_misc
#define headerfile_winix_templates_misc
#include <vector>

2
templates/patterncacher.cpp
View File

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

4
templates/patterncacher.h
View File

@@ -7,8 +7,8 @@
*
*/
#ifndef headerfilecmslutemplatespatterncacher
#define headerfilecmslutemplatespatterncacher
#ifndef headerfile_winix_templates_patterncacher
#define headerfile_winix_templates_patterncacher
#include <vector>
#include <map>

58
templates/priv.cpp
View File

@@ -26,16 +26,16 @@ static size_t priv_user_reqid = 0;
void priv_user_tab_init(Item & item)
{
priv_user_reqid = request->id;
priv_user_reqid = cur->request->id;
priv_user_table.clear();
if( !request->session->puser )
if( !cur->session->puser )
{
// not logged
priv_user_table.push_back(item.user_id);
}
else
if( request->session->puser->super_user )
if( cur->session->puser->super_user )
{
// super user is allowed to change to any user
for(size_t i=0 ; i<system->users.Size() ; ++i)
@@ -54,16 +54,16 @@ void priv_user_tab_init(Item & item)
void priv_user_tab_init()
{
if( request->is_item )
priv_user_tab_init(request->item);
if( cur->request->is_item )
priv_user_tab_init(cur->request->item);
else
priv_user_tab_init(*request->dir_tab.back());
priv_user_tab_init(*cur->request->dir_tab.back());
}
void priv_user_tab(Info & i)
{
if( priv_user_reqid != request->id )
if( priv_user_reqid != cur->request->id )
priv_user_tab_init();
priv_user_index = i.iter;
@@ -103,14 +103,14 @@ void priv_user_tab_isdefault(Info & i)
{
long uid = priv_user_table[priv_user_index];
if( request->is_item )
if( cur->request->is_item )
{
if( uid == request->item.user_id )
if( uid == cur->request->item.user_id )
i.res = true;
}
else
{
if( uid == request->dir_tab.back()->user_id )
if( uid == cur->request->dir_tab.back()->user_id )
i.res = true;
}
}
@@ -131,16 +131,16 @@ static size_t priv_group_reqid = 0;
void priv_group_tab_init(Item & item)
{
priv_group_reqid = request->id;
priv_group_reqid = cur->request->id;
priv_group_table.clear();
if( !request->session->puser )
if( !cur->session->puser )
{
// not logged
priv_group_table.push_back(item.group_id);
}
else
if( request->session->puser->super_user )
if( cur->session->puser->super_user )
{
// super user is allowed to change to any group
for(size_t i=0 ; i<system->groups.Size() ; ++i)
@@ -150,15 +150,15 @@ void priv_group_tab_init(Item & item)
priv_group_table.push_back(-1);
}
else
if( request->session->puser->id == item.user_id )
if( cur->session->puser->id == item.user_id )
{
bool was_current_group = false;
// owner of the item -- is allowed to change only to a group in which he belongs to
for(size_t i=0 ; i<request->session->puser->groups.size() ; ++i)
for(size_t i=0 ; i<cur->session->puser->groups.size() ; ++i)
{
priv_group_table.push_back( request->session->puser->groups[i] );
priv_group_table.push_back( cur->session->puser->groups[i] );
if( item.group_id == request->session->puser->groups[i] )
if( item.group_id == cur->session->puser->groups[i] )
was_current_group = true;
}
@@ -179,16 +179,16 @@ void priv_group_tab_init(Item & item)
void priv_group_tab_init()
{
if( request->is_item )
priv_group_tab_init(request->item);
if( cur->request->is_item )
priv_group_tab_init(cur->request->item);
else
priv_group_tab_init(*request->dir_tab.back());
priv_group_tab_init(*cur->request->dir_tab.back());
}
void priv_group_tab(Info & i)
{
if( priv_group_reqid != request->id )
if( priv_group_reqid != cur->request->id )
priv_group_tab_init();
priv_group_index = i.iter;
@@ -228,14 +228,14 @@ void priv_group_tab_isdefault(Info & i)
{
long gid = priv_group_table[priv_group_index];
if( request->is_item )
if( cur->request->is_item )
{
if( gid == request->item.group_id )
if( gid == cur->request->item.group_id )
i.res = true;
}
else
{
if( gid == request->dir_tab.back()->group_id )
if( gid == cur->request->dir_tab.back()->group_id )
i.res = true;
}
}
@@ -244,10 +244,10 @@ void priv_group_tab_isdefault(Info & i)
void priv_privileges(Info & i)
{
if( request->is_item )
i.out << Toa(request->item.privileges, 8);
if( cur->request->is_item )
i.out << Toa(cur->request->item.privileges, 8);
else
i.out << Toa(request->dir_tab.back()->privileges, 8);
i.out << Toa(cur->request->dir_tab.back()->privileges, 8);
}
@@ -267,13 +267,13 @@ void priv_privileges_for_dirs(Info & i)
void priv_show_form_chown(Info & i)
{
i.res = (request->function == &functions->fun_priv || request->function == &functions->fun_chown);
i.res = (cur->request->function == &functions->fun_priv || cur->request->function == &functions->fun_chown);
}
void priv_show_form_chmod(Info & i)
{
i.res = (request->function == &functions->fun_priv || request->function == &functions->fun_chmod);
i.res = (cur->request->function == &functions->fun_priv || cur->request->function == &functions->fun_chmod);
}

14
templates/rebus.cpp
View File

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

24
templates/stat.cpp
View File

@@ -19,41 +19,41 @@ namespace TemplatesFunctions
void stat_item_type_is_file(Info & i)
{
i.res = request->is_item && request->item.file_type == WINIX_ITEM_FILETYPE_NONE;
i.res = cur->request->is_item && cur->request->item.file_type == WINIX_ITEM_FILETYPE_NONE;
}
void stat_item_type_is_static_file(Info & i)
{
i.res = request->is_item && request->item.file_type != WINIX_ITEM_FILETYPE_NONE;
i.res = cur->request->is_item && cur->request->item.file_type != WINIX_ITEM_FILETYPE_NONE;
}
void stat_item_type_is_dir(Info & i)
{
i.res = !request->is_item;
i.res = !cur->request->is_item;
}
void stat_item_inode(Info & i)
{
i.out << request->last_item->id;
i.out << cur->request->last_item->id;
}
void stat_item_user(Info & i)
{
User * puser = system->users.GetUser(request->last_item->user_id);
print_user_name(i, puser, request->last_item->guest_name);
User * puser = system->users.GetUser(cur->request->last_item->user_id);
print_user_name(i, puser, cur->request->last_item->guest_name);
}
void stat_item_group(Info & i)
{
long group_id = request->last_item->group_id;
long group_id = cur->request->last_item->group_id;
Group * pgroup = system->groups.GetGroup(group_id);
if( pgroup )
@@ -65,20 +65,20 @@ void stat_item_group(Info & i)
void stat_item_privileges(Info & i)
{
i.out << Toa(request->last_item->privileges, 8);
i.out << Toa(cur->request->last_item->privileges, 8);
}
void stat_item_date_creation(Info & i)
{
tm rtm = system->LocalTime(request->last_item->date_creation);
tm rtm = system->LocalTime(cur->request->last_item->date_creation);
i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
}
void stat_item_date_modification(Info & i)
{
tm rtm = system->LocalTime(request->last_item->date_modification);
tm rtm = system->LocalTime(cur->request->last_item->date_modification);
i.out << DateToStr(rtm.tm_year + 1900, rtm.tm_mon + 1, rtm.tm_mday, rtm.tm_hour, rtm.tm_min, rtm.tm_sec);
}
@@ -87,14 +87,14 @@ void stat_item_date_modification(Info & i)
void stat_item_template(Info & i)
{
i.out << request->last_item->html_template;
i.out << cur->request->last_item->html_template;
}
void stat_item_is_template_from_mount_point(Info & i)
{
i.res = request->last_item->html_template.empty();
i.res = cur->request->last_item->html_template.empty();
}

10
templates/template.cpp
View File

@@ -36,10 +36,10 @@ void template_set_def()
temp_def = (size_t)-1; // none
const std::wstring * html_file;
if( request->is_item )
html_file = &request->item.html_template;
if( cur->request->is_item )
html_file = &cur->request->item.html_template;
else
html_file = &request->dir_tab.back()->html_template;
html_file = &cur->request->dir_tab.back()->html_template;
if( html_file->empty() )
@@ -82,9 +82,9 @@ void template_init()
void template_tab(Info & i)
{
if( request->id != temp_req_id )
if( cur->request->id != temp_req_id )
{
temp_req_id = request->id;
temp_req_id = cur->request->id;
template_init();
}

31
templates/templates.cpp
View File

@@ -31,9 +31,9 @@ CKEditorGetParser ckeditor_getparser;
std::vector<std::wstring> empty_pars;
const std::wstring empty_string;
Config * config;
Request * request;
Db * db;
Cur * cur;
Config * config;
System * system;
Functions * functions;
SessionManager * session_manager;
@@ -42,14 +42,14 @@ SessionManager * session_manager;
Ezc::Pattern * content_for_function()
{
if( !request->function )
if( !cur->request->function )
{
log << log1 << "Templates: no function" << logend;
return 0;
}
const size_t loc_index = static_cast<size_t>(locale.GetLang());
const size_t fun_id = static_cast<size_t>(request->function->id);
const size_t fun_id = static_cast<size_t>(cur->request->function->id);
if( loc_index >= patterns_fun.size() || fun_id >= patterns_fun[loc_index].size() )
{
@@ -73,7 +73,7 @@ Ezc::Pattern * p = 0;
}
switch( request->status )
switch( cur->request->status )
{
//case WINIX_ERR_NO_ITEM: !! we need something like 'error::item_required'
//p = &pat_err_item_required;
@@ -586,15 +586,15 @@ using namespace TemplatesFunctions;
Ezc::Pattern * index = 0;
const std::wstring * index_file_local = 0;
if( request->is_item )
if( cur->request->is_item )
{
if( !request->item.html_template.empty() )
index_file_local = &request->item.html_template;
if( !cur->request->item.html_template.empty() )
index_file_local = &cur->request->item.html_template;
}
else
{
if( !request->dir_tab.back()->html_template.empty() )
index_file_local = &request->dir_tab.back()->html_template;
if( !cur->request->dir_tab.back()->html_template.empty() )
index_file_local = &cur->request->dir_tab.back()->html_template;
}
@@ -616,8 +616,8 @@ using namespace TemplatesFunctions;
index = &patterns[locale.GetLang()][pat_index];
EzcGen generator;
//generator.Generate(request->page, *index, ezc_functions);
generator.Generate(request->page, *index);
//generator.Generate(cur->request->page, *index, ezc_functions);
generator.Generate(cur->request->page, *index);
}
@@ -629,7 +629,7 @@ using namespace TemplatesFunctions;
if( !empty_pars.empty() )
empty_pars.clear();
Info info(request->page, empty_pars, empty_string);
Info info(cur->request->page, empty_pars, empty_string);
info.iter = 0;
info.res = false;
@@ -645,12 +645,13 @@ void Templates::SetConfig(Config * pconfig)
}
void Templates::SetRequest(Request * prequest)
void Templates::SetCur(Cur * pcur)
{
TemplatesFunctions::request = prequest;
TemplatesFunctions::cur = pcur;
}
void Templates::SetDb(Db * pdb)
{
TemplatesFunctions::db = pdb;

12
templates/templates.h
View File

@@ -7,8 +7,8 @@
*
*/
#ifndef headerfilecmslutemplatestemplates
#define headerfilecmslutemplatestemplates
#ifndef headerfile_winix_templates_templates
#define headerfile_winix_templates_templates
#include <iomanip>
#include <set>
@@ -21,7 +21,7 @@
#include "db/db.h"
#include "htmltextstream.h"
#include "core/config.h"
#include "core/request.h"
#include "core/cur.h"
#include "core/system.h"
#include "core/sessionmanager.h"
#include "localefilter.h"
@@ -52,9 +52,9 @@ namespace TemplatesFunctions
extern LocaleFilter locale_filter;
extern CKEditorGetParser ckeditor_getparser;
extern Config * config;
extern Request * request;
extern Db * db;
extern Cur * cur;
extern Config * config;
extern System * system;
extern Functions * functions;
extern SessionManager * session_manager;
@@ -367,7 +367,7 @@ public:
Templates();
void SetConfig(Config * pconfig);
void SetRequest(Request * prequest);
void SetCur(Cur * pcur);
void SetDb(Db * pdb);
void SetSystem(System * psystem);
void SetFunctions(Functions * pfunctions);

4
templates/upload.cpp
View File

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

32
templates/user.cpp
View File

@@ -8,8 +8,8 @@
*/
#include "templates.h"
#include "../core/request.h"
#include "../core/misc.h"
#include "core/request.h"
#include "core/misc.h"
@@ -21,16 +21,16 @@ namespace TemplatesFunctions
void user_logged(Info & i)
{
i.res = request->session->puser != 0;
i.res = cur->session->puser != 0;
}
void user_name(Info & i)
{
if( !request->session->puser )
if( !cur->session->puser )
return;
i.out << request->session->puser->name;
i.out << cur->session->puser->name;
}
@@ -38,14 +38,14 @@ void user_name(Info & i)
// !! moze lepsza nazwa?
void user_is_in_group(Info & i)
{
if( !request->session->puser || i.params.empty() )
if( !cur->session->puser || i.params.empty() )
return;
for(size_t a=0 ; a<i.params.size() ; ++a)
{
long gid = system->groups.GetGroupId(i.params[a]);
if( gid!=-1 && request->session->puser->IsMemberOf(gid) )
if( gid!=-1 && cur->session->puser->IsMemberOf(gid) )
{
i.res = true;
break;
@@ -57,14 +57,14 @@ void user_is_in_group(Info & i)
// !! moze lepsza nazwa?
void user_is_in_all_groups(Info & i)
{
if( !request->session->puser || i.params.empty() )
if( !cur->session->puser || i.params.empty() )
return;
for(size_t a=0 ; a<i.params.size() ; ++a)
{
long gid = system->groups.GetGroupId(i.params[a]);
if( gid==-1 || !request->session->puser->IsMemberOf(gid) )
if( gid==-1 || !cur->session->puser->IsMemberOf(gid) )
return;
}
@@ -74,35 +74,35 @@ void user_is_in_all_groups(Info & i)
void user_super_user(Info & i)
{
if( request->session->puser && request->session->puser->super_user )
if( cur->session->puser && cur->session->puser->super_user )
i.res = true;
}
void user_can_use_html(Info & i)
{
if( !request->session->puser )
if( !cur->session->puser )
i.res = false;
else
i.res = system->CanUseHtml(request->session->puser->id);
i.res = system->CanUseHtml(cur->session->puser->id);
}
void user_can_use_bbcode(Info & i)
{
if( !request->session->puser )
if( !cur->session->puser )
i.res = false;
else
i.res = system->CanUseBBCode(request->session->puser->id);
i.res = system->CanUseBBCode(cur->session->puser->id);
}
void user_can_use_raw(Info & i)
{
if( !request->session->puser )
if( !cur->session->puser )
i.res = false;
else
i.res = system->CanUseRaw(request->session->puser->id);
i.res = system->CanUseRaw(cur->session->puser->id);
}

4
templates/who.cpp
View File

@@ -24,9 +24,9 @@ size_t who_lp;
bool who_init()
{
if( who_reqid != request->id )
if( who_reqid != cur->request->id )
{
who_reqid = request->id;
who_reqid = cur->request->id;
who_iterator = session_manager->SessionBegin();
who_lp = 1;
}

20
templates/winix.cpp
View File

@@ -46,22 +46,22 @@ void winix_users_logged(Info & i)
void winix_function(Info & i)
{
i.out << request->function->fun.url;
i.out << cur->request->function->fun.url;
}
void winix_function_is(Info & i)
{
if( !request->function )
if( !cur->request->function )
return;
i.res = (request->function->fun.url == i.par);
i.res = (cur->request->function->fun.url == i.par);
}
void winix_function_param_is(Info & i)
{
i.res = request->IsParam(i.par);
i.res = cur->request->IsParam(i.par);
}
@@ -158,13 +158,13 @@ char buf[20];
void winix_err_is(Info & i)
{
int value = Toi(i.par);
i.res = (request->status == value);
i.res = (cur->request->status == value);
}
void winix_err_code(Info & i)
{
i.out << request->status;
i.out << cur->request->status;
}
@@ -177,7 +177,7 @@ void winix_is_err_in_locales(Info & i)
wchar_t buff[40];
size_t buff_len = sizeof(buff) / sizeof(wchar_t);
swprintf(buff, buff_len, L"winix_err_%d", request->status);
swprintf(buff, buff_len, L"winix_err_%d", cur->request->status);
winix_error_key = buff;
i.res = locale.IsKey(winix_error_key);
@@ -189,7 +189,7 @@ void winix_err_msg_from_locales(Info & i)
wchar_t buff[40];
size_t buff_len = sizeof(buff) / sizeof(wchar_t);
swprintf(buff, buff_len, L"winix_err_%d", request->status);
swprintf(buff, buff_len, L"winix_err_%d", cur->request->status);
winix_error_key = buff;
i.out << locale.Get(winix_error_key);
@@ -198,8 +198,8 @@ size_t buff_len = sizeof(buff) / sizeof(wchar_t);
void winix_show_content_in_full_window(Info & i)
{
if( request->function )
i.res = (request->function == &functions->fun_ckeditor || request->function == &functions->fun_tinymce);
if( cur->request->function )
i.res = (cur->request->function == &functions->fun_ckeditor || cur->request->function == &functions->fun_tinymce);
}