diff --git a/core/Makefile.dep b/core/Makefile.dep index e4ea3b5..ea377f2 100755 --- a/core/Makefile.dep +++ b/core/Makefile.dep @@ -6,48 +6,47 @@ app.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h app.o: ../db/dbtextstream.h ../core/textstream.h misc.h ../core/error.h log.h app.o: textstream.h ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h app.o: ../core/user.h ../core/group.h ../core/dircontainer.h -app.o: ../core/ugcontainer.h request.h requesttypes.h session.h error.h -app.o: user.h plugindata.h rebus.h ../templates/htmltextstream.h -app.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h -app.o: ../core/confparser.h ../templates/misc.h ../templates/localefilter.h -app.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -app.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -app.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -app.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -app.o: ../notify/notifythread.h ../core/basethread.h synchro.h -app.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -app.o: ugcontainer.h lastcontainer.h mounts.h mount.h mountparser.h users.h -app.o: groups.h group.h loadavg.h thumb.h basethread.h sessionmanager.h -app.o: sessioncontainer.h ../functions/functions.h +app.o: ../core/ugcontainer.h request.h requesttypes.h error.h +app.o: ../templates/htmltextstream.h ../notify/notify.h +app.o: ../notify/notifypool.h ../templates/locale.h ../core/confparser.h +app.o: ../templates/misc.h ../templates/localefilter.h ../templates/locale.h +app.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +app.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h +app.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h +app.o: ../templates/htmltextstream.h ../notify/notifythread.h +app.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h +app.o: ../core/config.h ../core/users.h user.h ugcontainer.h lastcontainer.h +app.o: cur.h session.h plugindata.h rebus.h mounts.h mount.h mountparser.h +app.o: users.h groups.h group.h loadavg.h thumb.h basethread.h +app.o: sessionmanager.h sessioncontainer.h ../functions/functions.h app.o: ../functions/functionbase.h ../core/request.h ../core/system.h -app.o: ../core/synchro.h ../functions/functionparser.h ../functions/adduser.h -app.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h -app.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h -app.o: ../functions/default.h ../functions/download.h ../functions/emacs.h -app.o: ../functions/last.h ../functions/login.h ../functions/logout.h -app.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h -app.o: ../functions/mv.h ../functions/node.h ../functions/priv.h -app.o: ../functions/reload.h ../functions/rm.h ../functions/run.h -app.o: ../functions/specialdefault.h ../functions/stat.h -app.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h -app.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h -app.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h -app.o: ../templates/templates.h ../templates/patterncacher.h -app.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h -app.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h -app.o: compress.h getparser.h httpsimpleparser.h postparser.h cookieparser.h -app.o: postmultiparser.h acceptencodingparser.h acceptbaseparser.h plugin.h -app.o: pluginmsg.h +app.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h +app.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h +app.o: ../functions/privchanger.h ../functions/chown.h +app.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h +app.o: ../functions/download.h ../functions/emacs.h ../functions/last.h +app.o: ../functions/login.h ../functions/logout.h ../functions/ln.h +app.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h +app.o: ../functions/node.h ../functions/priv.h ../functions/reload.h +app.o: ../functions/rm.h ../functions/run.h ../functions/specialdefault.h +app.o: ../functions/stat.h ../functions/subject.h ../functions/template.h +app.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h +app.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h +app.o: ../core/htmlfilter.h ../templates/templates.h +app.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h +app.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h +app.o: ../core/sessionmanager.h compress.h getparser.h httpsimpleparser.h +app.o: postparser.h cookieparser.h postmultiparser.h acceptencodingparser.h +app.o: acceptbaseparser.h plugin.h pluginmsg.h basethread.o: basethread.h log.h textstream.h bbcodeparser.o: bbcodeparser.h htmlfilter.h compress.o: compress.h log.h textstream.h config.o: config.h confparser.h htmlfilter.h log.h textstream.h plugin.h -config.o: pluginmsg.h plugindata.h request.h requesttypes.h session.h item.h -config.o: error.h user.h rebus.h ../templates/htmltextstream.h -config.o: ../core/textstream.h misc.h system.h dirs.h dircontainer.h -config.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h -config.o: ../core/error.h ../db/dbitemquery.h ../core/item.h -config.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h +config.o: pluginmsg.h plugindata.h request.h requesttypes.h item.h error.h +config.o: ../templates/htmltextstream.h ../core/textstream.h misc.h system.h +config.o: dirs.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +config.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h +config.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h config.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h config.o: ../notify/notifypool.h ../templates/locale.h ../core/confparser.h config.o: ../templates/misc.h ../templates/localefilter.h @@ -56,21 +55,22 @@ config.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h config.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h config.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h config.o: ../notify/notifythread.h ../core/basethread.h synchro.h -config.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -config.o: ugcontainer.h lastcontainer.h mounts.h mount.h mountparser.h -config.o: users.h groups.h group.h loadavg.h thumb.h basethread.h -config.o: sessionmanager.h sessioncontainer.h ../functions/functions.h -config.o: ../functions/functionbase.h ../core/request.h ../core/system.h -config.o: ../core/synchro.h ../functions/functionparser.h -config.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h -config.o: ../functions/privchanger.h ../functions/chown.h -config.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h -config.o: ../functions/download.h ../functions/emacs.h ../functions/last.h -config.o: ../functions/login.h ../functions/logout.h ../functions/ln.h -config.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h -config.o: ../functions/node.h ../functions/priv.h ../functions/reload.h -config.o: ../functions/rm.h ../functions/run.h ../functions/specialdefault.h -config.o: ../functions/stat.h ../functions/subject.h ../functions/template.h +config.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h user.h +config.o: ugcontainer.h lastcontainer.h cur.h session.h rebus.h mounts.h +config.o: mount.h mountparser.h users.h groups.h group.h loadavg.h thumb.h +config.o: basethread.h sessionmanager.h sessioncontainer.h +config.o: ../functions/functions.h ../functions/functionbase.h +config.o: ../core/request.h ../core/system.h ../core/synchro.h +config.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h +config.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h +config.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h +config.o: ../functions/default.h ../functions/download.h ../functions/emacs.h +config.o: ../functions/last.h ../functions/login.h ../functions/logout.h +config.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h +config.o: ../functions/mv.h ../functions/node.h ../functions/priv.h +config.o: ../functions/reload.h ../functions/rm.h ../functions/run.h +config.o: ../functions/specialdefault.h ../functions/stat.h +config.o: ../functions/subject.h ../functions/template.h config.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h config.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h config.o: ../core/htmlfilter.h ../templates/templates.h @@ -84,8 +84,8 @@ dirs.o: ../db/dbtextstream.h ../core/textstream.h misc.h ../core/error.h dirs.o: log.h textstream.h ../db/dbitemquery.h ../core/item.h dirs.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h dirs.o: ../core/dircontainer.h ../core/ugcontainer.h request.h requesttypes.h -dirs.o: session.h error.h user.h plugindata.h rebus.h config.h confparser.h -dirs.o: htmlfilter.h ../templates/htmltextstream.h ../notify/notify.h +dirs.o: error.h config.h confparser.h htmlfilter.h +dirs.o: ../templates/htmltextstream.h ../notify/notify.h dirs.o: ../notify/notifypool.h ../templates/locale.h ../core/confparser.h dirs.o: ../templates/misc.h ../templates/localefilter.h ../templates/locale.h dirs.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h @@ -93,7 +93,8 @@ dirs.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h dirs.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h dirs.o: ../templates/htmltextstream.h ../notify/notifythread.h dirs.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h -dirs.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h +dirs.o: ../core/config.h ../core/users.h user.h ugcontainer.h lastcontainer.h +dirs.o: cur.h session.h plugindata.h rebus.h groups.o: groups.h group.h ugcontainer.h ../db/db.h ../db/dbbase.h groups.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h groups.o: item.h ../core/error.h log.h textstream.h ../db/dbitemquery.h @@ -117,7 +118,7 @@ misc.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h misc.o: ../core/textstream.h ../core/error.h ../db/dbitemquery.h misc.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h misc.o: ../core/dircontainer.h ../core/ugcontainer.h -misc.o: ../templates/htmltextstream.h ../core/request.h ../core/system.h +misc.o: ../templates/htmltextstream.h ../core/cur.h ../core/system.h misc.o: ../core/sessionmanager.h mount.o: mount.h misc.h item.h mountparser.o: mountparser.h mount.h item.h error.h dirs.h dircontainer.h @@ -125,11 +126,10 @@ mountparser.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h mountparser.o: ../core/textstream.h misc.h ../core/error.h log.h textstream.h mountparser.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h mountparser.o: ../core/user.h ../core/group.h ../core/dircontainer.h -mountparser.o: ../core/ugcontainer.h request.h requesttypes.h session.h -mountparser.o: user.h plugindata.h rebus.h config.h confparser.h htmlfilter.h -mountparser.o: ../templates/htmltextstream.h ../notify/notify.h -mountparser.o: ../notify/notifypool.h ../templates/locale.h -mountparser.o: ../core/confparser.h ../templates/misc.h +mountparser.o: ../core/ugcontainer.h request.h requesttypes.h config.h +mountparser.o: confparser.h htmlfilter.h ../templates/htmltextstream.h +mountparser.o: ../notify/notify.h ../notify/notifypool.h +mountparser.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h mountparser.o: ../templates/localefilter.h ../templates/locale.h mountparser.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h mountparser.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h @@ -137,37 +137,39 @@ mountparser.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h mountparser.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h mountparser.o: ../notify/notifythread.h ../core/basethread.h synchro.h mountparser.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -mountparser.o: ugcontainer.h lastcontainer.h +mountparser.o: user.h ugcontainer.h lastcontainer.h cur.h session.h +mountparser.o: plugindata.h rebus.h mounts.o: mounts.h mount.h error.h dirs.h item.h dircontainer.h ../db/db.h mounts.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h mounts.o: ../core/textstream.h misc.h ../core/error.h log.h textstream.h mounts.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h mounts.o: ../core/user.h ../core/group.h ../core/dircontainer.h -mounts.o: ../core/ugcontainer.h request.h requesttypes.h session.h user.h -mounts.o: plugindata.h rebus.h config.h confparser.h htmlfilter.h -mounts.o: ../templates/htmltextstream.h ../notify/notify.h -mounts.o: ../notify/notifypool.h ../templates/locale.h ../core/confparser.h -mounts.o: ../templates/misc.h ../templates/localefilter.h -mounts.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -mounts.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -mounts.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -mounts.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -mounts.o: ../notify/notifythread.h ../core/basethread.h synchro.h -mounts.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -mounts.o: ugcontainer.h lastcontainer.h mountparser.h plugin.h pluginmsg.h -mounts.o: system.h users.h groups.h group.h loadavg.h thumb.h basethread.h -mounts.o: sessionmanager.h sessioncontainer.h ../functions/functions.h -mounts.o: ../functions/functionbase.h ../core/request.h ../core/system.h -mounts.o: ../core/synchro.h ../functions/functionparser.h -mounts.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h -mounts.o: ../functions/privchanger.h ../functions/chown.h -mounts.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h -mounts.o: ../functions/download.h ../functions/emacs.h ../functions/last.h -mounts.o: ../functions/login.h ../functions/logout.h ../functions/ln.h -mounts.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h -mounts.o: ../functions/node.h ../functions/priv.h ../functions/reload.h -mounts.o: ../functions/rm.h ../functions/run.h ../functions/specialdefault.h -mounts.o: ../functions/stat.h ../functions/subject.h ../functions/template.h +mounts.o: ../core/ugcontainer.h request.h requesttypes.h config.h +mounts.o: confparser.h htmlfilter.h ../templates/htmltextstream.h +mounts.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h +mounts.o: ../core/confparser.h ../templates/misc.h +mounts.o: ../templates/localefilter.h ../templates/locale.h +mounts.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +mounts.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h +mounts.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h +mounts.o: ../templates/htmltextstream.h ../notify/notifythread.h +mounts.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h +mounts.o: ../core/config.h ../core/users.h user.h ugcontainer.h +mounts.o: lastcontainer.h cur.h session.h plugindata.h rebus.h mountparser.h +mounts.o: plugin.h pluginmsg.h system.h users.h groups.h group.h loadavg.h +mounts.o: thumb.h basethread.h sessionmanager.h sessioncontainer.h +mounts.o: ../functions/functions.h ../functions/functionbase.h +mounts.o: ../core/request.h ../core/system.h ../core/synchro.h +mounts.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h +mounts.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h +mounts.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h +mounts.o: ../functions/default.h ../functions/download.h ../functions/emacs.h +mounts.o: ../functions/last.h ../functions/login.h ../functions/logout.h +mounts.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h +mounts.o: ../functions/mv.h ../functions/node.h ../functions/priv.h +mounts.o: ../functions/reload.h ../functions/rm.h ../functions/run.h +mounts.o: ../functions/specialdefault.h ../functions/stat.h +mounts.o: ../functions/subject.h ../functions/template.h mounts.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h mounts.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h mounts.o: ../core/htmlfilter.h ../templates/templates.h @@ -175,12 +177,11 @@ mounts.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h mounts.o: ../core/httpsimpleparser.h ../core/log.h mounts.o: ../templates/indexpatterns.h ../core/sessionmanager.h plugin.o: plugin.h pluginmsg.h log.h textstream.h plugindata.h config.h -plugin.o: confparser.h htmlfilter.h request.h requesttypes.h session.h item.h -plugin.o: error.h user.h rebus.h ../templates/htmltextstream.h -plugin.o: ../core/textstream.h misc.h system.h dirs.h dircontainer.h -plugin.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h -plugin.o: ../core/error.h ../db/dbitemquery.h ../core/item.h -plugin.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h +plugin.o: confparser.h htmlfilter.h request.h requesttypes.h item.h error.h +plugin.o: ../templates/htmltextstream.h ../core/textstream.h misc.h system.h +plugin.o: dirs.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +plugin.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h +plugin.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h plugin.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h plugin.o: ../notify/notifypool.h ../templates/locale.h ../core/confparser.h plugin.o: ../templates/misc.h ../templates/localefilter.h @@ -189,21 +190,22 @@ plugin.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h plugin.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h plugin.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h plugin.o: ../notify/notifythread.h ../core/basethread.h synchro.h -plugin.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -plugin.o: ugcontainer.h lastcontainer.h mounts.h mount.h mountparser.h -plugin.o: users.h groups.h group.h loadavg.h thumb.h basethread.h -plugin.o: sessionmanager.h sessioncontainer.h ../functions/functions.h -plugin.o: ../functions/functionbase.h ../core/request.h ../core/system.h -plugin.o: ../core/synchro.h ../functions/functionparser.h -plugin.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h -plugin.o: ../functions/privchanger.h ../functions/chown.h -plugin.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h -plugin.o: ../functions/download.h ../functions/emacs.h ../functions/last.h -plugin.o: ../functions/login.h ../functions/logout.h ../functions/ln.h -plugin.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h -plugin.o: ../functions/node.h ../functions/priv.h ../functions/reload.h -plugin.o: ../functions/rm.h ../functions/run.h ../functions/specialdefault.h -plugin.o: ../functions/stat.h ../functions/subject.h ../functions/template.h +plugin.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h user.h +plugin.o: ugcontainer.h lastcontainer.h cur.h session.h rebus.h mounts.h +plugin.o: mount.h mountparser.h users.h groups.h group.h loadavg.h thumb.h +plugin.o: basethread.h sessionmanager.h sessioncontainer.h +plugin.o: ../functions/functions.h ../functions/functionbase.h +plugin.o: ../core/request.h ../core/system.h ../core/synchro.h +plugin.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h +plugin.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h +plugin.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h +plugin.o: ../functions/default.h ../functions/download.h ../functions/emacs.h +plugin.o: ../functions/last.h ../functions/login.h ../functions/logout.h +plugin.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h +plugin.o: ../functions/mv.h ../functions/node.h ../functions/priv.h +plugin.o: ../functions/reload.h ../functions/rm.h ../functions/run.h +plugin.o: ../functions/specialdefault.h ../functions/stat.h +plugin.o: ../functions/subject.h ../functions/template.h plugin.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h plugin.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h plugin.o: ../core/htmlfilter.h ../templates/templates.h @@ -211,15 +213,14 @@ plugin.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h plugin.o: ../core/httpsimpleparser.h ../core/log.h plugin.o: ../templates/indexpatterns.h ../core/sessionmanager.h plugindata.o: plugindata.h plugin.h pluginmsg.h log.h textstream.h config.h -plugindata.o: confparser.h htmlfilter.h request.h requesttypes.h session.h -plugindata.o: item.h error.h user.h rebus.h ../templates/htmltextstream.h -plugindata.o: ../core/textstream.h misc.h system.h dirs.h dircontainer.h -plugindata.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h -plugindata.o: ../core/error.h ../db/dbitemquery.h ../core/item.h -plugindata.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -plugindata.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h -plugindata.o: ../notify/notifypool.h ../templates/locale.h -plugindata.o: ../core/confparser.h ../templates/misc.h +plugindata.o: confparser.h htmlfilter.h request.h requesttypes.h item.h +plugindata.o: error.h ../templates/htmltextstream.h ../core/textstream.h +plugindata.o: misc.h system.h dirs.h dircontainer.h ../db/db.h ../db/dbbase.h +plugindata.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h +plugindata.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h +plugindata.o: ../core/user.h ../core/group.h ../core/dircontainer.h +plugindata.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h +plugindata.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h plugindata.o: ../templates/localefilter.h ../templates/locale.h plugindata.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h plugindata.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h @@ -227,11 +228,12 @@ plugindata.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h plugindata.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h plugindata.o: ../notify/notifythread.h ../core/basethread.h synchro.h plugindata.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -plugindata.o: ugcontainer.h lastcontainer.h mounts.h mount.h mountparser.h -plugindata.o: users.h groups.h group.h loadavg.h thumb.h basethread.h -plugindata.o: sessionmanager.h sessioncontainer.h ../functions/functions.h +plugindata.o: user.h ugcontainer.h lastcontainer.h cur.h session.h rebus.h +plugindata.o: mounts.h mount.h mountparser.h users.h groups.h group.h +plugindata.o: loadavg.h thumb.h basethread.h sessionmanager.h +plugindata.o: sessioncontainer.h ../functions/functions.h plugindata.o: ../functions/functionbase.h ../core/request.h ../core/system.h -plugindata.o: ../core/synchro.h ../functions/functionparser.h +plugindata.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h plugindata.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h plugindata.o: ../functions/privchanger.h ../functions/chown.h plugindata.o: ../functions/ckeditor.h ../functions/cp.h @@ -252,38 +254,40 @@ plugindata.o: ../templates/indexpatterns.h ../core/sessionmanager.h postmultiparser.o: postmultiparser.h error.h requesttypes.h config.h postmultiparser.o: confparser.h htmlfilter.h log.h textstream.h postmultiparser.o: ../../ezc/src/utf8.h misc.h item.h -rebus.o: log.h textstream.h rebus.h misc.h item.h request.h requesttypes.h -rebus.o: session.h error.h user.h plugindata.h config.h confparser.h -rebus.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h -request.o: request.h requesttypes.h session.h item.h error.h user.h -request.o: plugindata.h rebus.h config.h confparser.h htmlfilter.h -request.o: textstream.h ../templates/htmltextstream.h ../core/textstream.h -request.o: misc.h log.h plugin.h pluginmsg.h system.h dirs.h dircontainer.h -request.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h -request.o: ../core/error.h ../db/dbitemquery.h ../core/item.h -request.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h -request.o: ../core/dircontainer.h ../core/ugcontainer.h ../notify/notify.h -request.o: ../notify/notifypool.h ../templates/locale.h ../core/confparser.h -request.o: ../templates/misc.h ../templates/localefilter.h -request.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -request.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -request.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h -request.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -request.o: ../notify/notifythread.h ../core/basethread.h synchro.h -request.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h -request.o: ugcontainer.h lastcontainer.h mounts.h mount.h mountparser.h -request.o: users.h groups.h group.h loadavg.h thumb.h basethread.h -request.o: sessionmanager.h sessioncontainer.h ../functions/functions.h -request.o: ../functions/functionbase.h ../core/request.h ../core/system.h -request.o: ../core/synchro.h ../functions/functionparser.h -request.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h -request.o: ../functions/privchanger.h ../functions/chown.h -request.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h -request.o: ../functions/download.h ../functions/emacs.h ../functions/last.h -request.o: ../functions/login.h ../functions/logout.h ../functions/ln.h -request.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h -request.o: ../functions/node.h ../functions/priv.h ../functions/reload.h -request.o: ../functions/rm.h ../functions/run.h ../functions/specialdefault.h +rebus.o: log.h textstream.h rebus.h misc.h item.h cur.h request.h +rebus.o: requesttypes.h error.h config.h confparser.h htmlfilter.h +rebus.o: ../templates/htmltextstream.h ../core/textstream.h session.h user.h +rebus.o: plugindata.h +request.o: request.h requesttypes.h item.h error.h config.h confparser.h +request.o: htmlfilter.h textstream.h ../templates/htmltextstream.h +request.o: ../core/textstream.h misc.h log.h plugin.h pluginmsg.h +request.o: plugindata.h system.h dirs.h dircontainer.h ../db/db.h +request.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h +request.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h +request.o: ../core/user.h ../core/group.h ../core/dircontainer.h +request.o: ../core/ugcontainer.h ../notify/notify.h ../notify/notifypool.h +request.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h +request.o: ../templates/localefilter.h ../templates/locale.h +request.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +request.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h +request.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h +request.o: ../templates/htmltextstream.h ../notify/notifythread.h +request.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h +request.o: ../core/config.h ../core/users.h user.h ugcontainer.h +request.o: lastcontainer.h cur.h session.h rebus.h mounts.h mount.h +request.o: mountparser.h users.h groups.h group.h loadavg.h thumb.h +request.o: basethread.h sessionmanager.h sessioncontainer.h +request.o: ../functions/functions.h ../functions/functionbase.h +request.o: ../core/request.h ../core/system.h ../core/synchro.h +request.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h +request.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h +request.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h +request.o: ../functions/default.h ../functions/download.h +request.o: ../functions/emacs.h ../functions/last.h ../functions/login.h +request.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h +request.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h +request.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h +request.o: ../functions/run.h ../functions/specialdefault.h request.o: ../functions/stat.h ../functions/subject.h ../functions/template.h request.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h request.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h @@ -293,15 +297,15 @@ request.o: ../core/httpsimpleparser.h ../core/log.h request.o: ../templates/indexpatterns.h ../core/sessionmanager.h session.o: session.h item.h error.h user.h plugindata.h rebus.h misc.h sessioncontainer.o: sessioncontainer.h session.h item.h error.h user.h -sessioncontainer.o: plugindata.h rebus.h lastcontainer.h request.h -sessioncontainer.o: requesttypes.h config.h confparser.h htmlfilter.h -sessioncontainer.o: textstream.h ../templates/htmltextstream.h -sessioncontainer.o: ../core/textstream.h misc.h basethread.h log.h +sessioncontainer.o: plugindata.h rebus.h cur.h request.h requesttypes.h +sessioncontainer.o: config.h confparser.h htmlfilter.h textstream.h +sessioncontainer.o: ../templates/htmltextstream.h ../core/textstream.h misc.h +sessioncontainer.o: log.h sessionmanager.o: sessionmanager.h sessioncontainer.h session.h item.h -sessionmanager.o: error.h user.h plugindata.h rebus.h lastcontainer.h -sessionmanager.o: request.h requesttypes.h config.h confparser.h htmlfilter.h +sessionmanager.o: error.h user.h plugindata.h rebus.h cur.h request.h +sessionmanager.o: requesttypes.h config.h confparser.h htmlfilter.h sessionmanager.o: textstream.h ../templates/htmltextstream.h -sessionmanager.o: ../core/textstream.h misc.h basethread.h system.h dirs.h +sessionmanager.o: ../core/textstream.h misc.h lastcontainer.h system.h dirs.h sessionmanager.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h sessionmanager.o: ../db/dbtextstream.h ../core/error.h log.h sessionmanager.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h @@ -318,57 +322,58 @@ sessionmanager.o: ../notify/notifythread.h ../core/basethread.h synchro.h sessionmanager.o: ../notify/templatesnotify.h ../core/config.h sessionmanager.o: ../core/users.h ugcontainer.h mounts.h mount.h sessionmanager.o: mountparser.h users.h groups.h group.h loadavg.h thumb.h -sessionmanager.o: sessionparser.h plugin.h pluginmsg.h +sessionmanager.o: basethread.h sessionparser.h plugin.h pluginmsg.h sessionmanager.o: ../functions/functions.h ../functions/functionbase.h sessionmanager.o: ../core/request.h ../core/system.h ../core/synchro.h -sessionmanager.o: ../functions/functionparser.h ../functions/adduser.h -sessionmanager.o: ../functions/cat.h ../functions/chmod.h -sessionmanager.o: ../functions/privchanger.h ../functions/chown.h -sessionmanager.o: ../functions/ckeditor.h ../functions/cp.h -sessionmanager.o: ../functions/default.h ../functions/download.h -sessionmanager.o: ../functions/emacs.h ../functions/last.h -sessionmanager.o: ../functions/login.h ../functions/logout.h -sessionmanager.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h -sessionmanager.o: ../functions/mv.h ../functions/node.h ../functions/priv.h -sessionmanager.o: ../functions/reload.h ../functions/rm.h ../functions/run.h -sessionmanager.o: ../functions/specialdefault.h ../functions/stat.h -sessionmanager.o: ../functions/subject.h ../functions/template.h -sessionmanager.o: ../functions/tinymce.h ../functions/uname.h -sessionmanager.o: ../functions/upload.h ../functions/uptime.h -sessionmanager.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h -sessionmanager.o: ../templates/templates.h ../templates/patterncacher.h +sessionmanager.o: ../functions/functionparser.h ../core/cur.h +sessionmanager.o: ../functions/adduser.h ../functions/cat.h +sessionmanager.o: ../functions/chmod.h ../functions/privchanger.h +sessionmanager.o: ../functions/chown.h ../functions/ckeditor.h +sessionmanager.o: ../functions/cp.h ../functions/default.h +sessionmanager.o: ../functions/download.h ../functions/emacs.h +sessionmanager.o: ../functions/last.h ../functions/login.h +sessionmanager.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h +sessionmanager.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h +sessionmanager.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h +sessionmanager.o: ../functions/run.h ../functions/specialdefault.h +sessionmanager.o: ../functions/stat.h ../functions/subject.h +sessionmanager.o: ../functions/template.h ../functions/tinymce.h +sessionmanager.o: ../functions/uname.h ../functions/upload.h +sessionmanager.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h +sessionmanager.o: ../core/htmlfilter.h ../templates/templates.h +sessionmanager.o: ../templates/patterncacher.h sessionmanager.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h sessionmanager.o: ../core/log.h ../templates/indexpatterns.h sessionmanager.o: ../core/sessionmanager.h sessionparser.o: sessionparser.h session.h item.h error.h user.h plugindata.h -sessionparser.o: rebus.h sessioncontainer.h lastcontainer.h request.h -sessionparser.o: requesttypes.h config.h confparser.h htmlfilter.h -sessionparser.o: textstream.h ../templates/htmltextstream.h -sessionparser.o: ../core/textstream.h misc.h basethread.h users.h log.h +sessionparser.o: rebus.h sessioncontainer.h cur.h request.h requesttypes.h +sessionparser.o: config.h confparser.h htmlfilter.h textstream.h +sessionparser.o: ../templates/htmltextstream.h ../core/textstream.h misc.h +sessionparser.o: users.h log.h synchro.o: synchro.h system.o: system.h dirs.h item.h dircontainer.h ../db/db.h ../db/dbbase.h system.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h system.o: ../core/error.h log.h textstream.h ../db/dbitemquery.h system.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h system.o: ../core/dircontainer.h ../core/ugcontainer.h request.h -system.o: requesttypes.h session.h error.h user.h plugindata.h rebus.h -system.o: config.h confparser.h htmlfilter.h ../templates/htmltextstream.h -system.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h -system.o: ../core/confparser.h ../templates/misc.h -system.o: ../templates/localefilter.h ../templates/locale.h -system.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -system.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h -system.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h -system.o: ../templates/htmltextstream.h ../notify/notifythread.h -system.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h -system.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h +system.o: requesttypes.h error.h config.h confparser.h htmlfilter.h +system.o: ../templates/htmltextstream.h ../notify/notify.h +system.o: ../notify/notifypool.h ../templates/locale.h ../core/confparser.h +system.o: ../templates/misc.h ../templates/localefilter.h +system.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h +system.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h +system.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h +system.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +system.o: ../notify/notifythread.h ../core/basethread.h synchro.h +system.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h user.h +system.o: ugcontainer.h lastcontainer.h cur.h session.h plugindata.h rebus.h system.o: mounts.h mount.h mountparser.h users.h groups.h group.h loadavg.h system.o: thumb.h basethread.h ../templates/templates.h system.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h system.o: ../core/httpsimpleparser.h ../core/log.h -system.o: ../templates/indexpatterns.h ../core/request.h ../core/system.h +system.o: ../templates/indexpatterns.h ../core/cur.h ../core/system.h system.o: ../core/sessionmanager.h ../functions/functionbase.h -system.o: ../core/synchro.h +system.o: ../core/request.h ../core/synchro.h textstream.o: textstream.h misc.h item.h thumb.o: thumb.h basethread.h textstream.h ../db/db.h ../db/dbbase.h thumb.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h @@ -376,15 +381,16 @@ thumb.o: item.h ../core/error.h log.h ../db/dbitemquery.h ../core/item.h thumb.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h thumb.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/config.h thumb.o: ../../ezc/src/utf8.h system.h dirs.h dircontainer.h request.h -thumb.o: requesttypes.h session.h error.h user.h plugindata.h rebus.h -thumb.o: config.h confparser.h htmlfilter.h ../templates/htmltextstream.h -thumb.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h -thumb.o: ../core/confparser.h ../templates/misc.h ../templates/localefilter.h +thumb.o: requesttypes.h error.h config.h confparser.h htmlfilter.h +thumb.o: ../templates/htmltextstream.h ../notify/notify.h +thumb.o: ../notify/notifypool.h ../templates/locale.h ../core/confparser.h +thumb.o: ../templates/misc.h ../templates/localefilter.h thumb.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/generator.h thumb.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h thumb.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h thumb.o: ../templates/htmltextstream.h ../notify/notifythread.h thumb.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h -thumb.o: ../core/users.h ugcontainer.h lastcontainer.h mounts.h mount.h -thumb.o: mountparser.h users.h groups.h group.h loadavg.h +thumb.o: ../core/users.h user.h ugcontainer.h lastcontainer.h cur.h session.h +thumb.o: plugindata.h rebus.h mounts.h mount.h mountparser.h users.h groups.h +thumb.o: group.h loadavg.h users.o: users.h diff --git a/core/acceptbaseparser.h b/core/acceptbaseparser.h index adecdff..d78b7cc 100755 --- a/core/acceptbaseparser.h +++ b/core/acceptbaseparser.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoreacceptbaseparser -#define headerfilecmslucoreacceptbaseparser +#ifndef headerfile_winix_core_acceptbaseparser +#define headerfile_winix_core_acceptbaseparser #include diff --git a/core/acceptencodingparser.h b/core/acceptencodingparser.h index 9dcad6a..043fc4a 100755 --- a/core/acceptencodingparser.h +++ b/core/acceptencodingparser.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoreacceptencodingparser -#define headerfilecmslucoreacceptencodingparser +#ifndef headerfile_winix_core_acceptencodingparser +#define headerfile_winix_core_acceptencodingparser #include "acceptbaseparser.h" #include "log.h" diff --git a/core/app.cpp b/core/app.cpp index 0c60c92..db4a672 100755 --- a/core/app.cpp +++ b/core/app.cpp @@ -31,33 +31,37 @@ App::App() last_sessions_save = std::time(0); fcgi_socket = -1; + // temporary there is only one request + cur.request = &req; + cur.session = session_manager.GetTmpSession(); + db.SetConn(db_conn); plugin.SetDb(&db); plugin.SetConfig(&config); - plugin.SetRequest(&request); + plugin.SetCur(&cur); plugin.SetSystem(&system); plugin.SetFunctions(&functions); plugin.SetTemplates(&templates); plugin.SetSynchro(&synchro); plugin.SetSessionManager(&session_manager); - request.SetConfig(&config); + req.SetConfig(&config); functions.SetConfig(&config); - functions.SetRequest(&request); + functions.SetCur(&cur); functions.SetDb(&db); functions.SetSystem(&system); functions.SetTemplates(&templates); functions.SetSynchro(&synchro); system.SetConfig(&config); - system.SetRequest(&request); + system.SetCur(&cur); system.SetDb(&db); system.SetSynchro(&synchro); templates.SetConfig(&config); - templates.SetRequest(&request); + templates.SetCur(&cur); templates.SetDb(&db); templates.SetSystem(&system); templates.SetFunctions(&functions); @@ -65,7 +69,7 @@ App::App() session_manager.SetLastContainer(&system.users.last); session_manager.SetConfig(&config); - session_manager.SetRequest(&request); + session_manager.SetCur(&cur); session_manager.SetSystem(&system); session_manager.SetSynchro(&synchro); @@ -131,7 +135,7 @@ bool App::Init() db_conn.WaitForConnection(); db.LogQueries(config.log_db_query); - request.Clear(); + cur.request->Clear(); compress.Init(); system.Init(); functions.Init(); @@ -143,6 +147,7 @@ bool App::Init() // init notify after templates (it uses locales from templates) system.notify.ReadTemplates(); + session_manager.InitTmpSession(); session_manager.LoadSessions(); CreateStaticTree(); @@ -158,7 +163,8 @@ void App::Close() { session_manager.SaveSessions(); session_manager.DeleteSessions(); - request.Clear(); + cur.request->Clear(); + session_manager.UninitTmpSession(); } @@ -168,13 +174,13 @@ bool App::BaseUrlRedirect() if( config.base_url_http_host.empty() ) return false; - if( Equal(config.base_url_http_host.c_str(), request.env_http_host) ) + if( Equal(config.base_url_http_host.c_str(), cur.request->env_http_host) ) return false; - request.redirect_to = config.base_url; - AssignString(request.env_request_uri, request.redirect_to, false); + cur.request->redirect_to = config.base_url; + AssignString(cur.request->env_request_uri, cur.request->redirect_to, false); - log << log3 << "RC: BaseUrlRedirect from: " << request.env_http_host << logend; + log << log3 << "RC: BaseUrlRedirect from: " << cur.request->env_http_host << logend; return true; } @@ -184,19 +190,23 @@ void App::ProcessRequestThrow() { ReadRequest(); - // when BaseUrlRedirect() return true we didn't have to set everything in request.Read() - // in the future request.Read() can be split and at the beginning only environment variables will be read + // when BaseUrlRedirect() return true we didn't have to set everything in cur.request->Read() + // in the future cur.request->Read() can be split and at the beginning only environment variables will be read // and then BaseUrlRedirect() will be called (for performance) if( !BaseUrlRedirect() ) { - session_manager.SetSession(); // set request.session as well - // !! dac zeby zwracalo wskaznik (zawsze prawidlowy) na sesje - // i tutaj przypisanie do request.session + session_manager.SetSession(); + cur.session = session_manager.GetCurSession(); - // !! tutaj dodac to ustawianie request.session + if( cur.session->new_session ) + { + cur.session->plugin_data.Resize(plugin.Size()); + plugin.Call(WINIX_SESSION_CREATED); + } + + plugin.Call(WINIX_SESSION_CHANGED); functions.Parse(); - system.mounts.CalcCurMount(); Make(); @@ -216,7 +226,6 @@ void App::ProcessRequest() ProcessRequestThrow(); SaveSessionsIfNeeded(); // !! przerzucic to na watek sesji - request.Clear(); system.load_avg.StopRequest(); log << logendrequest; } @@ -232,6 +241,9 @@ void App::ProcessRequest() { log << log1 << "App: there was an unknown exception" << logend; } + + cur.request->Clear(); + cur.session = session_manager.GetTmpSession(); } @@ -270,20 +282,20 @@ void App::MakePage() bool sent = false; - if( !request.redirect_to.empty() || !request.x_sendfile.empty() ) + if( !cur.request->redirect_to.empty() || !cur.request->x_sendfile.empty() ) return; - if( request.is_item && request.item.file_type == WINIX_ITEM_FILETYPE_NONE && - request.item.content_type == Item::ct_raw && request.status == WINIX_ERR_OK && request.function ) + if( cur.request->is_item && cur.request->item.file_type == WINIX_ITEM_FILETYPE_NONE && + cur.request->item.content_type == Item::ct_raw && cur.request->status == WINIX_ERR_OK && cur.request->function ) { - if( request.function == &functions.fun_cat ) + if( cur.request->function == &functions.fun_cat ) { - request.page << request.item.content; + cur.request->page << cur.request->item.content; sent = true; } else - if( request.function == &functions.fun_run ) + if( cur.request->function == &functions.fun_run ) { templates.GenerateRunRaw(); sent = true; @@ -301,35 +313,35 @@ bool sent = false; // !! ta nazwa chyba juz zajeta... void App::Make() { - if( request.dir_tab.empty() ) + if( cur.request->dir_tab.empty() ) { log << log1 << "Content: there is no a root dir (dir_tab is empty)" << logend; return; } - // request.status can be changed by function_parser - if( request.status == WINIX_ERR_OK ) + // cur.request->status can be changed by function_parser + if( cur.request->status == WINIX_ERR_OK ) plugin.Call(WINIX_PREPARE_REQUEST); - if( request.status == WINIX_ERR_OK ) + if( cur.request->status == WINIX_ERR_OK ) functions.CheckFunctionAndSymlink(); - if( request.status == WINIX_ERR_OK ) + if( cur.request->status == WINIX_ERR_OK ) functions.MakeFunction(); - if( request.session->spam_score > 0 ) - log << log1 << "App: spam score: " << request.session->spam_score << logend; + if( cur.session->spam_score > 0 ) + log << log1 << "App: spam score: " << cur.session->spam_score << logend; - if( request.IsParam(L"noredirect") ) - request.redirect_to.clear(); + if( cur.request->IsParam(L"noredirect") ) + cur.request->redirect_to.clear(); - if( request.status == WINIX_ERR_OK ) + if( cur.request->status == WINIX_ERR_OK ) plugin.Call(WINIX_PROCESS_REQUEST); - if( !request.redirect_to.empty() ) + if( !cur.request->redirect_to.empty() ) return; - if( request.dir_tab.empty() ) + if( cur.request->dir_tab.empty() ) { log << log1 << "App: there is no a root dir (dir_tab is empty -- after calling a function)" << logend; return; @@ -342,8 +354,8 @@ void App::Make() { // !! dodac inne informacje (get, post, itp) // jesli jest debug_info wlaczone to nie robic przekierowan - request.PrintGetTab(); - //request.PrintEnv(); // !! PrintEnv() mozna przeniesc tutaj (do klasy App) + cur.request->PrintGetTab(); + //cur.request->PrintEnv(); // !! PrintEnv() mozna przeniesc tutaj (do klasy App) } } @@ -361,13 +373,13 @@ void App::ReadRequest() LogAccess(); ReadGetPostVars(); - cookie_parser.Parse(request.env_http_cookie, request.cookie_tab); - accept_encoding_parser.Parse(request.env_http_accept_encoding); + cookie_parser.Parse(cur.request->env_http_cookie, cur.request->cookie_tab); + accept_encoding_parser.Parse(cur.request->env_http_accept_encoding); CheckIE(); CheckKonqueror(); - if( request.role == Request::authorizer ) + if( cur.request->role == Request::authorizer ) log << log3 << "Request: fast cgi role: authorizer" << logend; } @@ -380,7 +392,7 @@ const char * v = FCGX_GetParam(name, fcgi_request.envp); if( v ) env = v; - // by default env is set to an empty string (in request.Clear() method) + // by default env is set to an empty string (in cur.request->Clear() method) } @@ -390,41 +402,41 @@ void App::ReadEnvVariables() // we store that values because FCGX_GetParam has O(n) complexity // with this variables (env_*) we have O(1) - SetEnv(request.env_request_method, "REQUEST_METHOD"); // !! mozna nie uzywac tego, teraz mamy w strukturze fcgi_request - SetEnv(request.env_request_uri, "REQUEST_URI"); - SetEnv(request.env_http_cookie, "HTTP_COOKIE"); - SetEnv(request.env_remote_addr, "REMOTE_ADDR"); - SetEnv(request.env_http_host, "HTTP_HOST"); - SetEnv(request.env_http_user_agent, "HTTP_USER_AGENT"); - SetEnv(request.env_fcgi_role, "FCGI_ROLE"); - SetEnv(request.env_content_type, "CONTENT_TYPE"); - SetEnv(request.env_http_accept_encoding,"HTTP_ACCEPT_ENCODING"); + SetEnv(cur.request->env_request_method, "REQUEST_METHOD"); // !! mozna nie uzywac tego, teraz mamy w strukturze fcgi_request + SetEnv(cur.request->env_request_uri, "REQUEST_URI"); + SetEnv(cur.request->env_http_cookie, "HTTP_COOKIE"); + SetEnv(cur.request->env_remote_addr, "REMOTE_ADDR"); + SetEnv(cur.request->env_http_host, "HTTP_HOST"); + SetEnv(cur.request->env_http_user_agent, "HTTP_USER_AGENT"); + SetEnv(cur.request->env_fcgi_role, "FCGI_ROLE"); + SetEnv(cur.request->env_content_type, "CONTENT_TYPE"); + SetEnv(cur.request->env_http_accept_encoding,"HTTP_ACCEPT_ENCODING"); } void App::CheckRequestMethod() { - request.method = Request::none; + cur.request->method = Request::none; - if( ToSmall(request.env_request_method[0]) == 'g' ) - request.method = Request::get; + if( ToSmall(cur.request->env_request_method[0]) == 'g' ) + cur.request->method = Request::get; else - if( ToSmall(request.env_request_method[0]) == 'p' ) - request.method = Request::post; + if( ToSmall(cur.request->env_request_method[0]) == 'p' ) + cur.request->method = Request::post; else - if( ToSmall(request.env_request_method[0]) == 'h' ) - request.method = Request::head; + if( ToSmall(cur.request->env_request_method[0]) == 'h' ) + cur.request->method = Request::head; } void App::CheckFCGIRole() { // default we assume 'responder' - request.role = Request::responder; + cur.request->role = Request::responder; - if( ToSmall(request.env_fcgi_role[0]) == 'a' ) - request.role = Request::authorizer; + if( ToSmall(cur.request->env_fcgi_role[0]) == 'a' ) + cur.request->role = Request::authorizer; } @@ -433,11 +445,11 @@ void App::LogAccess() { log.PutDate(log1); - log << request.env_remote_addr << ' ' - << request.env_request_method << ' ' - << request.env_http_host - << request.env_request_uri << ' ' - << request.env_http_user_agent << logend; + log << cur.request->env_remote_addr << ' ' + << cur.request->env_request_method << ' ' + << cur.request->env_http_host + << cur.request->env_request_uri << ' ' + << cur.request->env_http_user_agent << logend; } @@ -447,22 +459,22 @@ void App::ReadGetPostVars() { // get parameters we have always get_parser.UTF8(config.utf8); - get_parser.Parse(request.env_request_uri, request.get_tab); + get_parser.Parse(cur.request->env_request_uri, cur.request->get_tab); - if( request.method == Request::post ) + if( cur.request->method == Request::post ) { - if( IsSubStringNoCase("multipart/form-data", request.env_content_type) ) + if( IsSubStringNoCase("multipart/form-data", cur.request->env_content_type) ) { log << log3 << "Request: post content type: multipart/form-data" << logend; // !! dodac metode UTF8 do post_multi_parsera // (narazie bierze bezposrednio z konfigu) // w ogole wywalic zaleznosc od konfiga - post_multi_parser.Parse(fcgi_request.in, request.post_tab, request.post_file_tab); + post_multi_parser.Parse(fcgi_request.in, cur.request->post_tab, cur.request->post_file_tab); } else { post_parser.UTF8(config.utf8); - post_parser.Parse(fcgi_request.in, request.post_tab); + post_parser.Parse(fcgi_request.in, cur.request->post_tab); } } } @@ -472,24 +484,24 @@ void App::ReadGetPostVars() void App::CheckIE() { - char * msie = strstr(request.env_http_user_agent, "MSIE"); + char * msie = strstr(cur.request->env_http_user_agent, "MSIE"); if( msie ) - request.browser_msie = true; + cur.request->browser_msie = true; else - request.browser_msie = false; + cur.request->browser_msie = false; } void App::CheckKonqueror() { - char * kon = strstr(request.env_http_user_agent, "Konqueror"); + char * kon = strstr(cur.request->env_http_user_agent, "Konqueror"); if( kon ) - request.browser_konqueror = true; + cur.request->browser_konqueror = true; else - request.browser_konqueror = false; + cur.request->browser_konqueror = false; } @@ -499,18 +511,18 @@ void App::CheckKonqueror() void App::PrepareSessionCookie() { - if( !request.session || request.session->id==0 ) + if( !cur.session || cur.session->id==0 ) return; - if( !request.session->puser || !request.session->remember_me ) + if( !cur.session->puser || !cur.session->remember_me ) { - request.SetCookie(config.http_session_id_name.c_str(), request.session->id); + cur.request->SetCookie(config.http_session_id_name.c_str(), cur.session->id); } else { time_t t = std::time(0) + config.session_remember_max_idle; tm expires = Time(t); - request.SetCookie(config.http_session_id_name.c_str(), request.session->id, &expires); + cur.request->SetCookie(config.http_session_id_name.c_str(), cur.session->id, &expires); } } @@ -521,27 +533,27 @@ void App::SendHeaders(bool compressing, Header header) { PrepareSessionCookie(); - if( request.send_as_attachment ) + if( cur.request->send_as_attachment ) FCGX_PutS("Content-Disposition: attachment\r\n", fcgi_request.out); - if( !request.redirect_to.empty() ) + if( !cur.request->redirect_to.empty() ) { FCGX_PutS("Status: 301 Moved Permanently\r\n", fcgi_request.out); - UrlEncode(request.redirect_to, request.aredirect_to); - FCGX_FPrintF(fcgi_request.out, "Location: %s\r\n", request.aredirect_to.c_str()); - log << log2 << "Redirect to: " << request.aredirect_to << logend; + UrlEncode(cur.request->redirect_to, cur.request->aredirect_to); + FCGX_FPrintF(fcgi_request.out, "Location: %s\r\n", cur.request->aredirect_to.c_str()); + log << log2 << "Redirect to: " << cur.request->aredirect_to << logend; } else - if( !request.x_sendfile.empty() ) + if( !cur.request->x_sendfile.empty() ) { static std::string temp, temp2; // !! wrzucic gdzies to Ezc::WideToUTF8(config.http_header_send_file, temp); - Ezc::WideToUTF8(request.x_sendfile, temp2); + Ezc::WideToUTF8(cur.request->x_sendfile, temp2); FCGX_FPrintF(fcgi_request.out, "%s: %s\r\n", temp.c_str(), temp2.c_str()); FCGX_PutS("Status: 200 OK\r\n", fcgi_request.out); - log << log2 << "Sending file: " << request.x_sendfile << logend; + log << log2 << "Sending file: " << cur.request->x_sendfile << logend; } else { @@ -562,7 +574,7 @@ void App::SendHeaders(bool compressing, Header header) default: FCGX_PutS("Status: 200 OK\r\n", fcgi_request.out); - if( request.role != Request::authorizer ) + if( cur.request->role != Request::authorizer ) FCGX_PutS("Content-Type: text/html\r\n", fcgi_request.out); } } @@ -570,7 +582,7 @@ void App::SendHeaders(bool compressing, Header header) if( compressing ) FCGX_PutS("Content-Encoding: deflate\r\n", fcgi_request.out); - FCGX_PutS(request.headers.CStr(), fcgi_request.out); + FCGX_PutS(cur.request->headers.CStr(), fcgi_request.out); FCGX_PutS("\r\n", fcgi_request.out); } @@ -593,8 +605,8 @@ void App::FilterCompressSend(bool compressing, const std::wstring & source_ref) { const std::wstring * source = &source_ref; - bool raw = request.is_item && request.item.content_type == Item::ct_raw && request.status == WINIX_ERR_OK && - request.function && (request.function == &functions.fun_cat || request.function == &functions.fun_run); + bool raw = cur.request->is_item && cur.request->item.content_type == Item::ct_raw && cur.request->status == WINIX_ERR_OK && + cur.request->function && (cur.request->function == &functions.fun_cat || cur.request->function == &functions.fun_run); if( config.html_filter && !raw ) { @@ -626,11 +638,11 @@ void App::FilterCompressSend(bool compressing, const std::wstring & source_ref) bool App::IsCompressionAllowed(const std::wstring & source) { return( config.compression && - request.role == Request::responder && - request.redirect_to.empty() && - request.x_sendfile.empty() && - !request.browser_msie && - !request.browser_konqueror && + cur.request->role == Request::responder && + cur.request->redirect_to.empty() && + cur.request->x_sendfile.empty() && + !cur.request->browser_msie && + !cur.request->browser_konqueror && accept_encoding_parser.AcceptDeflate() && source.size() >= (size_t)config.compression_page_min_size ); } @@ -638,11 +650,11 @@ bool App::IsCompressionAllowed(const std::wstring & source) bool App::CanSendContent(Header header) { - if( !request.redirect_to.empty() || !request.x_sendfile.empty() ) + if( !cur.request->redirect_to.empty() || !cur.request->x_sendfile.empty() ) // if there is a redirect or a file to send then we do not send a content return false; - if( header == h_200 && request.role == Request::authorizer && request.is_item && request.item.file_type != WINIX_ITEM_FILETYPE_NONE ) + if( header == h_200 && cur.request->role == Request::authorizer && cur.request->is_item && cur.request->item.file_type != WINIX_ITEM_FILETYPE_NONE ) // if there is an item and the item has 'file' storage we do not send a content return false; @@ -650,7 +662,7 @@ bool App::CanSendContent(Header header) we don't have to check the HEAD method the server (lighttpd) doesn't send the body of its own */ - if( request.method == Request::head ) + if( cur.request->method == Request::head ) return false; return true; @@ -661,10 +673,10 @@ void App::AddDebugInfo(std::wstring & out) { if( config.debug_info ) { - if( !request.debug.Empty() ) + if( !cur.request->debug.Empty() ) { out += L"\n\n"; } } @@ -674,10 +686,10 @@ void App::AddDebugInfo(std::wstring & out) void App::SendAnswer() { -const std::wstring & source = request.page.Str(); +const std::wstring & source = cur.request->page.Str(); Header header = h_200; bool compressing = IsCompressionAllowed(source); -Error status = request.status; +Error status = cur.request->status; if( status == WINIX_ERR_NO_ITEM || status == WINIX_ERR_NO_FUNCTION || status == WINIX_ERR_UNKNOWN_PARAM ) header = h_404; @@ -964,7 +976,7 @@ void App::WaitForThreads() //pthread_join(signal_thread, 0); system.notify.WaitForThread(); - session_manager.WaitForGC(); + session_manager.WaitForThread(); system.thumb.WaitForThread(); } @@ -1000,7 +1012,7 @@ sigset_t set; FCGX_ShutdownPending(); Ezc::WideToUTF8(app->config.base_url, app->url_to_fetch_on_exit); app->system.notify.PrepareToStopThread(); - app->session_manager.PrepareToStopGC(); + app->session_manager.WakeUpThread(); app->system.thumb.WakeUpThread(); app->Unlock(); @@ -1033,7 +1045,7 @@ sigset_t set; system.notify.StartThread(); // gc for sessions - session_manager.StartGC(); + session_manager.StartThread(); // thumbnails system.thumb.StartThread(); diff --git a/core/app.h b/core/app.h index bb94690..7b164de 100755 --- a/core/app.h +++ b/core/app.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoreapp -#define headerfilecmslucoreapp +#ifndef headerfile_winix_core_app +#define headerfile_winix_core_app #include #include @@ -63,8 +63,12 @@ public: // configuration read from a config file Config config; + // pointers to the current request and a session + Cur cur; + + // temporary one request object // current request - Request request; + Request req; // users sessions SessionManager session_manager; @@ -127,6 +131,7 @@ private: Synchro synchro; pthread_t signal_thread; std::string url_to_fetch_on_exit; + void ProcessRequestThrow(); void ProcessRequest(); diff --git a/core/basethread.cpp b/core/basethread.cpp index be02c30..d750556 100755 --- a/core/basethread.cpp +++ b/core/basethread.cpp @@ -145,6 +145,9 @@ bool BaseThread::WaitForSignalSleep(time_t second) timespec t; int res; + if( synchro->was_stop_signal ) + return true; + t.tv_sec = time(0) + second; t.tv_nsec = 0; diff --git a/core/basethread.h b/core/basethread.h index f87c9c7..5cb1a26 100755 --- a/core/basethread.h +++ b/core/basethread.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucorebasethread -#define headerfilecmslucorebasethread +#ifndef headerfile_winix_core_basethread +#define headerfile_winix_core_basethread #include #include "synchro.h" diff --git a/core/bbcodeparser.h b/core/bbcodeparser.h index 1a2b046..b846403 100755 --- a/core/bbcodeparser.h +++ b/core/bbcodeparser.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucorebbcodeparser -#define headerfilecmslucorebbcodeparser +#ifndef headerfile_winix_core_bbcodeparser +#define headerfile_winix_core_bbcodeparser #include "htmlfilter.h" diff --git a/core/compress.h b/core/compress.h index cd6e745..7511094 100755 --- a/core/compress.h +++ b/core/compress.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucorecompress -#define headerfilecmslucorecompress +#ifndef headerfile_winix_core_compress +#define headerfile_winix_core_compress #include #include diff --git a/core/config.h b/core/config.h index 34472b5..fb9e3a5 100755 --- a/core/config.h +++ b/core/config.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoreconfig -#define headerfilecmslucoreconfig +#ifndef headerfile_winix_core_config +#define headerfile_winix_core_config #include #include "confparser.h" diff --git a/core/cookieparser.h b/core/cookieparser.h index 961a80d..3b26598 100755 --- a/core/cookieparser.h +++ b/core/cookieparser.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucorecookieparser -#define headerfilecmslucorecookieparser +#ifndef headerfile_winix_core_cookieparser +#define headerfile_winix_core_cookieparser #include #include "httpsimpleparser.h" diff --git a/core/cur.h b/core/cur.h new file mode 100755 index 0000000..e26e339 --- /dev/null +++ b/core/cur.h @@ -0,0 +1,34 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2010, Tomasz Sowa + * All rights reserved. + * + */ + +#ifndef headerfile_winix_core_cur +#define headerfile_winix_core_cur + +#include "request.h" +#include "session.h" + + +/* + current request and session +*/ +struct Cur +{ + Request * request; + Session * session; + + // those pointers are never null, if there is no a session for the user + // the 'session' pointer pointers at a special temporary session +}; + + + + + + +#endif diff --git a/core/dircontainer.h b/core/dircontainer.h index 8ffa3b3..9ea88e1 100755 --- a/core/dircontainer.h +++ b/core/dircontainer.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoredircontainer -#define headerfilecmslucoredircontainer +#ifndef headerfile_winix_core_dircontainer +#define headerfile_winix_core_dircontainer #include #include diff --git a/core/dirs.cpp b/core/dirs.cpp index 84ecd24..056d6fe 100755 --- a/core/dirs.cpp +++ b/core/dirs.cpp @@ -19,9 +19,9 @@ void Dirs::SetDb(Db * pdb) } -void Dirs::SetRequest(Request * prequest) +void Dirs::SetCur(Cur * pcur) { - request = prequest; + cur = pcur; } @@ -603,8 +603,8 @@ Error Dirs::AddDirectory(Item & item, bool add_to_dir_tab, Item ** pdir, int not { Item * d = AddDir(item); - if( add_to_dir_tab && !request->dir_tab.empty() && request->dir_tab.back()->id == item.parent_id ) - request->dir_tab.push_back(d); + if( add_to_dir_tab && !cur->request->dir_tab.empty() && cur->request->dir_tab.back()->id == item.parent_id ) + cur->request->dir_tab.push_back(d); if( pdir ) *pdir = d; diff --git a/core/dirs.h b/core/dirs.h index ef29bc4..52378d7 100755 --- a/core/dirs.h +++ b/core/dirs.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoredirs -#define headerfilecmslucoredirs +#ifndef headerfile_winix_core_dirs +#define headerfile_winix_core_dirs #include @@ -32,7 +32,7 @@ public: void Clear(); void ReadDirs(); - void SetRequest(Request * prequest); + void SetCur(Cur * pcur); void SetDb(Db * pdb); void SetNotify(Notify * pnotify); @@ -79,8 +79,8 @@ public: private: - Request * request; - Db * db; + Cur * cur; + Db * db; Notify * notify; DirContainer dir_tab; diff --git a/core/error.h b/core/error.h index 205190e..e76e162 100755 --- a/core/error.h +++ b/core/error.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoreerror -#define headerfilecmslucoreerror +#ifndef headerfile_winix_core_error +#define headerfile_winix_core_error #include #include "log.h" diff --git a/core/getparser.h b/core/getparser.h index 2760def..708f416 100755 --- a/core/getparser.h +++ b/core/getparser.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoregetparser -#define headerfilecmslucoregetparser +#ifndef headerfile_winix_core_getparser +#define headerfile_winix_core_getparser #include "httpsimpleparser.h" #include "requesttypes.h" diff --git a/core/group.h b/core/group.h index 9cb1ea7..2bee7b2 100755 --- a/core/group.h +++ b/core/group.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoregroup -#define headerfilecmslucoregroup +#ifndef headerfile_winix_core_group +#define headerfile_winix_core_group #include #include diff --git a/core/groups.h b/core/groups.h index 19b3b54..c77c5c9 100755 --- a/core/groups.h +++ b/core/groups.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoregroups -#define headerfilecmslucoregroups +#ifndef headerfile_winix_core_groups +#define headerfile_winix_core_groups #include diff --git a/core/htmlfilter.h b/core/htmlfilter.h index 72146c7..927c7b7 100755 --- a/core/htmlfilter.h +++ b/core/htmlfilter.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucorehtmlfilter -#define headerfilecmslucorehtmlfilter +#ifndef headerfile_winix_core_htmlfilter +#define headerfile_winix_core_htmlfilter #include diff --git a/core/httpsimpleparser.h b/core/httpsimpleparser.h index 57032ad..0bd4d25 100755 --- a/core/httpsimpleparser.h +++ b/core/httpsimpleparser.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucorehttpsimpleparser -#define headerfilecmslucorehttpsimpleparser +#ifndef headerfile_winix_core_httpsimpleparser +#define headerfile_winix_core_httpsimpleparser #include diff --git a/core/item.h b/core/item.h index 9ba682d..4628472 100755 --- a/core/item.h +++ b/core/item.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoreitem -#define headerfilecmslucoreitem +#ifndef headerfile_winix_core_item +#define headerfile_winix_core_item #include diff --git a/core/lastcontainer.cpp b/core/lastcontainer.cpp index ada9a02..ec10626 100755 --- a/core/lastcontainer.cpp +++ b/core/lastcontainer.cpp @@ -78,7 +78,7 @@ LastTab::iterator i = FindNotLoggedOut(user_id, session_id); return; } - if( last_tab.size() >= LAST_TABLE_SIZE ) // last_tab has O(n) complexity + if( last_tab.size() >= WINIX_LASTCONTAINER_TABLE_SIZE ) // last_tab has O(n) complexity last_tab.erase(last_tab.begin()); LastItem li; diff --git a/core/lastcontainer.h b/core/lastcontainer.h index f6f767a..27f4eb4 100755 --- a/core/lastcontainer.h +++ b/core/lastcontainer.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucorelastcontainer -#define headerfilecmslucorelastcontainer +#ifndef headerfile_winix_core_lastcontainer +#define headerfile_winix_core_lastcontainer #include #include @@ -18,7 +18,7 @@ // how many items we store in the 'last' function -#define LAST_TABLE_SIZE 100 +#define WINIX_LASTCONTAINER_TABLE_SIZE 100 diff --git a/core/loadavg.h b/core/loadavg.h index 484e3c1..d84e413 100755 --- a/core/loadavg.h +++ b/core/loadavg.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoreloadavg -#define headerfilecmslucoreloadavg +#ifndef headerfile_winix_core_loadavg +#define headerfile_winix_core_loadavg #include diff --git a/core/log.h b/core/log.h index b2498de..c99a192 100755 --- a/core/log.h +++ b/core/log.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucorelog -#define headerfilecmslucorelog +#ifndef headerfile_winix_core_log +#define headerfile_winix_core_log #include diff --git a/core/misc.h b/core/misc.h index 7ae442f..b2d1ca2 100755 --- a/core/misc.h +++ b/core/misc.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoremisc -#define headerfilecmslucoremisc +#ifndef headerfile_winix_core_misc +#define headerfile_winix_core_misc #include diff --git a/core/mount.h b/core/mount.h index 8f4e536..e08f6d5 100755 --- a/core/mount.h +++ b/core/mount.h @@ -8,8 +8,8 @@ */ -#ifndef headerfilecmslucoremount -#define headerfilecmslucoremount +#ifndef headerfile_winix_core_mount +#define headerfile_winix_core_mount #include #include diff --git a/core/mountparser.h b/core/mountparser.h index cfddffe..7e26b54 100755 --- a/core/mountparser.h +++ b/core/mountparser.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoremountparser -#define headerfilecmslucoremountparser +#ifndef headerfile_winix_core_mountparser +#define headerfile_winix_core_mountparser #include #include diff --git a/core/mounts.cpp b/core/mounts.cpp index 6fe6d37..9036f94 100755 --- a/core/mounts.cpp +++ b/core/mounts.cpp @@ -73,9 +73,9 @@ void Mounts::SetDb(Db * pdb) db = pdb; } -void Mounts::SetRequest(Request * prequest) +void Mounts::SetCur(Cur * pcur) { - request = prequest; + cur = pcur; } @@ -252,10 +252,10 @@ std::vector::reverse_iterator i; // when the program starts (when the dir_tab is empty() // we don't want to call MountCmsForRoot() - if( request->dir_tab.empty() ) + if( cur->request->dir_tab.empty() ) return; - for(i = request->dir_tab.rbegin() ; i!=request->dir_tab.rend() ; ++i) + for(i = cur->request->dir_tab.rbegin() ; i!=cur->request->dir_tab.rend() ; ++i) { std::map::iterator m = mount_tab.find( (*i)->id ); diff --git a/core/mounts.h b/core/mounts.h index af05320..172fcc5 100755 --- a/core/mounts.h +++ b/core/mounts.h @@ -8,8 +8,8 @@ */ -#ifndef headerfilecmslucorecoremounts -#define headerfilecmslucorecoremounts +#ifndef headerfile_winix_core_mounts +#define headerfile_winix_core_mounts #include @@ -74,7 +74,7 @@ public: void SetDirs(Dirs * pdirs); void SetDb(Db * pdb); - void SetRequest(Request * prequest); + void SetCur(Cur * pcur); // dir_id, mount_point typedef std::map MountTab; @@ -97,9 +97,9 @@ public: private: - Db * db; + Db * db; Dirs * dirs; - Request * request; + Cur * cur; Mount empty_mount; const std::wstring empty_str; diff --git a/core/plugin.cpp b/core/plugin.cpp index 280cfbf..2167b4a 100755 --- a/core/plugin.cpp +++ b/core/plugin.cpp @@ -35,7 +35,7 @@ Plugin::Plugin() db = 0; config = 0; - request = 0; + cur = 0; system = 0; functions = 0; templates = 0; @@ -64,9 +64,9 @@ void Plugin::SetConfig(Config * pconfig) } -void Plugin::SetRequest(Request * prequest) +void Plugin::SetCur(Cur * pcur) { - request = prequest; + cur = pcur; } @@ -105,14 +105,14 @@ void Plugin::SetSessionManager(SessionManager * psession_manager) bool Plugin::SetPointers(PluginInfo & info) { // for safety we call a plugin function only when all our pointers are not null - bool res = (db && config && request && system && functions && templates && synchro && session_manager); + bool res = (db && config && cur && system && functions && templates && synchro && session_manager); if( !res ) log << log1 << "Plugin: cannot call a function - some of the winix pointers are null" << logend; info.db = db; info.config = config; - info.request = request; + info.cur = cur; info.system = system; info.functions = functions; info.templates = templates; @@ -252,8 +252,8 @@ void Plugin::Call(int message, Slots::iterator & slot) current_plugin = slot->second.index; info.plugin_id = current_plugin; - if( request && request->session && current_plugin != -1 ) - info.plugin_data_base = request->session->plugin_data.Get(current_plugin); + if( current_plugin != -1 ) + info.plugin_data_base = cur->session->plugin_data.Get(current_plugin); else info.plugin_data_base = 0; diff --git a/core/plugin.h b/core/plugin.h index 621d967..20dcf5f 100755 --- a/core/plugin.h +++ b/core/plugin.h @@ -60,7 +60,7 @@ struct PluginInfo // objects from winix which are accessible from a plugin Db * db; Config * config; - Request * request; + Cur * cur; System * system; Functions * functions; Templates * templates; @@ -130,7 +130,7 @@ public: void SetDb(Db * pdb); void SetConfig(Config * pconfig); - void SetRequest(Request * prequest); + void SetCur(Cur * pcur); void SetSystem(System * psystem); void SetFunctions(Functions * pfunctions); void SetTemplates(Templates * ptemplates); @@ -178,7 +178,7 @@ private: Db * db; Config * config; - Request * request; + Cur * cur; System * system; Functions * functions; Templates * templates; diff --git a/core/plugindata.h b/core/plugindata.h index 7b67bc5..31c4101 100755 --- a/core/plugindata.h +++ b/core/plugindata.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoreplugindata -#define headerfilecmslucoreplugindata +#ifndef headerfile_winix_core_plugindata +#define headerfile_winix_core_plugindata #include diff --git a/core/pluginmsg.h b/core/pluginmsg.h index b61053e..f113b1b 100755 --- a/core/pluginmsg.h +++ b/core/pluginmsg.h @@ -53,7 +53,7 @@ #define WINIX_SESSION_CHANGED 3002 // the winix is closing -// the is not any session available (request->session is null) +// the is not any session available (cur->session is null) #define WINIX_CLOSE 3004 // item was removed (rm function) diff --git a/core/postmultiparser.h b/core/postmultiparser.h index c9b5dcc..1f0b06c 100755 --- a/core/postmultiparser.h +++ b/core/postmultiparser.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucorepostmultiparser -#define headerfilecmslucorepostmultiparser +#ifndef headerfile_winix_core_postmultiparser +#define headerfile_winix_core_postmultiparser #include #include diff --git a/core/postparser.h b/core/postparser.h index a8580b4..683217a 100755 --- a/core/postparser.h +++ b/core/postparser.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucorepostparser -#define headerfilecmslucorepostparser +#ifndef headerfile_winix_core_postparser +#define headerfile_winix_core_postparser #include #include diff --git a/core/rebus.cpp b/core/rebus.cpp index 8855155..452c2b5 100755 --- a/core/rebus.cpp +++ b/core/rebus.cpp @@ -12,13 +12,13 @@ #include "log.h" #include "rebus.h" #include "misc.h" -#include "request.h" +#include "cur.h" -void Rebus::SetRequest(Request * prequest) +void Rebus::SetCur(Cur * pcur) { - request = prequest; + cur = pcur; } @@ -128,29 +128,29 @@ return result; bool Rebus::CheckRebus() { - if( !request->session ) + if( !cur->session ) return false; - if( request->session->puser ) + if( cur->session->puser ) // logged users don't have to use the rebus return true; - if( request->session->rebus_checked ) + if( cur->session->rebus_checked ) return true; - request->session->rebus_checked = true; + cur->session->rebus_checked = true; - if( !request->session->rebus_item ) + if( !cur->session->rebus_item ) { log << log1 << "Rebus: rebus not set" << logend; return false; } - if( IsAnswerOk(request->session->rebus_item, request->PostVar(L"rebus")) ) + if( IsAnswerOk(cur->session->rebus_item, cur->request->PostVar(L"rebus")) ) return true; log << log1 << "Rebus: rebus has an incorrect answer" << logend; - // don't add request->session->spam_score when the rebus has incorrect answer + // don't add cur->session->spam_score when the rebus has incorrect answer // a user could have made a mistake return false; diff --git a/core/rebus.h b/core/rebus.h index 98937e7..fbab5bb 100755 --- a/core/rebus.h +++ b/core/rebus.h @@ -7,15 +7,15 @@ * */ -#ifndef headerfilecmslucorerebus -#define headerfilecmslucorerebus +#ifndef headerfile_winix_core_rebus +#define headerfile_winix_core_rebus #include #include -class Request; +struct Cur; class Rebus @@ -31,7 +31,7 @@ public: - void SetRequest(Request * prequest); + void SetCur(Cur * pcur); void Init(); Item * Rand(); bool IsAnswerOk(Item * item, const std::wstring & answer); @@ -39,7 +39,7 @@ public: private: - Request * request; + Cur * cur; bool InitPair(int a, int b, Item & item); diff --git a/core/request.cpp b/core/request.cpp index a1a555b..48bf88a 100755 --- a/core/request.cpp +++ b/core/request.cpp @@ -78,10 +78,6 @@ void Request::Clear() env_content_type = &char_empty; env_http_accept_encoding = &char_empty; - temporary_session.Clear(); - temporary_session.id = 0; - session = &temporary_session; - item_tab.clear(); item.Clear(); dir_tab.clear(); diff --git a/core/request.h b/core/request.h index f212025..c70d62c 100755 --- a/core/request.h +++ b/core/request.h @@ -7,14 +7,13 @@ * */ -#ifndef headerfilecmslucorerequest -#define headerfilecmslucorerequest +#ifndef headerfile_winix_core_request +#define headerfile_winix_core_request #include #include #include #include "requesttypes.h" -#include "session.h" #include "item.h" #include "error.h" #include "config.h" @@ -69,9 +68,6 @@ struct Request // true if the browser is Konqueror bool browser_konqueror; - // current session - Session * session; - // current directory std::vector dir_tab; @@ -138,9 +134,6 @@ private: Config * config; - // session with id 0 - Session temporary_session; - void ClearPostFileTmp(); // contains '\0' diff --git a/core/requesttypes.h b/core/requesttypes.h index 9606cb2..efea870 100755 --- a/core/requesttypes.h +++ b/core/requesttypes.h @@ -7,15 +7,17 @@ * */ -#ifndef headerfilecmslucorerequesttypes -#define headerfilecmslucorerequesttypes +#ifndef headerfile_winix_core_requesttypes +#define headerfile_winix_core_requesttypes #include #include #include -#define WINIX_POSTTABLE_MAXSIZE 20 +// !! narazie uzywane tylko w post multi parserze +// dodac do zwyklego parsera post +#define WINIX_POSTTABLE_MAXSIZE 50 struct PostFile diff --git a/core/session.cpp b/core/session.cpp index d4f2f0f..0f1fd48 100755 --- a/core/session.cpp +++ b/core/session.cpp @@ -30,14 +30,15 @@ Session::Session() void Session::Clear() { - id = 0; - time = 0; - puser = 0; - rebus_item = 0; + id = 0; + time = 0; + puser = 0; + rebus_item = 0; rebus_checked = false; - remember_me = false; - new_session = true; - spam_score = 0; + remember_me = false; + new_session = true; + spam_score = 0; + plugin_data.Resize(0); } diff --git a/core/session.h b/core/session.h index 0212ea1..6dcf760 100755 --- a/core/session.h +++ b/core/session.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoresession -#define headerfilecmslucoresession +#ifndef headerfile_winix_core_session +#define headerfile_winix_core_session #include #include "item.h" diff --git a/core/sessioncontainer.cpp b/core/sessioncontainer.cpp index 51c0a29..03f1634 100755 --- a/core/sessioncontainer.cpp +++ b/core/sessioncontainer.cpp @@ -15,17 +15,13 @@ SessionContainer::SessionContainer() { - request = 0; table_size = 0; - work_mode = 1; // threading work mode } - - -void SessionContainer::SetRequest(Request * prequest) +void SessionContainer::SetCur(Cur * pcur) { - request = prequest; + cur = pcur; } @@ -35,32 +31,55 @@ void SessionContainer::SetConfig(Config * pconfig) } +void SessionContainer::SetTmpSession(Session * psession) +{ + tmp_session = psession; +} + + void SessionContainer::Clear() { Table::iterator i = table.begin(); + log << log3 << "SC: deleting all sessions" << logend; + // don't use table.clear(); // because plugins session data would not be erased + // we must set cur->session for each session and then delete it while( i != table.end() ) { - request->session = &(*i); + cur->session = &(*i); table.erase(i++); } // erasing indexes index_id.clear(); table_size = 0; - request->session = 0; + cur->session = tmp_session; } -void SessionContainer::SetLastContainer(LastContainer * plast_container) + +void SessionContainer::EraseById(IdIterator i) { - last_container = plast_container; + Session * old_session = tmp_session; + + if( cur->session != &(*i->second) ) + old_session = cur->session; + + cur->session = &(*i->second); + + log << log4 << "SC: deleting session, id: " << i->second->id << logend; + table.erase(i->second); + index_id.erase(i); + table_size -= 1; + + cur->session = old_session; } + size_t SessionContainer::Size() { // don't use table.size() as it has O(n) complexity on FreeBSD @@ -86,6 +105,18 @@ Session & SessionContainer::Back() } +SessionContainer::IdIterator SessionContainer::IdBegin() +{ + return index_id.begin(); +} + + +SessionContainer::IdIterator SessionContainer::IdEnd() +{ + return index_id.end(); +} + + bool SessionContainer::PushBack(const Session & session) { @@ -128,93 +159,3 @@ return i->second; -/* - * - * - * sessions gc (another thread) - * - * - */ -void SessionContainer::Work() -{ -bool exit = false; -IndexId::iterator i; - - Lock(); - i = index_id.begin(); - Unlock(); - - while( !exit ) - { - Lock(); - - if( i == index_id.end() ) - { - i = index_id.begin(); - WaitForSignalSleep(10); - //WaitForSignalSleep(1); - } - else - { - if( IsSessionOutdated(*i->second) ) - DeleteSession(i++); - else - ++i; - } - - exit = synchro->was_stop_signal; - Unlock(); - } -} - - - -// it's called from the other thread (with Lock and Unlock) -bool SessionContainer::IsSessionOutdated(const Session & s) const -{ -bool outdated; - - if( s.remember_me ) - outdated = s.last_time < std::time(0) - config->session_remember_max_idle; - else - outdated = s.last_time < std::time(0) - config->session_max_idle; - -return outdated; -} - - - -// it's called from the other thread (with Lock and Unlock) -void SessionContainer::DeleteSession(SessionContainer::IndexId::iterator i) -{ - Session * old_session = 0; - Session * del_session = &(*i->second); - - if( del_session != request->session ) - old_session = request->session; - - request->session = del_session; - - log << log4 << "SessionContainer: deleting outdated session, id: " << del_session->id << logend; - - if( del_session->puser ) - last_container->UserLogout(del_session->puser->id, del_session->id); - - table.erase(i->second); - index_id.erase(i); - table_size -= 1; - - // !! tu moze byc zero - request->session = old_session; -} - -/* - * - * - * end of sessions gc - * - * - */ - - - diff --git a/core/sessioncontainer.h b/core/sessioncontainer.h index 1b6b50b..1250a67 100755 --- a/core/sessioncontainer.h +++ b/core/sessioncontainer.h @@ -7,22 +7,20 @@ * */ -#ifndef headerfilecmslucoresessioncontainer -#define headerfilecmslucoresessioncontainer +#ifndef headerfile_winix_core_sessioncontainer +#define headerfile_winix_core_sessioncontainer #include #include #include #include "session.h" -#include "lastcontainer.h" -#include "request.h" -#include "basethread.h" +#include "cur.h" #include "config.h" -class SessionContainer : public BaseThread +class SessionContainer { public: @@ -33,13 +31,14 @@ public: typedef std::list Table; typedef Table::iterator Iterator; typedef std::map IndexId; + typedef IndexId::iterator IdIterator; SessionContainer(); - void SetRequest(Request * prequest); + void SetCur(Cur * pcur); void SetConfig(Config * pconfig); - void SetLastContainer(LastContainer * plast_container); + void SetTmpSession(Session * psession); void Clear(); @@ -50,20 +49,19 @@ public: bool PushBack(const Session & session); Iterator FindById(long); + IdIterator IdBegin(); + IdIterator IdEnd(); + + void EraseById(IdIterator i); private: - LastContainer * last_container; - Table table; IndexId index_id; - Request * request; - Config * config; - //void DelFromIdIndex(Iterator iter); - virtual void Work(); - bool IsSessionOutdated(const Session & s) const; - void DeleteSession(IndexId::iterator i); + Cur * cur; + Config * config; + Session * tmp_session; // in FreeBSD implementation (GCC) list::size() has linear complexity // so we use our own table_size with O(1) diff --git a/core/sessionmanager.cpp b/core/sessionmanager.cpp index 929a1e7..5873b84 100755 --- a/core/sessionmanager.cpp +++ b/core/sessionmanager.cpp @@ -22,13 +22,19 @@ SessionManager::SessionManager() { + temporary_session.id = 0; + session = &temporary_session; + session_tab.SetTmpSession(&temporary_session); + + // thread work mode + work_mode = 1; } -void SessionManager::SetRequest(Request * prequest) +void SessionManager::SetCur(Cur * pcur) { - request = prequest; - session_tab.SetRequest(prequest); + cur = pcur; + session_tab.SetCur(pcur); } @@ -44,17 +50,13 @@ void SessionManager::SetSystem(System * psystem) system = psystem; } + void SessionManager::SetLastContainer(LastContainer * plast_container) { - session_tab.SetLastContainer(plast_container); + last_container = plast_container; } -void SessionManager::SetSynchro(Synchro * psynchro) -{ - session_tab.SetSynchro(psynchro); -} - size_t SessionManager::Size() { @@ -103,52 +105,20 @@ return id; -void SessionManager::CreateTemporarySession() -{ - SessionContainer::Iterator i = session_tab.FindById( 0 ); - - if( i == session_tab.End() ) - { - Session s; - s.id = 0; - s.new_session = true; - - session_tab.PushBack(s); - request->session = &session_tab.Back(); - } - else - { - request->session = &(*i); - request->session->Clear(); // !! what about session.plugin_data? - request->session->id = 0; - request->session->new_session = false; - } -} - - void SessionManager::CreateSession() { -Session s; -int attempts = 100; +int attempts = 100; +bool added = false; - if( config->session_max == 0 || session_tab.Size() < config->session_max - 1 ) // -1 for the temporary session + new_session.Clear(); + + if( config->session_max == 0 || session_tab.Size() < config->session_max ) { - for( ; attempts > 0 ; --attempts ) + for( ; !added && attempts > 0 ; --attempts ) { - s.id = CreateSessionId(); - - bool added = session_tab.PushBack(s); - - if( added ) - { - request->session = &session_tab.Back(); - request->session->new_session = true; - - log << log2 << "SM: created a new session: " << request->session->id << logend; - - return; - } + new_session.id = CreateSessionId(); + added = session_tab.PushBack(new_session); } } else @@ -156,10 +126,21 @@ int attempts = 100; log << log2 << "SM: sessions limit exceeded (" << config->session_max << ")" << logend; } - // there is a problem with generating a new session id - // we do not set a session cookie - CreateTemporarySession(); - log << log1 << "SM: cannot create a session id (temporary used: with id 0)" << logend; + if( added ) + { + session = &session_tab.Back(); + session->new_session = true; + log << log2 << "SM: created a new session: " << session->id << logend; + } + else + { + // there is a problem with generating a new session id + // we do not set a session cookie + session = &temporary_session; + session->Clear(); + session->new_session = false; // temporary session was initialized at the beginning + log << log1 << "SM: cannot create a session id (temporary used: with id 0)" << logend; + } } @@ -174,18 +155,18 @@ bool SessionManager::SetSessionFromCookie(const std::string & cookie) return false; // that session is in the table - request->session = &(*s); - request->session->new_session = false; - request->session->last_time = std::time(0); - request->session->tm_last_time = Time(request->session->last_time); + session = &(*s); + session->new_session = false; + session->last_time = std::time(0); + session->tm_last_time = Time(session->last_time); - if( request->method == Request::get ) - request->session->last_time_get = request->session->last_time; + if( cur->request->method == Request::get ) + session->last_time_get = session->last_time; - log << log2 << "SM: session: " << s->id; + log << log2 << "SM: session: " << session->id; - if( request->session->puser ) - log << log2 << ", user: " << request->session->puser->name << ", id: " << request->session->puser->id; + if( session->puser ) + log << log2 << ", user: " << session->puser->name << ", id: " << session->puser->id; log << log2 << logend; @@ -196,9 +177,9 @@ return true; void SessionManager::SetSession() { - CookieTab::iterator i = request->cookie_tab.find(config->http_session_id_name); + CookieTab::iterator i = cur->request->cookie_tab.find(config->http_session_id_name); - if( i == request->cookie_tab.end() ) + if( i == cur->request->cookie_tab.end() ) { CreateSession(); } @@ -208,22 +189,12 @@ void SessionManager::SetSession() { // there is no such a session // deleting the old cookie - request->cookie_tab.erase(i); + cur->request->cookie_tab.erase(i); // and creating a new one CreateSession(); } } - - // request->session is set now - - if( request->session->new_session ) - { - request->session->plugin_data.Resize(plugin.Size()); - plugin.Call(WINIX_SESSION_CREATED); - } - - plugin.Call(WINIX_SESSION_CHANGED); } @@ -252,6 +223,31 @@ void SessionManager::DeleteSessions() +void SessionManager::InitTmpSession() +{ + Session * old_session = cur->session; + + log << log4 << "SM: initializing temporary session" << logend; + cur->session = &temporary_session; + plugin.Call(WINIX_SESSION_CREATED); + + cur->session = old_session; +} + + + +void SessionManager::UninitTmpSession() +{ + Session * old_session = cur->session; + + log << log4 << "SM: uninitializing temporary session" << logend; + cur->session = &temporary_session; + cur->session->plugin_data.DeleteAll(); // this will call plugin.Call(WINIX_SESSION_REMOVE); + cur->session->plugin_data.Resize(0); + + cur->session = old_session; +} + void SessionManager::LoadSessions() @@ -259,20 +255,20 @@ void SessionManager::LoadSessions() SessionParser sp; SessionContainer::Iterator i; + // sessions will be overwritten (pointers are invalidated) + cur->session = &temporary_session; + sp.SetUsers(&system->users); - Session * old_session = request->session; - sp.Parse(config->session_file, session_tab); - i = session_tab.Begin(); - for( ; i!=session_tab.End() ; ++i ) + for(i=session_tab.Begin() ; i != session_tab.End() ; ++i) { i->plugin_data.Resize(plugin.Size()); - request->session = &(*i); + cur->session = &(*i); plugin.Call(WINIX_SESSION_CREATED); } - request->session = old_session; + cur->session = &temporary_session; } @@ -316,24 +312,125 @@ void SessionManager::SaveSessions() -void SessionManager::StartGC() + +Session * SessionManager::GetTmpSession() { - session_tab.StartThread(); + return &temporary_session; } -// use it with Lock() and Unlock(); -void SessionManager::PrepareToStopGC() +Session * SessionManager::GetCurSession() { - session_tab.WakeUpThread(); -} - - -void SessionManager::WaitForGC() -{ - session_tab.WaitForThread(); + return session; } + + +/* + * + * + * sessions gc (second thread) + * + * + */ +void SessionManager::Work() +{ +bool exit = false; +SessionContainer::IndexId::iterator i; + + deleted = 0; + + Lock(); + i = session_tab.IdBegin(); + Unlock(); + + while( !exit ) + { + Lock(); + + CheckSession(i); + exit = synchro->was_stop_signal; + + Unlock(); + } +} + + +// it's called from the other thread (with Lock and Unlock) +void SessionManager::CheckSession(SessionContainer::IndexId::iterator & i) +{ +const int deleted_max_at_once = 10; + + if( i == session_tab.IdEnd() ) + { + if( deleted > 0 ) + { + deleted = 0; + log << logsave; + } + + i = session_tab.IdBegin(); + WaitForSignalSleep(10); + } + else + { + if( IsSessionOutdated(*i->second) ) + { + DeleteSession(i++); + ++deleted; + } + else + { + ++i; + } + + if( deleted >= deleted_max_at_once ) + { + log << logsave; + WaitForSignalSleep(1); + deleted = 0; + } + } +} + + +// it's called from the other thread (with Lock and Unlock) +bool SessionManager::IsSessionOutdated(const Session & s) const +{ +bool outdated; + + if( s.remember_me ) + outdated = s.last_time < std::time(0) - config->session_remember_max_idle; + else + outdated = s.last_time < std::time(0) - config->session_max_idle; + +return outdated; +} + + + +// it's called from the other thread (with Lock and Unlock) +void SessionManager::DeleteSession(SessionContainer::IdIterator i) +{ + Session * del_session = &(*i->second); + + if( del_session->puser ) + last_container->UserLogout(del_session->puser->id, del_session->id); + + session_tab.EraseById(i); +} + + +/* + * + * + * end of sessions gc + * + * + */ + + + diff --git a/core/sessionmanager.h b/core/sessionmanager.h index 1963d15..280980c 100755 --- a/core/sessionmanager.h +++ b/core/sessionmanager.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoresessionmanager -#define headerfilecmslucoresessionmanager +#ifndef headerfile_winix_core_sessionmanager +#define headerfile_winix_core_sessionmanager #include #include @@ -19,39 +19,29 @@ #include "lastcontainer.h" #include "system.h" #include "synchro.h" +#include "basethread.h" -class SessionManager +class SessionManager : public BaseThread { - Config * config; - Request * request; - System * system; - - SessionContainer session_tab; - - bool IsSession(long s); - - long CreateSessionId(); - void CreateTemporarySession(); - void CreateSession(); - bool SetSessionFromCookie(const std::string & cookie); - public: SessionManager(); - void SetRequest(Request * prequest); + void SetCur(Cur * pcur); void SetConfig(Config * pconfig); void SetSystem(System * psystem); void SetLastContainer(LastContainer * plast_container); - void SetSynchro(Synchro * psynchro); void SetSession(); void DeleteSessions(); // deleting all sessions - void StartGC(); - void PrepareToStopGC(); - void WaitForGC(); + + void InitTmpSession(); + void UninitTmpSession(); + + Session * GetTmpSession(); + Session * GetCurSession(); void LoadSessions(); void SaveSessions(); @@ -60,6 +50,40 @@ public: SessionContainer::Iterator SessionEnd(); size_t Size(); + +private: + + Config * config; + Cur * cur; + System * system; + + LastContainer * last_container; + + // current session - set by SetSession() + Session * session; + + SessionContainer session_tab; + + // session with id 0 + Session temporary_session; + + // for adding a new session to the container + Session new_session; + + bool IsSession(long s); + + long CreateSessionId(); + void CreateSession(); + bool SetSessionFromCookie(const std::string & cookie); + + + // second thread + int deleted; + virtual void Work(); + void CheckSession(SessionContainer::IndexId::iterator & i); + bool IsSessionOutdated(const Session & s) const; + void DeleteSession(SessionContainer::IdIterator i); + }; diff --git a/core/sessionparser.h b/core/sessionparser.h index a99afd8..0a33fcd 100755 --- a/core/sessionparser.h +++ b/core/sessionparser.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoresessionparser -#define headerfilecmslucoresessionparser +#ifndef headerfile_winix_core_sessionparser +#define headerfile_winix_core_sessionparser #include #include diff --git a/core/synchro.h b/core/synchro.h index 11d5566..0756f7c 100755 --- a/core/synchro.h +++ b/core/synchro.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoresynchro -#define headerfilecmslucoresynchro +#ifndef headerfile_winix_core_synchro +#define headerfile_winix_core_synchro #include diff --git a/core/system.cpp b/core/system.cpp index 342059d..4c90641 100755 --- a/core/system.cpp +++ b/core/system.cpp @@ -15,9 +15,9 @@ -void System::SetRequest(Request * prequest) +void System::SetCur(Cur * pcur) { - request = prequest; + cur = pcur; } @@ -44,26 +44,26 @@ void System::SetSynchro(Synchro * psynchro) void System::Init() { dirs.SetDb(db); - dirs.SetRequest(request); + dirs.SetCur(cur); dirs.SetNotify(¬ify); dirs.ReadDirs(); mounts.SetDirs(&dirs); mounts.SetDb(db); - mounts.SetRequest(request); + mounts.SetCur(cur); mounts.CreateMounts(); mounts.ReadMounts(); - users.SetRequest(request); + users.SetCur(cur); users.ReadUsers(db); users.SetTimeZoneOffset(config->time_zone_offset); groups.ReadGroups(db); // !! chwilowe przekazanie argumentu, db bedzie zmienione - rebus.SetRequest(request); + rebus.SetCur(cur); rebus.Init(); notify.SetSynchro(synchro); - notify.SetRequest(request); + notify.SetCur(cur); notify.SetConfig(config); notify.SetUsers(&users); notify.SetDirs(&dirs); @@ -80,35 +80,35 @@ void System::Init() // !! moze zwracac jakas wartosc? void System::RedirectTo(const Item & item, const wchar_t * postfix) { - request->redirect_to = config->base_url; + cur->request->redirect_to = config->base_url; if( item.type == Item::dir ) { // item_id is pointing to a directory - dirs.MakePath(item.id, request->redirect_to, false); + dirs.MakePath(item.id, cur->request->redirect_to, false); } else { // item_id is pointing to a file or a symlink - if( dirs.MakePath(item.parent_id, request->redirect_to, false) ) - request->redirect_to += item.url; + if( dirs.MakePath(item.parent_id, cur->request->redirect_to, false) ) + cur->request->redirect_to += item.url; } if( postfix ) - request->redirect_to += postfix; + cur->request->redirect_to += postfix; } void System::RedirectTo(long item_id, const wchar_t * postfix) { - request->redirect_to = config->base_url; + cur->request->redirect_to = config->base_url; Item * pdir = dirs.GetDir(item_id); if( pdir ) { // item_id is pointing to a directory - dirs.MakePath(pdir->id, request->redirect_to, false); + dirs.MakePath(pdir->id, cur->request->redirect_to, false); } else { @@ -122,8 +122,8 @@ void System::RedirectTo(long item_id, const wchar_t * postfix) if( db->GetItem(item_temp, iq) == WINIX_ERR_OK ) { - if( dirs.MakePath(item_temp.parent_id, request->redirect_to, false) ) - request->redirect_to += item_temp.url; + if( dirs.MakePath(item_temp.parent_id, cur->request->redirect_to, false) ) + cur->request->redirect_to += item_temp.url; } else { @@ -132,31 +132,31 @@ void System::RedirectTo(long item_id, const wchar_t * postfix) } if( postfix ) - request->redirect_to += postfix; + cur->request->redirect_to += postfix; } void System::RedirectTo(const std::wstring & url) { - request->redirect_to = config->base_url; + cur->request->redirect_to = config->base_url; if( !url.empty() && url[0] == '/' ) { // absolute path - request->redirect_to += url; + cur->request->redirect_to += url; } else { // relative path - if( !request->dir_tab.empty() ) + if( !cur->request->dir_tab.empty() ) { - if( dirs.MakePath(request->dir_tab.back()->id, request->redirect_to, false) ) - request->redirect_to += url; + if( dirs.MakePath(cur->request->dir_tab.back()->id, cur->request->redirect_to, false) ) + cur->request->redirect_to += url; } else { - request->redirect_to += '/'; - request->redirect_to += url; + cur->request->redirect_to += '/'; + cur->request->redirect_to += url; } } } @@ -186,38 +186,38 @@ void System::RedirectWithFunctionAndParamsTo(const std::wstring & url) { RedirectTo(url); - if( !request->function ) + if( !cur->request->function ) return; - request->redirect_to += '/'; - request->redirect_to += request->function->fun.url; + cur->request->redirect_to += '/'; + cur->request->redirect_to += cur->request->function->fun.url; - AddParams(request->param_tab, request->redirect_to, false); + AddParams(cur->request->param_tab, cur->request->redirect_to, false); } void System::RedirectToLastDir() { - if( !request->dir_tab.empty() ) - RedirectTo( *request->dir_tab.back() ); + if( !cur->request->dir_tab.empty() ) + RedirectTo( *cur->request->dir_tab.back() ); } void System::RedirectToLastItem() { - if( request->last_item ) - RedirectTo( *request->last_item ); + if( cur->request->last_item ) + RedirectTo( *cur->request->last_item ); } bool System::CanChangeUser(const Item & item, long new_user_id) { - if( !request->session ) + if( !cur->session ) // session must be set return false; - if( request->session->puser && request->session->puser->super_user ) + if( cur->session->puser && cur->session->puser->super_user ) // super user is allowed everything return true; @@ -233,11 +233,11 @@ return true; bool System::CanChangeGroup(const Item & item, long new_group_id) { - if( !request->session ) + if( !cur->session ) // session must be set return false; - if( request->session->puser && request->session->puser->super_user ) + if( cur->session->puser && cur->session->puser->super_user ) // super user is allowed everything return true; @@ -246,16 +246,16 @@ bool System::CanChangeGroup(const Item & item, long new_group_id) // user is allowed to change the group only if he is an owner of the item // he can change only into a group in which he is a member of, or into a 'no_group' - if( !request->session->puser ) + if( !cur->session->puser ) return false; - if( request->session->puser->id != item.user_id ) + if( cur->session->puser->id != item.user_id ) return false; if( new_group_id == -1 ) return true; - if( !request->session->puser->IsMemberOf(new_group_id) ) + if( !cur->session->puser->IsMemberOf(new_group_id) ) return false; // is logged, is the owner of the item, is the member of the new group @@ -267,11 +267,11 @@ return true; bool System::CanChangePrivileges(const Item & item, int new_priv) { - if( !request->session ) + if( !cur->session ) // session must be set return false; - if( request->session->puser && request->session->puser->super_user ) + if( cur->session->puser && cur->session->puser->super_user ) // super user is allowed everything return true; @@ -279,10 +279,10 @@ bool System::CanChangePrivileges(const Item & item, int new_priv) { // the owner of an item is allowed to change the privileges - if( !request->session->puser ) + if( !cur->session->puser ) return false; - if( request->session->puser->id != item.user_id ) + if( cur->session->puser->id != item.user_id ) return false; } @@ -293,21 +293,21 @@ return true; bool System::HasAccess(const Item & item, int mask) { - if( !request->session ) + if( !cur->session ) // session must be set return false; - if( request->session->puser && request->session->puser->super_user ) + if( cur->session->puser && cur->session->puser->super_user ) // super user is allowed everything return true; - if( request->session->puser && request->session->puser->id == item.user_id ) + if( cur->session->puser && cur->session->puser->id == item.user_id ) { // the owner return ((item.privileges >> 6) & mask) == mask; } - if( request->session->puser && request->session->puser->IsMemberOf(item.group_id) ) + if( cur->session->puser && cur->session->puser->IsMemberOf(item.group_id) ) { // group return ((item.privileges >> 3) & mask) == mask; @@ -339,7 +339,7 @@ bool System::HasReadWriteAccess(const Item & item) bool System::HasReadExecAccess(const Item & item) { - if( request->session && request->session->puser && request->session->puser->super_user ) + if( cur->session && cur->session->puser && cur->session->puser->super_user ) { // there must be at least one 'x' (for the root) @@ -387,7 +387,7 @@ return true; bool System::DirsHaveReadExecPerm() { - return HasReadExecAccessToPath(request->dir_tab); + return HasReadExecAccessToPath(cur->request->dir_tab); } @@ -642,10 +642,10 @@ Error System::EditFile(Item & item, bool with_url, int notify_code) if( item.type != Item::file ) return WINIX_ERR_FILE_EXPECTED; - if( request->session && request->session->puser ) - request->item.modification_user_id = request->session->puser->id; + if( cur->session && cur->session->puser ) + cur->request->item.modification_user_id = cur->session->puser->id; else - request->item.modification_user_id = -1; + cur->request->item.modification_user_id = -1; item.SetDateModifyToNow(); Error status = db->EditItemById(item, with_url); @@ -669,8 +669,8 @@ time_t System::LocalTime(time_t gmt_time) { int time_offset; - if( request->session && request->session->puser ) - time_offset = request->session->puser->time_zone_offset; + if( cur->session && cur->session->puser ) + time_offset = cur->session->puser->time_zone_offset; else time_offset = config->time_zone_offset_guest; @@ -909,40 +909,40 @@ int System::FollowAllLinks(const std::wstring & link_to, -// the same as FollowAllLinks but operates on request->dir_tab and request->item +// the same as FollowAllLinks but operates on cur->request->dir_tab and cur->request->item // and returns bool // the method is making a redirection if needed bool System::FollowAllLinks(const std::wstring & link_to, bool follow_dir_default, bool stop_on_link_redirect, bool check_access) { - int res = FollowAllLinks(request->dir_tab, link_to, temp_follow_dir_tab, temp_follow_item, + int res = FollowAllLinks(cur->request->dir_tab, link_to, temp_follow_dir_tab, temp_follow_item, follow_dir_default, stop_on_link_redirect, check_access); bool ok = (res == 0 || res == 1); if( ok ) { - request->dir_tab = temp_follow_dir_tab; + cur->request->dir_tab = temp_follow_dir_tab; if( res == 0 ) { - request->is_item = false; - request->item.Clear(); - request->last_item = request->dir_tab.back(); + cur->request->is_item = false; + cur->request->item.Clear(); + cur->request->last_item = cur->request->dir_tab.back(); - if( !request->dir_tab.back()->link_to.empty() ) - RedirectTo(request->dir_tab.back()->link_to); + if( !cur->request->dir_tab.back()->link_to.empty() ) + RedirectTo(cur->request->dir_tab.back()->link_to); log << log3 << "System: current directory changed" << logend; } else { - request->is_item = true; - request->item = temp_follow_item; - request->last_item = &request->item; + cur->request->is_item = true; + cur->request->item = temp_follow_item; + cur->request->last_item = &cur->request->item; - if( request->item.type == Item::symlink ) - RedirectTo(request->item.link_to); // request->item.link_to is not empty + if( cur->request->item.type == Item::symlink ) + RedirectTo(cur->request->item.link_to); // cur->request->item.link_to is not empty log << log3 << "System: current directory changed and the new file loaded" << logend; } @@ -952,9 +952,9 @@ bool System::FollowAllLinks(const std::wstring & link_to, else { if( res == 5 || res == 6 ) - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; else - request->status = WINIX_ERR_NO_ITEM; + cur->request->status = WINIX_ERR_NO_ITEM; } return ok; diff --git a/core/system.h b/core/system.h index 6f35def..e20d50e 100755 --- a/core/system.h +++ b/core/system.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoresystem -#define headerfilecmslucoresystem +#ifndef headerfile_winix_core_system +#define headerfile_winix_core_system #include #include "dirs.h" @@ -60,7 +60,7 @@ public: time_t system_start; - void SetRequest(Request * prequest); + void SetCur(Cur * pcur); void SetConfig(Config * pconfig); void SetDb(Db * pdb); void SetSynchro(Synchro * psynchro); @@ -120,15 +120,16 @@ public: std::vector & out_dir_tab, Item & out_item, bool follow_dir_default = false, bool stop_on_link_redirect = false, bool check_access = true); - // using request->dir_tab and request->item + // using cur->request->dir_tab and cur->request->item bool FollowAllLinks(const std::wstring & link_to, bool follow_dir_default = false, bool stop_on_link_redirect = false, bool check_access = true); private: - Request * request; - Config * config; - Db * db; - Synchro * synchro; + + Cur * cur; + Db * db; + Config * config; + Synchro * synchro; Item item_temp; std::wstring link_to_temp, name_temp; diff --git a/core/thumb.h b/core/thumb.h index b7014d8..d497d31 100755 --- a/core/thumb.h +++ b/core/thumb.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucorethumb -#define headerfilecmslucorethumb +#ifndef headerfile_winix_core_thumb +#define headerfile_winix_core_thumb #include #include diff --git a/core/ugcontainer.h b/core/ugcontainer.h index 2d8be1a..068f399 100755 --- a/core/ugcontainer.h +++ b/core/ugcontainer.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoreugcontainer -#define headerfilecmslucoreugcontainer +#ifndef headerfile_winix_core_ugcontainer +#define headerfile_winix_core_ugcontainer #include #include diff --git a/core/user.h b/core/user.h index 2f69ed5..2accfb8 100755 --- a/core/user.h +++ b/core/user.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoreuser -#define headerfilecmslucoreuser +#ifndef headerfile_winix_core_user +#define headerfile_winix_core_user #include #include diff --git a/core/users.cpp b/core/users.cpp index e2faeac..6ae69e3 100755 --- a/core/users.cpp +++ b/core/users.cpp @@ -19,9 +19,9 @@ Users::Users() } -void Users::SetRequest(Request * prequest) +void Users::SetCur(Cur * pcur) { - request = prequest; + cur = pcur; } @@ -128,30 +128,30 @@ User & Users::operator[](Users::SizeType pos) void Users::LoginUser(long user_id, bool remember_me) { - if( !request->session ) + if( !cur->session ) return; - if( request->session->id == 0 ) + if( cur->session->id == 0 ) { log << log1 << "Users: cannot login a user on a temporary session" << logend; return; } - request->session->puser = GetUser(user_id); - request->session->spam_score = 0; + cur->session->puser = GetUser(user_id); + cur->session->spam_score = 0; - if( !request->session->puser ) + if( !cur->session->puser ) { log << log1 << "Users: user id: " << user_id << " is not in system.users table" << logend; return; } - request->session->remember_me = remember_me; + cur->session->remember_me = remember_me; - last.UserLogin(user_id, request->session->puser->name, inet_addr(request->env_remote_addr), request->session->id); + last.UserLogin(user_id, cur->session->puser->name, inet_addr(cur->request->env_remote_addr), cur->session->id); how_many_logged += 1; - log << log2 << "User " << request->session->puser->name << " (id: " << user_id << ") logged" << logend; + log << log2 << "User " << cur->session->puser->name << " (id: " << user_id << ") logged" << logend; } @@ -159,19 +159,19 @@ void Users::LoginUser(long user_id, bool remember_me) void Users::LogoutCurrentUser() { - if( !request->session || !request->session->puser ) + if( !cur->session || !cur->session->puser ) return; - log << log2 << "Users: user " << request->session->puser->name << ", id: " - << request->session->puser->id << " logged out" << logend; + log << log2 << "Users: user " << cur->session->puser->name << ", id: " + << cur->session->puser->id << " logged out" << logend; - last.UserLogout(request->session->puser->id, request->session->id); + last.UserLogout(cur->session->puser->id, cur->session->id); if( how_many_logged > 0 ) // for safety how_many_logged -= 1; - request->session->puser = 0; - request->session->remember_me = 0; + cur->session->puser = 0; + cur->session->remember_me = 0; } diff --git a/core/users.h b/core/users.h index 2de710c..e8df917 100755 --- a/core/users.h +++ b/core/users.h @@ -7,14 +7,14 @@ * */ -#ifndef headerfilecmslucoreusers -#define headerfilecmslucoreusers +#ifndef headerfile_winix_core_users +#define headerfile_winix_core_users #include #include "user.h" #include "ugcontainer.h" #include "lastcontainer.h" -#include "request.h" +#include "cur.h" #include "db/db.h" @@ -23,7 +23,7 @@ class Users typedef UGContainer Table; Table table; - Request * request; + Cur * cur; long how_many_logged; public: @@ -35,7 +35,7 @@ public: Users(); - void SetRequest(Request * request); + void SetCur(Cur * pcur); void Clear(); void ReadUsers(Db * db); diff --git a/core/version.h b/core/version.h index bbd33ad..858d1e1 100755 --- a/core/version.h +++ b/core/version.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucoreversion -#define headerfilecmslucoreversion +#ifndef headerfile_winix_core_version +#define headerfile_winix_core_version #define WINIX_VER_MAJOR 0 diff --git a/functions/Makefile.dep b/functions/Makefile.dep index ad1609e..ed31da2 100755 --- a/functions/Makefile.dep +++ b/functions/Makefile.dep @@ -6,50 +6,50 @@ adduser.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h adduser.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h adduser.o: ../core/user.h ../core/group.h ../core/dircontainer.h adduser.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -adduser.o: ../core/session.h ../core/error.h ../core/user.h -adduser.o: ../core/plugindata.h ../core/rebus.h ../core/config.h -adduser.o: ../core/confparser.h ../core/htmlfilter.h -adduser.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h -adduser.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h -adduser.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h -adduser.o: ../core/confparser.h ../templates/misc.h -adduser.o: ../templates/localefilter.h ../templates/locale.h -adduser.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -adduser.o: ../../ezc/src/pattern.h functions.h functionparser.h cat.h chmod.h -adduser.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h -adduser.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h node.h priv.h -adduser.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h -adduser.o: tinymce.h uname.h upload.h uptime.h who.h vim.h -adduser.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h -adduser.o: ../templates/htmltextstream.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/synchro.h +adduser.o: ../core/error.h ../core/config.h ../core/confparser.h +adduser.o: ../core/htmlfilter.h ../templates/htmltextstream.h +adduser.o: ../core/config.h ../core/system.h ../core/dirs.h +adduser.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h +adduser.o: ../notify/notifypool.h ../templates/locale.h ../core/confparser.h +adduser.o: ../templates/misc.h ../templates/localefilter.h +adduser.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h +adduser.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h +adduser.o: functionparser.h ../core/cur.h ../core/session.h ../core/user.h +adduser.o: ../core/plugindata.h ../core/rebus.h cat.h chmod.h privchanger.h +adduser.o: chown.h ckeditor.h cp.h default.h download.h emacs.h last.h +adduser.o: login.h logout.h ln.h ls.h mkdir.h mv.h node.h priv.h reload.h +adduser.o: rm.h run.h specialdefault.h stat.h subject.h template.h tinymce.h +adduser.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +adduser.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +adduser.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +adduser.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +adduser.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h +adduser.o: ../core/mount.h ../core/mountparser.h ../core/users.h +adduser.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +adduser.o: ../core/basethread.h ../core/synchro.h cat.o: cat.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h cat.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h cat.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h cat.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h cat.o: ../core/user.h ../core/group.h ../core/dircontainer.h cat.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -cat.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h -cat.o: ../core/rebus.h ../core/config.h ../core/confparser.h +cat.o: ../core/error.h ../core/config.h ../core/confparser.h cat.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/config.h cat.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h cat.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h cat.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h cat.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h cat.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h -cat.o: functions.h functionparser.h adduser.h chmod.h privchanger.h chown.h -cat.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h logout.h -cat.o: ln.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h -cat.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h -cat.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +cat.o: functions.h functionparser.h ../core/cur.h ../core/session.h +cat.o: ../core/user.h ../core/plugindata.h ../core/rebus.h adduser.h chmod.h +cat.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h +cat.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h node.h priv.h reload.h +cat.o: rm.h run.h specialdefault.h stat.h subject.h template.h tinymce.h +cat.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h cat.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h cat.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h cat.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -cat.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h +cat.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h ../core/mount.h cat.o: ../core/mountparser.h ../core/users.h ../core/groups.h ../core/group.h cat.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h cat.o: ../core/synchro.h @@ -59,16 +59,16 @@ chmod.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h chmod.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h chmod.o: ../core/user.h ../core/group.h ../core/dircontainer.h chmod.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -chmod.o: ../core/session.h ../core/error.h ../core/user.h -chmod.o: ../core/plugindata.h ../core/rebus.h ../core/config.h -chmod.o: ../core/confparser.h ../core/htmlfilter.h -chmod.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h -chmod.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h -chmod.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h -chmod.o: ../core/confparser.h ../templates/misc.h ../templates/localefilter.h -chmod.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -chmod.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -chmod.o: functionparser.h adduser.h cat.h chown.h privchanger.h ckeditor.h +chmod.o: ../core/error.h ../core/config.h ../core/confparser.h +chmod.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/config.h +chmod.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +chmod.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h +chmod.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h +chmod.o: ../templates/localefilter.h ../templates/locale.h +chmod.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +chmod.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +chmod.o: ../core/session.h ../core/user.h ../core/plugindata.h +chmod.o: ../core/rebus.h adduser.h cat.h chown.h privchanger.h ckeditor.h chmod.o: cp.h default.h download.h emacs.h last.h login.h logout.h ln.h ls.h chmod.o: mkdir.h mv.h node.h priv.h reload.h rm.h run.h specialdefault.h chmod.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h @@ -76,7 +76,7 @@ chmod.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h chmod.o: ../templates/htmltextstream.h ../notify/notifythread.h chmod.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h chmod.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -chmod.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h +chmod.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h chmod.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h chmod.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h chown.o: chown.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h @@ -85,16 +85,16 @@ chown.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h chown.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h chown.o: ../core/user.h ../core/group.h ../core/dircontainer.h chown.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -chown.o: ../core/session.h ../core/error.h ../core/user.h -chown.o: ../core/plugindata.h ../core/rebus.h ../core/config.h -chown.o: ../core/confparser.h ../core/htmlfilter.h -chown.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h -chown.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h -chown.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h -chown.o: ../core/confparser.h ../templates/misc.h ../templates/localefilter.h -chown.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -chown.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -chown.o: functionparser.h adduser.h cat.h chmod.h privchanger.h ckeditor.h +chown.o: ../core/error.h ../core/config.h ../core/confparser.h +chown.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/config.h +chown.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +chown.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h +chown.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h +chown.o: ../templates/localefilter.h ../templates/locale.h +chown.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +chown.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +chown.o: ../core/session.h ../core/user.h ../core/plugindata.h +chown.o: ../core/rebus.h adduser.h cat.h chmod.h privchanger.h ckeditor.h chown.o: cp.h default.h download.h emacs.h last.h login.h logout.h ln.h ls.h chown.o: mkdir.h mv.h node.h priv.h reload.h rm.h run.h specialdefault.h chown.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h @@ -102,7 +102,7 @@ chown.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h chown.o: ../templates/htmltextstream.h ../notify/notifythread.h chown.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h chown.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -chown.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h +chown.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h chown.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h chown.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h ckeditor.o: ckeditor.h functionbase.h ../core/item.h ../db/db.h @@ -111,35 +111,34 @@ ckeditor.o: ../core/textstream.h ../core/misc.h ../core/item.h ckeditor.o: ../core/error.h ../core/log.h ../core/textstream.h ckeditor.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h ckeditor.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h -ckeditor.o: ../core/request.h ../core/requesttypes.h ../core/session.h -ckeditor.o: ../core/error.h ../core/user.h ../core/plugindata.h -ckeditor.o: ../core/rebus.h ../core/config.h ../core/confparser.h -ckeditor.o: ../core/htmlfilter.h ../templates/htmltextstream.h -ckeditor.o: ../core/config.h ../core/system.h ../core/dirs.h -ckeditor.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h -ckeditor.o: ../notify/notifypool.h ../templates/locale.h ../core/confparser.h -ckeditor.o: ../templates/misc.h ../templates/localefilter.h -ckeditor.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h +ckeditor.o: ../core/request.h ../core/requesttypes.h ../core/error.h +ckeditor.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +ckeditor.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h +ckeditor.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h +ckeditor.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h +ckeditor.o: ../core/confparser.h ../templates/misc.h +ckeditor.o: ../templates/localefilter.h ../templates/locale.h +ckeditor.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ckeditor.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -ckeditor.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -ckeditor.o: cp.h default.h download.h emacs.h last.h login.h logout.h ln.h -ckeditor.o: ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h -ckeditor.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h -ckeditor.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +ckeditor.o: functionparser.h ../core/cur.h ../core/session.h ../core/user.h +ckeditor.o: ../core/plugindata.h ../core/rebus.h adduser.h cat.h chmod.h +ckeditor.o: privchanger.h chown.h cp.h default.h download.h emacs.h last.h +ckeditor.o: login.h logout.h ln.h ls.h mkdir.h mv.h node.h priv.h reload.h +ckeditor.o: rm.h run.h specialdefault.h stat.h subject.h template.h tinymce.h +ckeditor.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h ckeditor.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h ckeditor.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h ckeditor.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -ckeditor.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -ckeditor.o: ../core/mountparser.h ../core/users.h ../core/groups.h -ckeditor.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -ckeditor.o: ../core/basethread.h ../core/synchro.h +ckeditor.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h +ckeditor.o: ../core/mount.h ../core/mountparser.h ../core/users.h +ckeditor.o: ../core/groups.h ../core/group.h ../core/loadavg.h +ckeditor.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h cp.o: cp.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h cp.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h cp.o: ../core/item.h ../core/error.h ../core/log.h ../core/textstream.h cp.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h cp.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h -cp.o: ../core/request.h ../core/requesttypes.h ../core/session.h -cp.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h +cp.o: ../core/request.h ../core/requesttypes.h ../core/error.h cp.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h cp.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h cp.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h @@ -147,88 +146,90 @@ cp.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h cp.o: ../core/confparser.h ../templates/misc.h ../templates/localefilter.h cp.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h cp.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -cp.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -cp.o: ckeditor.h default.h download.h emacs.h last.h login.h logout.h ln.h -cp.o: ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h specialdefault.h -cp.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h who.h -cp.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h -cp.o: ../templates/htmltextstream.h ../notify/notifythread.h -cp.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -cp.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -cp.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h ../core/users.h -cp.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -cp.o: ../core/basethread.h ../core/synchro.h ../core/misc.h +cp.o: functionparser.h ../core/cur.h ../core/session.h ../core/user.h +cp.o: ../core/plugindata.h ../core/rebus.h adduser.h cat.h chmod.h +cp.o: privchanger.h chown.h ckeditor.h default.h download.h emacs.h last.h +cp.o: login.h logout.h ln.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h +cp.o: run.h specialdefault.h stat.h subject.h template.h tinymce.h uname.h +cp.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +cp.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +cp.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +cp.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +cp.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h ../core/mount.h +cp.o: ../core/mountparser.h ../core/users.h ../core/groups.h ../core/group.h +cp.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +cp.o: ../core/synchro.h ../core/misc.h default.o: default.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h default.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h default.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h default.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h default.o: ../core/user.h ../core/group.h ../core/dircontainer.h default.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -default.o: ../core/session.h ../core/error.h ../core/user.h -default.o: ../core/plugindata.h ../core/rebus.h ../core/config.h -default.o: ../core/confparser.h ../core/htmlfilter.h -default.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h -default.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h -default.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h -default.o: ../core/confparser.h ../templates/misc.h -default.o: ../templates/localefilter.h ../templates/locale.h -default.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -default.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h -default.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h download.h -default.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h node.h -default.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h -default.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -default.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h -default.o: ../templates/htmltextstream.h ../notify/notifythread.h -default.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -default.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -default.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -default.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -default.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +default.o: ../core/error.h ../core/config.h ../core/confparser.h +default.o: ../core/htmlfilter.h ../templates/htmltextstream.h +default.o: ../core/config.h ../core/system.h ../core/dirs.h +default.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h +default.o: ../notify/notifypool.h ../templates/locale.h ../core/confparser.h +default.o: ../templates/misc.h ../templates/localefilter.h +default.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h +default.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h +default.o: functionparser.h ../core/cur.h ../core/session.h ../core/user.h +default.o: ../core/plugindata.h ../core/rebus.h adduser.h cat.h chmod.h +default.o: privchanger.h chown.h ckeditor.h cp.h download.h emacs.h last.h +default.o: login.h logout.h ln.h ls.h mkdir.h mv.h node.h priv.h reload.h +default.o: rm.h run.h specialdefault.h stat.h subject.h template.h tinymce.h +default.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +default.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +default.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +default.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +default.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h +default.o: ../core/mount.h ../core/mountparser.h ../core/users.h +default.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +default.o: ../core/basethread.h ../core/synchro.h download.o: download.h functionbase.h ../core/item.h ../db/db.h download.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h download.o: ../core/textstream.h ../core/misc.h ../core/item.h download.o: ../core/error.h ../core/log.h ../core/textstream.h download.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h download.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h -download.o: ../core/request.h ../core/requesttypes.h ../core/session.h -download.o: ../core/error.h ../core/user.h ../core/plugindata.h -download.o: ../core/rebus.h ../core/config.h ../core/confparser.h -download.o: ../core/htmlfilter.h ../templates/htmltextstream.h -download.o: ../core/config.h ../core/system.h ../core/dirs.h -download.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h -download.o: ../notify/notifypool.h ../templates/locale.h ../core/confparser.h -download.o: ../templates/misc.h ../templates/localefilter.h -download.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h +download.o: ../core/request.h ../core/requesttypes.h ../core/error.h +download.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +download.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h +download.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h +download.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h +download.o: ../core/confparser.h ../templates/misc.h +download.o: ../templates/localefilter.h ../templates/locale.h +download.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h download.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -download.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -download.o: ckeditor.h cp.h default.h emacs.h last.h login.h logout.h ln.h -download.o: ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h -download.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h -download.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +download.o: functionparser.h ../core/cur.h ../core/session.h ../core/user.h +download.o: ../core/plugindata.h ../core/rebus.h adduser.h cat.h chmod.h +download.o: privchanger.h chown.h ckeditor.h cp.h default.h emacs.h last.h +download.o: login.h logout.h ln.h ls.h mkdir.h mv.h node.h priv.h reload.h +download.o: rm.h run.h specialdefault.h stat.h subject.h template.h tinymce.h +download.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h download.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h download.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h download.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -download.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -download.o: ../core/mountparser.h ../core/users.h ../core/groups.h -download.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -download.o: ../core/basethread.h ../core/synchro.h +download.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h +download.o: ../core/mount.h ../core/mountparser.h ../core/users.h +download.o: ../core/groups.h ../core/group.h ../core/loadavg.h +download.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h emacs.o: emacs.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h emacs.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h emacs.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h emacs.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h emacs.o: ../core/user.h ../core/group.h ../core/dircontainer.h emacs.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -emacs.o: ../core/session.h ../core/error.h ../core/user.h -emacs.o: ../core/plugindata.h ../core/rebus.h ../core/config.h -emacs.o: ../core/confparser.h ../core/htmlfilter.h -emacs.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h -emacs.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h -emacs.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h -emacs.o: ../core/confparser.h ../templates/misc.h ../templates/localefilter.h -emacs.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -emacs.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -emacs.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h +emacs.o: ../core/error.h ../core/config.h ../core/confparser.h +emacs.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/config.h +emacs.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +emacs.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h +emacs.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h +emacs.o: ../templates/localefilter.h ../templates/locale.h +emacs.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +emacs.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +emacs.o: ../core/session.h ../core/user.h ../core/plugindata.h +emacs.o: ../core/rebus.h adduser.h cat.h chmod.h privchanger.h chown.h emacs.o: ckeditor.h cp.h default.h download.h last.h login.h logout.h ln.h emacs.o: ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h specialdefault.h emacs.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h @@ -236,7 +237,7 @@ emacs.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h emacs.o: ../templates/htmltextstream.h ../notify/notifythread.h emacs.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h emacs.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -emacs.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h +emacs.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h emacs.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h emacs.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h emacs.o: ../templates/templates.h ../templates/patterncacher.h @@ -249,49 +250,49 @@ functionbase.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h functionbase.o: ../core/textstream.h ../db/dbitemquery.h functionbase.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h functionbase.o: ../core/dircontainer.h ../core/ugcontainer.h -functionbase.o: ../core/request.h ../core/requesttypes.h ../core/session.h -functionbase.o: ../core/error.h ../core/user.h ../core/plugindata.h -functionbase.o: ../core/rebus.h ../core/config.h ../core/confparser.h -functionbase.o: ../core/htmlfilter.h ../templates/htmltextstream.h -functionbase.o: ../core/config.h ../core/system.h ../core/dirs.h -functionbase.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h -functionbase.o: ../notify/notifypool.h ../templates/locale.h -functionbase.o: ../core/confparser.h ../templates/misc.h -functionbase.o: ../templates/localefilter.h ../templates/locale.h -functionbase.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h -functionbase.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -functionbase.o: functionparser.h adduser.h cat.h chmod.h privchanger.h -functionbase.o: chown.h ckeditor.h cp.h default.h download.h emacs.h last.h -functionbase.o: login.h logout.h ln.h ls.h mkdir.h mv.h node.h priv.h -functionbase.o: reload.h rm.h run.h specialdefault.h stat.h subject.h +functionbase.o: ../core/request.h ../core/requesttypes.h ../core/error.h +functionbase.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +functionbase.o: ../templates/htmltextstream.h ../core/config.h +functionbase.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +functionbase.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h +functionbase.o: ../templates/locale.h ../core/confparser.h +functionbase.o: ../templates/misc.h ../templates/localefilter.h +functionbase.o: ../templates/locale.h ../../ezc/src/ezc.h +functionbase.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h +functionbase.o: ../../ezc/src/pattern.h functions.h functionparser.h +functionbase.o: ../core/cur.h ../core/session.h ../core/user.h +functionbase.o: ../core/plugindata.h ../core/rebus.h adduser.h cat.h chmod.h +functionbase.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h +functionbase.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h node.h +functionbase.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h functionbase.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h functionbase.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h functionbase.o: ../templates/htmltextstream.h ../notify/notifythread.h functionbase.o: ../core/basethread.h ../core/synchro.h functionbase.o: ../notify/templatesnotify.h ../core/users.h -functionbase.o: ../core/ugcontainer.h ../core/lastcontainer.h +functionbase.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/cur.h functionbase.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h functionbase.o: ../core/users.h ../core/groups.h ../core/group.h functionbase.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h functionbase.o: ../core/synchro.h -functionparser.o: functionparser.h ../core/request.h ../core/requesttypes.h -functionparser.o: ../core/session.h ../core/item.h ../core/error.h +functionparser.o: functionparser.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +functionparser.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h +functionparser.o: ../core/item.h ../core/error.h ../core/log.h +functionparser.o: ../core/textstream.h ../db/dbitemquery.h ../core/item.h +functionparser.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h +functionparser.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/cur.h +functionparser.o: ../core/request.h ../core/session.h ../core/error.h functionparser.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -functionparser.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h -functionparser.o: ../core/textstream.h ../templates/htmltextstream.h -functionparser.o: ../core/textstream.h ../core/misc.h ../db/db.h -functionparser.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h -functionparser.o: ../core/error.h ../core/log.h ../db/dbitemquery.h -functionparser.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h -functionparser.o: ../core/group.h ../core/dircontainer.h -functionparser.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h -functionparser.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h -functionparser.o: ../notify/notifypool.h ../templates/locale.h -functionparser.o: ../core/confparser.h ../templates/misc.h -functionparser.o: ../templates/localefilter.h ../templates/locale.h -functionparser.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h -functionparser.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h -functionparser.o: functions.h functionbase.h ../core/config.h +functionparser.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +functionparser.o: ../notify/notify.h ../notify/notifypool.h +functionparser.o: ../templates/locale.h ../core/confparser.h +functionparser.o: ../templates/misc.h ../templates/localefilter.h +functionparser.o: ../templates/locale.h ../../ezc/src/ezc.h +functionparser.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h +functionparser.o: ../../ezc/src/pattern.h functions.h functionbase.h +functionparser.o: ../core/request.h ../core/requesttypes.h ../core/config.h +functionparser.o: ../core/confparser.h ../core/htmlfilter.h +functionparser.o: ../templates/htmltextstream.h ../core/config.h functionparser.o: ../core/synchro.h adduser.h cat.h chmod.h privchanger.h functionparser.o: chown.h ckeditor.h cp.h default.h download.h emacs.h last.h functionparser.o: login.h logout.h ln.h ls.h mkdir.h mv.h node.h priv.h @@ -301,7 +302,7 @@ functionparser.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h functionparser.o: ../templates/htmltextstream.h ../notify/notifythread.h functionparser.o: ../core/basethread.h ../core/synchro.h functionparser.o: ../notify/templatesnotify.h ../core/users.h -functionparser.o: ../core/ugcontainer.h ../core/lastcontainer.h +functionparser.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/cur.h functionparser.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h functionparser.o: ../core/users.h ../core/groups.h ../core/group.h functionparser.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h @@ -312,69 +313,67 @@ functions.o: ../core/textstream.h ../core/misc.h ../core/item.h functions.o: ../core/error.h ../core/log.h ../core/textstream.h functions.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h functions.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h -functions.o: ../core/request.h ../core/requesttypes.h ../core/session.h -functions.o: ../core/error.h ../core/user.h ../core/plugindata.h -functions.o: ../core/rebus.h ../core/config.h ../core/confparser.h -functions.o: ../core/htmlfilter.h ../templates/htmltextstream.h -functions.o: ../core/config.h ../core/system.h ../core/dirs.h -functions.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h -functions.o: ../notify/notifypool.h ../templates/locale.h +functions.o: ../core/request.h ../core/requesttypes.h ../core/error.h +functions.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +functions.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h +functions.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h +functions.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h functions.o: ../core/confparser.h ../templates/misc.h functions.o: ../templates/localefilter.h ../templates/locale.h functions.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h functions.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h functions.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -functions.o: ../notify/templatesnotify.h ../core/users.h -functions.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h -functions.o: ../core/mount.h ../core/mountparser.h ../core/users.h -functions.o: ../core/groups.h ../core/group.h ../core/loadavg.h -functions.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h -functions.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -functions.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h -functions.o: logout.h ln.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h -functions.o: run.h specialdefault.h stat.h subject.h template.h tinymce.h -functions.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h -functions.o: ../core/log.h ../core/misc.h ../core/plugin.h -functions.o: ../core/pluginmsg.h ../core/system.h ../core/sessionmanager.h -functions.o: ../core/sessioncontainer.h ../functions/functions.h -functions.o: ../templates/templates.h ../templates/patterncacher.h -functions.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h -functions.o: ../core/log.h ../templates/indexpatterns.h -functions.o: ../core/sessionmanager.h +functions.o: ../notify/templatesnotify.h ../core/users.h ../core/user.h +functions.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/cur.h +functions.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h +functions.o: ../core/users.h ../core/groups.h ../core/group.h ../core/rebus.h +functions.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +functions.o: ../core/synchro.h functionparser.h ../core/cur.h +functions.o: ../core/session.h ../core/plugindata.h adduser.h cat.h chmod.h +functions.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h +functions.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h node.h +functions.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h +functions.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +functions.o: ../core/htmlfilter.h ../core/log.h ../core/misc.h +functions.o: ../core/plugin.h ../core/pluginmsg.h ../core/system.h +functions.o: ../core/sessionmanager.h ../core/sessioncontainer.h +functions.o: ../functions/functions.h ../templates/templates.h +functions.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h +functions.o: ../core/httpsimpleparser.h ../core/log.h +functions.o: ../templates/indexpatterns.h ../core/sessionmanager.h last.o: last.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h last.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h last.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h last.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h last.o: ../core/user.h ../core/group.h ../core/dircontainer.h last.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -last.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h -last.o: ../core/rebus.h ../core/config.h ../core/confparser.h +last.o: ../core/error.h ../core/config.h ../core/confparser.h last.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/config.h last.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h last.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h last.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h last.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h last.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -last.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h cat.h -last.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h -last.o: emacs.h login.h logout.h ln.h ls.h mkdir.h mv.h node.h priv.h -last.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h -last.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h -last.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.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/basethread.h ../core/synchro.h +last.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +last.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h +last.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h +last.o: default.h download.h emacs.h login.h logout.h ln.h ls.h mkdir.h mv.h +last.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h +last.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +last.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +last.o: ../templates/htmltextstream.h ../notify/notifythread.h +last.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +last.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +last.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h +last.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +last.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h ln.o: ln.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h ln.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h ln.o: ../core/item.h ../core/error.h ../core/log.h ../core/textstream.h ln.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h ln.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h -ln.o: ../core/request.h ../core/requesttypes.h ../core/session.h -ln.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h +ln.o: ../core/request.h ../core/requesttypes.h ../core/error.h ln.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h ln.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h ln.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h @@ -382,34 +381,35 @@ ln.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h ln.o: ../core/confparser.h ../templates/misc.h ../templates/localefilter.h ln.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h ln.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -ln.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -ln.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h logout.h -ln.o: ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h specialdefault.h -ln.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h who.h -ln.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h -ln.o: ../templates/htmltextstream.h ../notify/notifythread.h -ln.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -ln.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -ln.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h ../core/users.h -ln.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -ln.o: ../core/basethread.h ../core/synchro.h ../core/misc.h -ln.o: ../functions/functions.h +ln.o: functionparser.h ../core/cur.h ../core/session.h ../core/user.h +ln.o: ../core/plugindata.h ../core/rebus.h adduser.h cat.h chmod.h +ln.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h +ln.o: last.h login.h logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h +ln.o: run.h specialdefault.h stat.h subject.h template.h tinymce.h uname.h +ln.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +ln.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +ln.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +ln.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +ln.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h ../core/mount.h +ln.o: ../core/mountparser.h ../core/users.h ../core/groups.h ../core/group.h +ln.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +ln.o: ../core/synchro.h ../core/misc.h ../functions/functions.h login.o: login.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h login.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h login.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h login.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h login.o: ../core/user.h ../core/group.h ../core/dircontainer.h login.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -login.o: ../core/session.h ../core/error.h ../core/user.h -login.o: ../core/plugindata.h ../core/rebus.h ../core/config.h -login.o: ../core/confparser.h ../core/htmlfilter.h -login.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h -login.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h -login.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h -login.o: ../core/confparser.h ../templates/misc.h ../templates/localefilter.h -login.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -login.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -login.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h +login.o: ../core/error.h ../core/config.h ../core/confparser.h +login.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/config.h +login.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +login.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h +login.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h +login.o: ../templates/localefilter.h ../templates/locale.h +login.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +login.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +login.o: ../core/session.h ../core/user.h ../core/plugindata.h +login.o: ../core/rebus.h adduser.h cat.h chmod.h privchanger.h chown.h login.o: ckeditor.h cp.h default.h download.h emacs.h last.h logout.h ln.h login.o: ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h specialdefault.h login.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h @@ -417,7 +417,7 @@ login.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h login.o: ../templates/htmltextstream.h ../notify/notifythread.h login.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h login.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -login.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h +login.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h login.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h login.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h logout.o: logout.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h @@ -426,34 +426,33 @@ logout.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h logout.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h logout.o: ../core/user.h ../core/group.h ../core/dircontainer.h logout.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -logout.o: ../core/session.h ../core/error.h ../core/user.h -logout.o: ../core/plugindata.h ../core/rebus.h ../core/config.h -logout.o: ../core/confparser.h ../core/htmlfilter.h -logout.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h -logout.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h -logout.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h -logout.o: ../core/confparser.h ../templates/misc.h +logout.o: ../core/error.h ../core/config.h ../core/confparser.h +logout.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/config.h +logout.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +logout.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h +logout.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h logout.o: ../templates/localefilter.h ../templates/locale.h logout.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -logout.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h -logout.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h default.h -logout.o: download.h emacs.h last.h login.h ln.h ls.h mkdir.h mv.h node.h -logout.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h -logout.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -logout.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h -logout.o: ../templates/htmltextstream.h ../notify/notifythread.h -logout.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -logout.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -logout.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -logout.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -logout.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +logout.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +logout.o: ../core/session.h ../core/user.h ../core/plugindata.h +logout.o: ../core/rebus.h adduser.h cat.h chmod.h privchanger.h chown.h +logout.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h ln.h +logout.o: ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h +logout.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +logout.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +logout.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +logout.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +logout.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +logout.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h +logout.o: ../core/mount.h ../core/mountparser.h ../core/users.h +logout.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +logout.o: ../core/basethread.h ../core/synchro.h ls.o: ls.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h ls.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h ls.o: ../core/item.h ../core/error.h ../core/log.h ../core/textstream.h ls.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h ls.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h -ls.o: ../core/request.h ../core/requesttypes.h ../core/session.h -ls.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h +ls.o: ../core/request.h ../core/requesttypes.h ../core/error.h ls.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h ls.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h ls.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h @@ -461,33 +460,35 @@ ls.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h ls.o: ../core/confparser.h ../templates/misc.h ../templates/localefilter.h ls.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h ls.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -ls.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -ls.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h logout.h -ls.o: ln.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h specialdefault.h -ls.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h who.h -ls.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h -ls.o: ../templates/htmltextstream.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/synchro.h +ls.o: functionparser.h ../core/cur.h ../core/session.h ../core/user.h +ls.o: ../core/plugindata.h ../core/rebus.h adduser.h cat.h chmod.h +ls.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h +ls.o: last.h login.h logout.h ln.h mkdir.h mv.h node.h priv.h reload.h rm.h +ls.o: run.h specialdefault.h stat.h subject.h template.h tinymce.h uname.h +ls.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +ls.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +ls.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +ls.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +ls.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h ../core/mount.h +ls.o: ../core/mountparser.h ../core/users.h ../core/groups.h ../core/group.h +ls.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +ls.o: ../core/synchro.h mkdir.o: mkdir.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h mkdir.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h mkdir.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h mkdir.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h mkdir.o: ../core/user.h ../core/group.h ../core/dircontainer.h mkdir.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -mkdir.o: ../core/session.h ../core/error.h ../core/user.h -mkdir.o: ../core/plugindata.h ../core/rebus.h ../core/config.h -mkdir.o: ../core/confparser.h ../core/htmlfilter.h -mkdir.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h -mkdir.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h -mkdir.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h -mkdir.o: ../core/confparser.h ../templates/misc.h ../templates/localefilter.h -mkdir.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -mkdir.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -mkdir.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h +mkdir.o: ../core/error.h ../core/config.h ../core/confparser.h +mkdir.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/config.h +mkdir.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +mkdir.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h +mkdir.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h +mkdir.o: ../templates/localefilter.h ../templates/locale.h +mkdir.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +mkdir.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +mkdir.o: ../core/session.h ../core/user.h ../core/plugindata.h +mkdir.o: ../core/rebus.h adduser.h cat.h chmod.h privchanger.h chown.h mkdir.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h logout.h mkdir.o: ln.h ls.h mv.h node.h priv.h reload.h rm.h run.h specialdefault.h mkdir.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h @@ -495,7 +496,7 @@ mkdir.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h mkdir.o: ../templates/htmltextstream.h ../notify/notifythread.h mkdir.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h mkdir.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -mkdir.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h +mkdir.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h mkdir.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h mkdir.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h mv.o: mv.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h @@ -503,8 +504,7 @@ mv.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h mv.o: ../core/item.h ../core/error.h ../core/log.h ../core/textstream.h mv.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h mv.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h -mv.o: ../core/request.h ../core/requesttypes.h ../core/session.h -mv.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h +mv.o: ../core/request.h ../core/requesttypes.h ../core/error.h mv.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h mv.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h mv.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h @@ -512,136 +512,138 @@ mv.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h mv.o: ../core/confparser.h ../templates/misc.h ../templates/localefilter.h mv.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h mv.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -mv.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -mv.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h logout.h -mv.o: ln.h ls.h mkdir.h node.h priv.h reload.h rm.h run.h specialdefault.h -mv.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h who.h -mv.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h -mv.o: ../templates/htmltextstream.h ../notify/notifythread.h -mv.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -mv.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -mv.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h ../core/users.h -mv.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -mv.o: ../core/basethread.h ../core/synchro.h +mv.o: functionparser.h ../core/cur.h ../core/session.h ../core/user.h +mv.o: ../core/plugindata.h ../core/rebus.h adduser.h cat.h chmod.h +mv.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h +mv.o: last.h login.h logout.h ln.h ls.h mkdir.h node.h priv.h reload.h rm.h +mv.o: run.h specialdefault.h stat.h subject.h template.h tinymce.h uname.h +mv.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +mv.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +mv.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +mv.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +mv.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h ../core/mount.h +mv.o: ../core/mountparser.h ../core/users.h ../core/groups.h ../core/group.h +mv.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +mv.o: ../core/synchro.h node.o: node.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h node.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h node.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h node.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h node.o: ../core/user.h ../core/group.h ../core/dircontainer.h node.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -node.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h -node.o: ../core/rebus.h ../core/config.h ../core/confparser.h +node.o: ../core/error.h ../core/config.h ../core/confparser.h node.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/config.h node.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h node.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h node.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h node.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h node.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -node.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h cat.h -node.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h -node.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h priv.h -node.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h -node.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h -node.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -node.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -node.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -node.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -node.o: ../core/mountparser.h ../core/users.h ../core/groups.h -node.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -node.o: ../core/basethread.h ../core/synchro.h +node.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +node.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h +node.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h +node.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h +node.o: mkdir.h mv.h priv.h reload.h rm.h run.h specialdefault.h stat.h +node.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +node.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +node.o: ../templates/htmltextstream.h ../notify/notifythread.h +node.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +node.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +node.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h +node.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +node.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h priv.o: priv.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h priv.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h priv.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h priv.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h priv.o: ../core/user.h ../core/group.h ../core/dircontainer.h priv.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -priv.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h -priv.o: ../core/rebus.h ../core/config.h ../core/confparser.h +priv.o: ../core/error.h ../core/config.h ../core/confparser.h priv.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/config.h priv.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h priv.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h priv.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h priv.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h priv.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -priv.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h cat.h -priv.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h -priv.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h node.h -priv.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h -priv.o: tinymce.h uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h -priv.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.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/basethread.h ../core/synchro.h +priv.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +priv.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h +priv.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h +priv.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h +priv.o: mkdir.h mv.h node.h reload.h rm.h run.h specialdefault.h stat.h +priv.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +priv.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +priv.o: ../templates/htmltextstream.h ../notify/notifythread.h +priv.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +priv.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +priv.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h +priv.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +priv.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h privchanger.o: privchanger.h ../core/request.h ../core/requesttypes.h -privchanger.o: ../core/session.h ../core/item.h ../core/error.h -privchanger.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -privchanger.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h -privchanger.o: ../core/textstream.h ../templates/htmltextstream.h -privchanger.o: ../core/textstream.h ../core/misc.h ../core/system.h -privchanger.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h -privchanger.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h -privchanger.o: ../core/error.h ../core/log.h ../db/dbitemquery.h -privchanger.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h -privchanger.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h -privchanger.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h +privchanger.o: ../core/item.h ../core/error.h ../core/config.h +privchanger.o: ../core/confparser.h ../core/htmlfilter.h ../core/textstream.h +privchanger.o: ../templates/htmltextstream.h ../core/textstream.h +privchanger.o: ../core/misc.h ../core/system.h ../core/dirs.h +privchanger.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h +privchanger.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h +privchanger.o: ../core/log.h ../db/dbitemquery.h ../core/item.h +privchanger.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h +privchanger.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h +privchanger.o: ../notify/notify.h ../notify/notifypool.h privchanger.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h privchanger.o: ../templates/localefilter.h ../templates/locale.h privchanger.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h privchanger.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h privchanger.o: functionbase.h ../core/config.h ../core/synchro.h -privchanger.o: functionparser.h adduser.h cat.h chmod.h chown.h ckeditor.h -privchanger.o: cp.h default.h download.h emacs.h last.h login.h logout.h ln.h -privchanger.o: ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h -privchanger.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h -privchanger.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h -privchanger.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -privchanger.o: ../notify/notifythread.h ../core/basethread.h -privchanger.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h -privchanger.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h -privchanger.o: ../core/mount.h ../core/mountparser.h ../core/users.h -privchanger.o: ../core/groups.h ../core/group.h ../core/loadavg.h -privchanger.o: ../core/thumb.h ../core/basethread.h +privchanger.o: functionparser.h ../core/cur.h ../core/session.h +privchanger.o: ../core/user.h ../core/plugindata.h ../core/rebus.h adduser.h +privchanger.o: cat.h chmod.h chown.h ckeditor.h cp.h default.h download.h +privchanger.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h node.h +privchanger.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h +privchanger.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +privchanger.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +privchanger.o: ../templates/htmltextstream.h ../notify/notifythread.h +privchanger.o: ../core/basethread.h ../core/synchro.h +privchanger.o: ../notify/templatesnotify.h ../core/users.h +privchanger.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/cur.h +privchanger.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h +privchanger.o: ../core/users.h ../core/groups.h ../core/group.h +privchanger.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h reload.o: reload.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h reload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h reload.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h reload.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h reload.o: ../core/user.h ../core/group.h ../core/dircontainer.h reload.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -reload.o: ../core/session.h ../core/error.h ../core/user.h -reload.o: ../core/plugindata.h ../core/rebus.h ../core/config.h -reload.o: ../core/confparser.h ../core/htmlfilter.h -reload.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h -reload.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h -reload.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h -reload.o: ../core/confparser.h ../templates/misc.h +reload.o: ../core/error.h ../core/config.h ../core/confparser.h +reload.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/config.h +reload.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +reload.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h +reload.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h reload.o: ../templates/localefilter.h ../templates/locale.h reload.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -reload.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h -reload.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h default.h -reload.o: download.h emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h -reload.o: node.h priv.h rm.h run.h specialdefault.h stat.h subject.h -reload.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -reload.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h -reload.o: ../templates/htmltextstream.h ../notify/notifythread.h -reload.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -reload.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -reload.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -reload.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -reload.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h -reload.o: ../templates/templates.h ../templates/patterncacher.h -reload.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h -reload.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h +reload.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +reload.o: ../core/session.h ../core/user.h ../core/plugindata.h +reload.o: ../core/rebus.h adduser.h cat.h chmod.h privchanger.h chown.h +reload.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h +reload.o: logout.h ln.h ls.h mkdir.h mv.h node.h priv.h rm.h run.h +reload.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +reload.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +reload.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +reload.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +reload.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +reload.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h +reload.o: ../core/mount.h ../core/mountparser.h ../core/users.h +reload.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +reload.o: ../core/basethread.h ../core/synchro.h ../templates/templates.h +reload.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h +reload.o: ../core/httpsimpleparser.h ../core/log.h +reload.o: ../templates/indexpatterns.h ../core/sessionmanager.h reload.o: ../core/sessioncontainer.h ../core/system.h rm.o: rm.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h rm.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h rm.o: ../core/item.h ../core/error.h ../core/log.h ../core/textstream.h rm.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h rm.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h -rm.o: ../core/request.h ../core/requesttypes.h ../core/session.h -rm.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h +rm.o: ../core/request.h ../core/requesttypes.h ../core/error.h rm.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h rm.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h rm.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h @@ -649,46 +651,47 @@ rm.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h rm.o: ../core/confparser.h ../templates/misc.h ../templates/localefilter.h rm.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h rm.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -rm.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -rm.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h logout.h -rm.o: ln.h ls.h mkdir.h mv.h node.h priv.h reload.h run.h specialdefault.h -rm.o: stat.h subject.h template.h tinymce.h uname.h upload.h uptime.h who.h -rm.o: vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h -rm.o: ../templates/htmltextstream.h ../notify/notifythread.h -rm.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -rm.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -rm.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h ../core/users.h -rm.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -rm.o: ../core/basethread.h ../core/synchro.h ../core/plugin.h -rm.o: ../core/pluginmsg.h ../core/system.h ../core/sessionmanager.h -rm.o: ../core/sessioncontainer.h ../functions/functions.h -rm.o: ../templates/templates.h ../templates/patterncacher.h -rm.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h -rm.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h -rm.o: ../core/misc.h +rm.o: functionparser.h ../core/cur.h ../core/session.h ../core/user.h +rm.o: ../core/plugindata.h ../core/rebus.h adduser.h cat.h chmod.h +rm.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h +rm.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h node.h priv.h reload.h +rm.o: run.h specialdefault.h stat.h subject.h template.h tinymce.h uname.h +rm.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +rm.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +rm.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +rm.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +rm.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h ../core/mount.h +rm.o: ../core/mountparser.h ../core/users.h ../core/groups.h ../core/group.h +rm.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +rm.o: ../core/synchro.h ../core/plugin.h ../core/pluginmsg.h ../core/system.h +rm.o: ../core/sessionmanager.h ../core/sessioncontainer.h +rm.o: ../functions/functions.h ../templates/templates.h +rm.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h +rm.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h +rm.o: ../core/sessionmanager.h ../core/misc.h run.o: run.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h run.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h run.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h run.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h run.o: ../core/user.h ../core/group.h ../core/dircontainer.h run.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -run.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h -run.o: ../core/rebus.h ../core/config.h ../core/confparser.h +run.o: ../core/error.h ../core/config.h ../core/confparser.h run.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/config.h run.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h run.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h run.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h run.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h run.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h -run.o: functions.h functionparser.h adduser.h cat.h chmod.h privchanger.h -run.o: chown.h ckeditor.h cp.h default.h download.h emacs.h last.h login.h -run.o: logout.h ln.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h -run.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h -run.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h +run.o: functions.h functionparser.h ../core/cur.h ../core/session.h +run.o: ../core/user.h ../core/plugindata.h ../core/rebus.h adduser.h cat.h +run.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h +run.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h node.h priv.h +run.o: reload.h rm.h specialdefault.h stat.h subject.h template.h tinymce.h +run.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h run.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h run.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h run.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -run.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h +run.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h ../core/mount.h run.o: ../core/mountparser.h ../core/users.h ../core/groups.h ../core/group.h run.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h run.o: ../core/synchro.h @@ -699,9 +702,8 @@ specialdefault.o: ../core/error.h ../core/log.h ../core/textstream.h specialdefault.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h specialdefault.o: ../core/group.h ../core/dircontainer.h specialdefault.o: ../core/ugcontainer.h ../core/request.h -specialdefault.o: ../core/requesttypes.h ../core/session.h ../core/error.h -specialdefault.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -specialdefault.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +specialdefault.o: ../core/requesttypes.h ../core/error.h ../core/config.h +specialdefault.o: ../core/confparser.h ../core/htmlfilter.h specialdefault.o: ../templates/htmltextstream.h ../core/config.h specialdefault.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h specialdefault.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h @@ -710,143 +712,147 @@ specialdefault.o: ../templates/misc.h ../templates/localefilter.h specialdefault.o: ../templates/locale.h ../../ezc/src/ezc.h specialdefault.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h specialdefault.o: ../../ezc/src/pattern.h functions.h functionparser.h -specialdefault.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h -specialdefault.o: cp.h default.h download.h emacs.h last.h login.h logout.h -specialdefault.o: ln.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h -specialdefault.o: stat.h subject.h template.h tinymce.h uname.h upload.h -specialdefault.o: uptime.h who.h vim.h ../core/htmlfilter.h -specialdefault.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -specialdefault.o: ../notify/notifythread.h ../core/basethread.h -specialdefault.o: ../core/synchro.h ../notify/templatesnotify.h -specialdefault.o: ../core/users.h ../core/ugcontainer.h -specialdefault.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -specialdefault.o: ../core/mountparser.h ../core/users.h ../core/groups.h -specialdefault.o: ../core/group.h ../core/loadavg.h ../core/thumb.h +specialdefault.o: ../core/cur.h ../core/session.h ../core/user.h +specialdefault.o: ../core/plugindata.h ../core/rebus.h adduser.h cat.h +specialdefault.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h +specialdefault.o: download.h emacs.h last.h login.h logout.h ln.h ls.h +specialdefault.o: mkdir.h mv.h node.h priv.h reload.h rm.h run.h stat.h +specialdefault.o: subject.h template.h tinymce.h uname.h upload.h uptime.h +specialdefault.o: who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h +specialdefault.o: ../templates/htmltextstream.h ../notify/notifythread.h specialdefault.o: ../core/basethread.h ../core/synchro.h +specialdefault.o: ../notify/templatesnotify.h ../core/users.h +specialdefault.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/cur.h +specialdefault.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h +specialdefault.o: ../core/users.h ../core/groups.h ../core/group.h +specialdefault.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +specialdefault.o: ../core/synchro.h stat.o: stat.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h stat.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h stat.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h stat.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h stat.o: ../core/user.h ../core/group.h ../core/dircontainer.h stat.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -stat.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h -stat.o: ../core/rebus.h ../core/config.h ../core/confparser.h +stat.o: ../core/error.h ../core/config.h ../core/confparser.h stat.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/config.h stat.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h stat.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h stat.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h stat.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h stat.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h -stat.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h cat.h -stat.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h -stat.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h node.h priv.h -stat.o: reload.h rm.h run.h specialdefault.h subject.h template.h tinymce.h -stat.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h -stat.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.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/basethread.h ../core/synchro.h +stat.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +stat.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h +stat.o: adduser.h cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h +stat.o: default.h download.h emacs.h last.h login.h logout.h ln.h ls.h +stat.o: mkdir.h mv.h node.h priv.h reload.h rm.h run.h specialdefault.h +stat.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h vim.h +stat.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +stat.o: ../templates/htmltextstream.h ../notify/notifythread.h +stat.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h +stat.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h +stat.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h +stat.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +stat.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h subject.o: subject.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h subject.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h subject.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h subject.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h subject.o: ../core/user.h ../core/group.h ../core/dircontainer.h subject.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -subject.o: ../core/session.h ../core/error.h ../core/user.h -subject.o: ../core/plugindata.h ../core/rebus.h ../core/config.h -subject.o: ../core/confparser.h ../core/htmlfilter.h -subject.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h -subject.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h -subject.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h -subject.o: ../core/confparser.h ../templates/misc.h -subject.o: ../templates/localefilter.h ../templates/locale.h -subject.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -subject.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h -subject.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h default.h -subject.o: download.h emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h -subject.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h -subject.o: template.h tinymce.h uname.h upload.h uptime.h who.h vim.h -subject.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h -subject.o: ../templates/htmltextstream.h ../notify/notifythread.h -subject.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -subject.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -subject.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -subject.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -subject.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +subject.o: ../core/error.h ../core/config.h ../core/confparser.h +subject.o: ../core/htmlfilter.h ../templates/htmltextstream.h +subject.o: ../core/config.h ../core/system.h ../core/dirs.h +subject.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h +subject.o: ../notify/notifypool.h ../templates/locale.h ../core/confparser.h +subject.o: ../templates/misc.h ../templates/localefilter.h +subject.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h +subject.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h +subject.o: functionparser.h ../core/cur.h ../core/session.h ../core/user.h +subject.o: ../core/plugindata.h ../core/rebus.h adduser.h cat.h chmod.h +subject.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h +subject.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h node.h priv.h +subject.o: reload.h rm.h run.h specialdefault.h stat.h template.h tinymce.h +subject.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +subject.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +subject.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +subject.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +subject.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h +subject.o: ../core/mount.h ../core/mountparser.h ../core/users.h +subject.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +subject.o: ../core/basethread.h ../core/synchro.h template.o: template.h functionbase.h ../core/item.h ../db/db.h template.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h template.o: ../core/textstream.h ../core/misc.h ../core/item.h template.o: ../core/error.h ../core/log.h ../core/textstream.h template.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h template.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h -template.o: ../core/request.h ../core/requesttypes.h ../core/session.h -template.o: ../core/error.h ../core/user.h ../core/plugindata.h -template.o: ../core/rebus.h ../core/config.h ../core/confparser.h -template.o: ../core/htmlfilter.h ../templates/htmltextstream.h -template.o: ../core/config.h ../core/system.h ../core/dirs.h -template.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h -template.o: ../notify/notifypool.h ../templates/locale.h ../core/confparser.h -template.o: ../templates/misc.h ../templates/localefilter.h -template.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h +template.o: ../core/request.h ../core/requesttypes.h ../core/error.h +template.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +template.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h +template.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h +template.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h +template.o: ../core/confparser.h ../templates/misc.h +template.o: ../templates/localefilter.h ../templates/locale.h +template.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h template.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -template.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h -template.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h -template.o: logout.h ln.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h -template.o: specialdefault.h stat.h subject.h tinymce.h uname.h upload.h -template.o: uptime.h who.h vim.h ../core/htmlfilter.h -template.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h -template.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +template.o: functionparser.h ../core/cur.h ../core/session.h ../core/user.h +template.o: ../core/plugindata.h ../core/rebus.h adduser.h cat.h chmod.h +template.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h +template.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h node.h +template.o: priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h +template.o: tinymce.h uname.h upload.h uptime.h who.h vim.h +template.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h +template.o: ../templates/htmltextstream.h ../notify/notifythread.h +template.o: ../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/synchro.h ../core/misc.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/synchro.h +template.o: ../core/misc.h tinymce.o: tinymce.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h tinymce.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h tinymce.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h tinymce.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h tinymce.o: ../core/user.h ../core/group.h ../core/dircontainer.h tinymce.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -tinymce.o: ../core/session.h ../core/error.h ../core/user.h -tinymce.o: ../core/plugindata.h ../core/rebus.h ../core/config.h -tinymce.o: ../core/confparser.h ../core/htmlfilter.h -tinymce.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h -tinymce.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h -tinymce.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h -tinymce.o: ../core/confparser.h ../templates/misc.h -tinymce.o: ../templates/localefilter.h ../templates/locale.h -tinymce.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -tinymce.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h -tinymce.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h default.h -tinymce.o: download.h emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h -tinymce.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h -tinymce.o: subject.h template.h uname.h upload.h uptime.h who.h vim.h -tinymce.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h -tinymce.o: ../templates/htmltextstream.h ../notify/notifythread.h -tinymce.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -tinymce.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -tinymce.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h -tinymce.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -tinymce.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +tinymce.o: ../core/error.h ../core/config.h ../core/confparser.h +tinymce.o: ../core/htmlfilter.h ../templates/htmltextstream.h +tinymce.o: ../core/config.h ../core/system.h ../core/dirs.h +tinymce.o: ../core/dircontainer.h ../core/request.h ../notify/notify.h +tinymce.o: ../notify/notifypool.h ../templates/locale.h ../core/confparser.h +tinymce.o: ../templates/misc.h ../templates/localefilter.h +tinymce.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h +tinymce.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h +tinymce.o: functionparser.h ../core/cur.h ../core/session.h ../core/user.h +tinymce.o: ../core/plugindata.h ../core/rebus.h adduser.h cat.h chmod.h +tinymce.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h emacs.h +tinymce.o: last.h login.h logout.h ln.h ls.h mkdir.h mv.h node.h priv.h +tinymce.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h +tinymce.o: uname.h upload.h uptime.h who.h vim.h ../core/htmlfilter.h +tinymce.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +tinymce.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +tinymce.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +tinymce.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h +tinymce.o: ../core/mount.h ../core/mountparser.h ../core/users.h +tinymce.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +tinymce.o: ../core/basethread.h ../core/synchro.h uname.o: uname.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h uname.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h uname.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h uname.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h uname.o: ../core/user.h ../core/group.h ../core/dircontainer.h uname.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -uname.o: ../core/session.h ../core/error.h ../core/user.h -uname.o: ../core/plugindata.h ../core/rebus.h ../core/config.h -uname.o: ../core/confparser.h ../core/htmlfilter.h -uname.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h -uname.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h -uname.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h -uname.o: ../core/confparser.h ../templates/misc.h ../templates/localefilter.h -uname.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h -uname.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h functions.h -uname.o: functionparser.h adduser.h cat.h chmod.h privchanger.h chown.h +uname.o: ../core/error.h ../core/config.h ../core/confparser.h +uname.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/config.h +uname.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +uname.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h +uname.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h +uname.o: ../templates/localefilter.h ../templates/locale.h +uname.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h +uname.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +uname.o: ../core/session.h ../core/user.h ../core/plugindata.h +uname.o: ../core/rebus.h adduser.h cat.h chmod.h privchanger.h chown.h uname.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h logout.h uname.o: ln.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h uname.o: specialdefault.h stat.h subject.h template.h tinymce.h upload.h @@ -854,7 +860,7 @@ uname.o: uptime.h who.h vim.h ../core/htmlfilter.h ../../ezc/src/stringconv.h uname.o: ../templates/htmltextstream.h ../notify/notifythread.h uname.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h uname.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h -uname.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h +uname.o: ../core/cur.h ../core/mounts.h ../core/mount.h ../core/mountparser.h uname.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h uname.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h upload.o: upload.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h @@ -863,78 +869,78 @@ upload.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h upload.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h upload.o: ../core/user.h ../core/group.h ../core/dircontainer.h upload.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -upload.o: ../core/session.h ../core/error.h ../core/user.h -upload.o: ../core/plugindata.h ../core/rebus.h ../core/config.h -upload.o: ../core/confparser.h ../core/htmlfilter.h -upload.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h -upload.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h -upload.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h -upload.o: ../core/confparser.h ../templates/misc.h +upload.o: ../core/error.h ../core/config.h ../core/confparser.h +upload.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/config.h +upload.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +upload.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h +upload.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h upload.o: ../templates/localefilter.h ../templates/locale.h upload.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -upload.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h -upload.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h default.h -upload.o: download.h emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h -upload.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h -upload.o: template.h tinymce.h uname.h uptime.h who.h vim.h -upload.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h -upload.o: ../templates/htmltextstream.h ../notify/notifythread.h -upload.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -upload.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.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/synchro.h -upload.o: ../core/misc.h ../functions/functions.h +upload.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +upload.o: ../core/session.h ../core/user.h ../core/plugindata.h +upload.o: ../core/rebus.h adduser.h cat.h chmod.h privchanger.h chown.h +upload.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h +upload.o: logout.h ln.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h +upload.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +upload.o: uptime.h who.h vim.h ../core/htmlfilter.h +upload.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +upload.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +upload.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +upload.o: ../core/lastcontainer.h ../core/cur.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/synchro.h ../core/misc.h +upload.o: ../functions/functions.h uptime.o: uptime.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h uptime.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h uptime.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h uptime.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h uptime.o: ../core/user.h ../core/group.h ../core/dircontainer.h uptime.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -uptime.o: ../core/session.h ../core/error.h ../core/user.h -uptime.o: ../core/plugindata.h ../core/rebus.h ../core/config.h -uptime.o: ../core/confparser.h ../core/htmlfilter.h -uptime.o: ../templates/htmltextstream.h ../core/config.h ../core/system.h -uptime.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h -uptime.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h -uptime.o: ../core/confparser.h ../templates/misc.h +uptime.o: ../core/error.h ../core/config.h ../core/confparser.h +uptime.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/config.h +uptime.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +uptime.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h +uptime.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h uptime.o: ../templates/localefilter.h ../templates/locale.h uptime.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -uptime.o: ../../ezc/src/pattern.h functions.h functionparser.h adduser.h -uptime.o: cat.h chmod.h privchanger.h chown.h ckeditor.h cp.h default.h -uptime.o: download.h emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h -uptime.o: node.h priv.h reload.h rm.h run.h specialdefault.h stat.h subject.h -uptime.o: template.h tinymce.h uname.h upload.h who.h vim.h -uptime.o: ../core/htmlfilter.h ../../ezc/src/stringconv.h -uptime.o: ../templates/htmltextstream.h ../notify/notifythread.h -uptime.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -uptime.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.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/synchro.h +uptime.o: ../../ezc/src/pattern.h functions.h functionparser.h ../core/cur.h +uptime.o: ../core/session.h ../core/user.h ../core/plugindata.h +uptime.o: ../core/rebus.h adduser.h cat.h chmod.h privchanger.h chown.h +uptime.o: ckeditor.h cp.h default.h download.h emacs.h last.h login.h +uptime.o: logout.h ln.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h +uptime.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +uptime.o: upload.h who.h vim.h ../core/htmlfilter.h +uptime.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +uptime.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +uptime.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h +uptime.o: ../core/lastcontainer.h ../core/cur.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/synchro.h vim.o: vim.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h vim.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h vim.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h vim.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h vim.o: ../core/user.h ../core/group.h ../core/dircontainer.h vim.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h -vim.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h -vim.o: ../core/rebus.h ../core/config.h ../core/confparser.h +vim.o: ../core/error.h ../core/config.h ../core/confparser.h vim.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/config.h vim.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h vim.o: ../core/request.h ../notify/notify.h ../notify/notifypool.h vim.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h vim.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h vim.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h -vim.o: functions.h functionparser.h adduser.h cat.h chmod.h privchanger.h -vim.o: chown.h ckeditor.h cp.h default.h download.h emacs.h last.h login.h -vim.o: logout.h ln.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h -vim.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h -vim.o: upload.h uptime.h who.h ../core/htmlfilter.h +vim.o: functions.h functionparser.h ../core/cur.h ../core/session.h +vim.o: ../core/user.h ../core/plugindata.h ../core/rebus.h adduser.h cat.h +vim.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h +vim.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h node.h priv.h +vim.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h +vim.o: tinymce.h uname.h upload.h uptime.h who.h ../core/htmlfilter.h vim.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h vim.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h vim.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -vim.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h +vim.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h ../core/mount.h vim.o: ../core/mountparser.h ../core/users.h ../core/groups.h ../core/group.h vim.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h vim.o: ../core/synchro.h @@ -944,23 +950,23 @@ who.o: ../core/misc.h ../core/item.h ../core/error.h ../core/log.h who.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h who.o: ../core/user.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 ../core/confparser.h +who.o: ../core/error.h ../core/config.h ../core/confparser.h who.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/config.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: ../templates/locale.h ../core/confparser.h ../templates/misc.h who.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h who.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h -who.o: functions.h functionparser.h adduser.h cat.h chmod.h privchanger.h -who.o: chown.h ckeditor.h cp.h default.h download.h emacs.h last.h login.h -who.o: logout.h ln.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h -who.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h -who.o: upload.h uptime.h vim.h ../core/htmlfilter.h +who.o: functions.h functionparser.h ../core/cur.h ../core/session.h +who.o: ../core/user.h ../core/plugindata.h ../core/rebus.h adduser.h cat.h +who.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h download.h +who.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h node.h priv.h +who.o: reload.h rm.h run.h specialdefault.h stat.h subject.h template.h +who.o: tinymce.h uname.h upload.h uptime.h vim.h ../core/htmlfilter.h who.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h who.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h who.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -who.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h +who.o: ../core/lastcontainer.h ../core/cur.h ../core/mounts.h ../core/mount.h who.o: ../core/mountparser.h ../core/users.h ../core/groups.h ../core/group.h who.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h who.o: ../core/synchro.h diff --git a/functions/adduser.cpp b/functions/adduser.cpp index 2d7534b..042dadd 100755 --- a/functions/adduser.cpp +++ b/functions/adduser.cpp @@ -25,25 +25,25 @@ bool AddUser::CheckAddUserVars(const std::wstring & login, const std::wstring & { if( login.empty() ) { - request->status = WINIX_ERR_LOGIN_EMPTY; + cur->request->status = WINIX_ERR_LOGIN_EMPTY; return false; } if( pass != conf_pass ) { - request->status = WINIX_ERR_PASSWORDS_DIFFERENT; + cur->request->status = WINIX_ERR_PASSWORDS_DIFFERENT; return false; } if( pass.size() < config->password_min_size ) { - request->status = WINIX_ERR_PASSWORD_TOO_SHORT; + cur->request->status = WINIX_ERR_PASSWORD_TOO_SHORT; return false; } if( system->users.IsUser(login) ) { - request->status = WINIX_ERR_USER_EXISTS; + cur->request->status = WINIX_ERR_USER_EXISTS; return false; } @@ -59,23 +59,23 @@ void AddUser::MakePost() { User user; - const std::wstring & login = request->PostVar(L"login"); - const std::wstring & pass = request->PostVar(L"password"); - const std::wstring & conf_pass = request->PostVar(L"confirmpassword"); + const std::wstring & login = cur->request->PostVar(L"login"); + const std::wstring & pass = cur->request->PostVar(L"password"); + const std::wstring & conf_pass = cur->request->PostVar(L"confirmpassword"); if( !CheckAddUserVars(login, pass, conf_pass) ) return; user.name = login; - user.email = request->PostVar(L"email"); + user.email = cur->request->PostVar(L"email"); - request->status = db->AddUser(user, pass); + cur->request->status = db->AddUser(user, pass); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) { if( system->users.AddUser(user) ) { - if( !request->session->puser ) + if( !cur->session->puser ) system->users.LoginUser(user.id, false); log << log2 << "Adduser: added a new user: " << user.name << logend; diff --git a/functions/adduser.h b/functions/adduser.h index 5f4c730..9df9c0b 100755 --- a/functions/adduser.h +++ b/functions/adduser.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentadduser -#define headerfilecmslucontentadduser +#ifndef headerfile_winix_functions_adduser +#define headerfile_winix_functions_adduser #include "functionbase.h" diff --git a/functions/cat.cpp b/functions/cat.cpp index 852a1e7..c090246 100755 --- a/functions/cat.cpp +++ b/functions/cat.cpp @@ -22,21 +22,21 @@ Cat::Cat() void Cat::MakeGet() { - if( !request->is_item ) + if( !cur->request->is_item ) { log << log1 << "Content: cat function requires an item" << logend; - request->status = WINIX_ERR_NO_ITEM; + cur->request->status = WINIX_ERR_NO_ITEM; return; } - if( !system->HasReadAccess(request->item) ) + if( !system->HasReadAccess(cur->request->item) ) { - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return; } - request->send_as_attachment = request->IsParam(L"attachment"); + cur->request->send_as_attachment = cur->request->IsParam(L"attachment"); } diff --git a/functions/cat.h b/functions/cat.h index 16f9b02..d1e8419 100755 --- a/functions/cat.h +++ b/functions/cat.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentfuncatcat -#define headerfilecmslucontentfuncatcat +#ifndef headerfile_winix_functions_cat +#define headerfile_winix_functions_cat #include "functionbase.h" diff --git a/functions/chmod.cpp b/functions/chmod.cpp index d29b024..3099496 100755 --- a/functions/chmod.cpp +++ b/functions/chmod.cpp @@ -23,7 +23,7 @@ Chmod::Chmod() void Chmod::MakePost() { - priv_changer.SetRequest(request); + priv_changer.SetCur(cur); priv_changer.SetSystem(system); priv_changer.SetDb(db); @@ -33,7 +33,7 @@ void Chmod::MakePost() void Chmod::MakeGet() { - priv_changer.SetRequest(request); + priv_changer.SetCur(cur); priv_changer.SetSystem(system); priv_changer.SetDb(db); diff --git a/functions/chmod.h b/functions/chmod.h index b152d97..5abf208 100755 --- a/functions/chmod.h +++ b/functions/chmod.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentchmod -#define headerfilecmslucontentchmod +#ifndef headerfile_winix_functions_chmod +#define headerfile_winix_functions_chmod #include "functionbase.h" #include "privchanger.h" diff --git a/functions/chown.cpp b/functions/chown.cpp index 35128c7..b296f2c 100755 --- a/functions/chown.cpp +++ b/functions/chown.cpp @@ -23,7 +23,7 @@ Chown::Chown() void Chown::MakePost() { - priv_changer.SetRequest(request); + priv_changer.SetCur(cur); priv_changer.SetSystem(system); priv_changer.SetDb(db); @@ -33,7 +33,7 @@ void Chown::MakePost() void Chown::MakeGet() { - priv_changer.SetRequest(request); + priv_changer.SetCur(cur); priv_changer.SetSystem(system); priv_changer.SetDb(db); diff --git a/functions/chown.h b/functions/chown.h index 48b93fd..806faa3 100755 --- a/functions/chown.h +++ b/functions/chown.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentchown -#define headerfilecmslucontentchown +#ifndef headerfile_winix_functions_chown +#define headerfile_winix_functions_chown #include "functionbase.h" #include "privchanger.h" diff --git a/functions/ckeditor.h b/functions/ckeditor.h index 0191308..fdea839 100755 --- a/functions/ckeditor.h +++ b/functions/ckeditor.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentckeditor -#define headerfilecmslucontentckeditor +#ifndef headerfile_winix_functions_ckeditor +#define headerfile_winix_functions_ckeditor #include "functionbase.h" diff --git a/functions/cp.cpp b/functions/cp.cpp index 73c0c58..889a18a 100755 --- a/functions/cp.cpp +++ b/functions/cp.cpp @@ -29,19 +29,19 @@ bool Cp::HasAccess() bool Cp::CheckAccessFrom() { - if( request->is_item ) + if( cur->request->is_item ) { - if( !system->HasReadAccess(request->item) || request->item.type == Item::symlink ) + if( !system->HasReadAccess(cur->request->item) || cur->request->item.type == Item::symlink ) { - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return false; } } else - if( !request->IsParam(L"r") ) + if( !cur->request->IsParam(L"r") ) { // directories need 'r' parameter - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; } return true; @@ -54,7 +54,7 @@ bool Cp::CheckAccessTo() !system->HasReadExecAccessToPath(dir_tab) || !system->HasWriteAccess(*dir_tab.back()) ) { - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return false; } @@ -65,14 +65,14 @@ return true; bool Cp::ParseDir() { - const std::wstring & new_dir = request->PostVar(L"to"); - int res = system->dirs.FollowLink(request->dir_tab, new_dir, dir_tab, file); + const std::wstring & new_dir = cur->request->PostVar(L"to"); + int res = system->dirs.FollowLink(cur->request->dir_tab, new_dir, dir_tab, file); if( res == 3 ) - request->status = WINIX_ERR_NO_ROOT_DIR; + cur->request->status = WINIX_ERR_NO_ROOT_DIR; else if( res != 0 && res != 1 ) - request->status = WINIX_ERR_INCORRECT_DIR; + cur->request->status = WINIX_ERR_INCORRECT_DIR; return res == 0 || res == 1; } @@ -94,7 +94,7 @@ bool Cp::CopyStaticFile(const std::wstring & from, const std::wstring & to) else { log << log1 << "Cp: can't copy a file from: " << from << ", to: " << to << logend; - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return false; } } @@ -113,13 +113,13 @@ bool res1, res2, res3, res4, res5; if( !res1 || !res2 || !res3 || !res4 || !res5 ) { - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return; } if( CopyStaticFile(old_path, new_path) ) { - request->status = db->EditFileById(item, item.id); + cur->request->status = db->EditFileById(item, item.id); if( item.has_thumb ) CopyStaticFile(old_path_thumb, new_path_thumb); @@ -142,9 +142,9 @@ void Cp::CopyFile(Item & item, long dst_dir_id) SetNewAttributes(item); item.parent_id = dst_dir_id; - request->status = db->AddItem(item); + cur->request->status = db->AddItem(item); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) { if( item.file_type != WINIX_ITEM_FILETYPE_NONE ) CopyStaticFile(item); @@ -187,8 +187,8 @@ void Cp::Prepare() new_user = -1; new_group = dir_tab.back()->group_id; - if( request->session->puser ) - new_user = request->session->puser->id; + if( cur->session->puser ) + new_user = cur->session->puser->id; loop_checker.clear(); } @@ -261,7 +261,7 @@ long Cp::CopyDirTree(const Item & dir, long dst_dir_id) temp.link_redirect = 0; } - request->status = system->dirs.AddDirectory(temp); + cur->request->status = system->dirs.AddDirectory(temp); loop_checker.push_back(temp.id); // remember the new dir_id because temp can be changed @@ -311,7 +311,7 @@ void Cp::PostCopyFile(Item & item, bool redirect) CopyFileOrSymlink(item, dir_tab.back()->id); - if( request->status == WINIX_ERR_OK && redirect ) + if( cur->request->status == WINIX_ERR_OK && redirect ) system->RedirectTo(item); } @@ -323,7 +323,7 @@ void Cp::PostCopyDirContent(const Item & dir, bool redirect) { if( !file.empty() ) { - request->status = WINIX_ERR_INCORRECT_DIR; + cur->request->status = WINIX_ERR_INCORRECT_DIR; return; } @@ -332,7 +332,7 @@ void Cp::PostCopyDirContent(const Item & dir, bool redirect) CopyDirContentTree(dir, dir_tab.back()->id); - if( request->status == WINIX_ERR_OK && redirect ) + if( cur->request->status == WINIX_ERR_OK && redirect ) system->RedirectTo(dir_tab.back()->id); } @@ -347,7 +347,7 @@ void Cp::PostCopyDir(const Item & dir, bool redirect) long new_dir_id = CopyDirTree(dir, dir_id); - if( new_dir_id != -1 && request->status == WINIX_ERR_OK && redirect ) + if( new_dir_id != -1 && cur->request->status == WINIX_ERR_OK && redirect ) system->RedirectTo(new_dir_id); } @@ -367,20 +367,20 @@ void Cp::MakePost() { Prepare(); - preserve_attr = request->IsPostVar(L"preserveattr"); - remove_defaults = request->IsPostVar(L"removedefaults"); - follow_symlinks = request->IsPostVar(L"followsymlinks"); + preserve_attr = cur->request->IsPostVar(L"preserveattr"); + remove_defaults = cur->request->IsPostVar(L"removedefaults"); + follow_symlinks = cur->request->IsPostVar(L"followsymlinks"); - if( request->is_item ) + if( cur->request->is_item ) { - PostCopyFile(request->item); + PostCopyFile(cur->request->item); } else { - if( request->IsPostVar(L"onlycontent") ) - PostCopyDirContent(*request->dir_tab.back()); + if( cur->request->IsPostVar(L"onlycontent") ) + PostCopyDirContent(*cur->request->dir_tab.back()); else - PostCopyDir(*request->dir_tab.back()); + PostCopyDir(*cur->request->dir_tab.back()); } Clear(); diff --git a/functions/cp.h b/functions/cp.h index 2f7bcb9..309ae7e 100755 --- a/functions/cp.h +++ b/functions/cp.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentcp -#define headerfilecmslucontentcp +#ifndef headerfile_winix_functions_cp +#define headerfile_winix_functions_cp #include "functionbase.h" diff --git a/functions/default.cpp b/functions/default.cpp index a15d7b9..6ce6492 100755 --- a/functions/default.cpp +++ b/functions/default.cpp @@ -22,24 +22,24 @@ Default::Default() bool Default::HasAccess() { - return !request->is_item && system->HasWriteAccess(*request->dir_tab.back()); + return !cur->request->is_item && system->HasWriteAccess(*cur->request->dir_tab.back()); } void Default::MakePost() { - Item & dir = *request->dir_tab.back(); + Item & dir = *cur->request->dir_tab.back(); - dir.link_to = request->PostVar(L"linkto"); - dir.link_redirect = request->IsPostVar(L"makeredirect") ? 1 : 0; + dir.link_to = cur->request->PostVar(L"linkto"); + dir.link_redirect = cur->request->IsPostVar(L"makeredirect") ? 1 : 0; TrimWhite(dir.link_to); // !! dodac sprawdzenie czy link_to jest pusty teraz - request->status = db->EditLinkItem(dir.id, dir.link_to, dir.link_redirect); + cur->request->status = db->EditLinkItem(dir.id, dir.link_to, dir.link_redirect); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) { log << log2 << "Default: changed link_to: " << dir.link_to << ", for dir_id: " << dir.id << logend; system->RedirectToLastDir(); diff --git a/functions/default.h b/functions/default.h index cd90bec..1685086 100755 --- a/functions/default.h +++ b/functions/default.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentdefault -#define headerfilecmslucontentdefault +#ifndef headerfile_winix_functions_default +#define headerfile_winix_functions_default #include "functionbase.h" diff --git a/functions/download.cpp b/functions/download.cpp index 953eec3..c852c67 100755 --- a/functions/download.cpp +++ b/functions/download.cpp @@ -24,28 +24,28 @@ Download::Download() void Download::MakeGet() { // !! moze wywalic to no_item i wszedzie w takich miejscach dac poprostu permission_denied? - if( !request->is_item ) + if( !cur->request->is_item ) { log << log1 << "Content: download function requires an item" << logend; - request->status = WINIX_ERR_NO_ITEM; + cur->request->status = WINIX_ERR_NO_ITEM; return; } - if( !system->HasReadAccess(request->item) || - request->item.file_type == WINIX_ITEM_FILETYPE_NONE || - request->item.file_path.empty() ) + if( !system->HasReadAccess(cur->request->item) || + cur->request->item.file_type == WINIX_ITEM_FILETYPE_NONE || + cur->request->item.file_path.empty() ) { - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return; } - request->send_as_attachment = request->IsParam(L"attachment"); + cur->request->send_as_attachment = cur->request->IsParam(L"attachment"); - if( request->item.has_thumb && request->IsParam(L"thumb") ) - system->MakeFilePath(request->item, request->x_sendfile, true); + if( cur->request->item.has_thumb && cur->request->IsParam(L"thumb") ) + system->MakeFilePath(cur->request->item, cur->request->x_sendfile, true); else - system->MakeFilePath(request->item, request->x_sendfile); + system->MakeFilePath(cur->request->item, cur->request->x_sendfile); } diff --git a/functions/download.h b/functions/download.h index b00c7f3..dbbf2f2 100755 --- a/functions/download.h +++ b/functions/download.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentdownload -#define headerfilecmslucontentdownload +#ifndef headerfile_winix_functions_download +#define headerfile_winix_functions_download #include "functionbase.h" diff --git a/functions/emacs.cpp b/functions/emacs.cpp index d24812c..6c5b0e3 100755 --- a/functions/emacs.cpp +++ b/functions/emacs.cpp @@ -25,7 +25,7 @@ Emacs::Emacs() bool Emacs::HasAccess(const Item & item) { - if( request->session->puser && request->session->puser->super_user ) + if( cur->session->puser && cur->session->puser->super_user ) // super user can use emacs everywhere return true; @@ -35,7 +35,7 @@ bool Emacs::HasAccess(const Item & item) if( !system->mounts.pmount->IsPar(system->mounts.MountParEmacsOn()) ) return true; - if( system->mounts.pmount->IsArg(system->mounts.MountParEmacsOn(), request->dir_tab.size()) ) + if( system->mounts.pmount->IsArg(system->mounts.MountParEmacsOn(), cur->request->dir_tab.size()) ) return true; return false; @@ -45,7 +45,7 @@ return false; bool Emacs::HasAccess() { - return HasAccess(*request->last_item); + return HasAccess(*cur->request->last_item); } @@ -56,16 +56,16 @@ bool Emacs::PostEmacsCheckAbuse(bool adding) { if( !system->rebus.CheckRebus() ) { - request->status = WINIX_ERR_INCORRECT_REBUS; + cur->request->status = WINIX_ERR_INCORRECT_REBUS; return false; } // !! is tested in createthread once functions->CheckGetPostTimes(); - if( request->session->spam_score > 0 ) + if( cur->session->spam_score > 0 ) { - request->status = WINIX_ERR_SPAM; + cur->request->status = WINIX_ERR_SPAM; log << log1 << "Emacs: ignoring due to suspected spamming" << logend; return false; } @@ -109,39 +109,39 @@ return WINIX_NOTIFY_CODE_FILE_ADD; void Emacs::MakePost() { - bool adding = !request->is_item; + bool adding = !cur->request->is_item; if( !adding ) - old_url = request->item.url; + old_url = cur->request->item.url; - functions->ReadItem(request->item, Item::file); + functions->ReadItem(cur->request->item, Item::file); if( adding ) - functions->SetUser(request->item); // set user before checking the rebus + functions->SetUser(cur->request->item); // set user before checking the rebus if( !PostEmacsCheckAbuse(adding) ) return; if( adding ) { - request->is_item = true; // !! moze lepiej nie ustawiac is_item? (bo jak wystapi blad np dodania do bazy danych + cur->request->is_item = true; // !! moze lepiej nie ustawiac is_item? (bo jak wystapi blad np dodania do bazy danych // to formularz edycji zmieni sie z 'dodaj' na 'edytuj' - request->item.privileges = 0644; // !! tymczasowo, bedzie uzyte umask - request->status = system->AddFile(request->item, NotifyCodeAdd()); + cur->request->item.privileges = 0644; // !! tymczasowo, bedzie uzyte umask + cur->request->status = system->AddFile(cur->request->item, NotifyCodeAdd()); } else { - request->status = system->EditFile(request->item, request->item.url != old_url, NotifyCodeEdit()); + cur->request->status = system->EditFile(cur->request->item, cur->request->item.url != old_url, NotifyCodeEdit()); } - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) { PostFunEmacsModifyMountPoint(adding); - functions->CheckSpecialFile(request->item); + functions->CheckSpecialFile(cur->request->item); } else { - log << log1 << "Emacs: error: " << request->status << logend; + log << log1 << "Emacs: error: " << cur->request->status << logend; } } diff --git a/functions/emacs.h b/functions/emacs.h index 474116c..1ef9104 100755 --- a/functions/emacs.h +++ b/functions/emacs.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentemacs -#define headerfilecmslucontentemacs +#ifndef headerfile_winix_functions_emacs +#define headerfile_winix_functions_emacs #include "functionbase.h" diff --git a/functions/functionbase.cpp b/functions/functionbase.cpp index 5e9079c..3de6adf 100755 --- a/functions/functionbase.cpp +++ b/functions/functionbase.cpp @@ -33,12 +33,13 @@ void FunctionBase::SetConfig(Config * pconfig) } -void FunctionBase::SetRequest(Request * prequest) +void FunctionBase::SetCur(Cur * pcur) { - request = prequest; + cur = pcur; } + void FunctionBase::SetDb(Db * pdb) { db = pdb; diff --git a/functions/functionbase.h b/functions/functionbase.h index dcb30f0..93f7533 100755 --- a/functions/functionbase.h +++ b/functions/functionbase.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentfunctionbase -#define headerfilecmslucontentfunctionbase +#ifndef headerfile_winix_functions_functionbase +#define headerfile_winix_functions_functionbase #include #include @@ -51,7 +51,7 @@ public: virtual void MakeGet(); void SetConfig(Config * pconfig); - void SetRequest(Request * prequest); + void SetCur(Cur * pcur); void SetDb(Db * pdb); void SetSystem(System * psystem); void SetFunctions(Functions * pfunctions); @@ -60,13 +60,13 @@ public: protected: - Config * config; - Request * request; - Db * db; - System * system; + Config * config; + Cur * cur; + Db * db; + System * system; Functions * functions; Templates * templates; - Synchro * synchro; + Synchro * synchro; }; diff --git a/functions/functionparser.cpp b/functions/functionparser.cpp index f92cf1f..8729ece 100755 --- a/functions/functionparser.cpp +++ b/functions/functionparser.cpp @@ -17,7 +17,7 @@ void FunctionParser::SkipEmptyString(const char * msg) { - for( ; get_index != get_tab_len && request->get_tab[get_index].empty() ; ++get_index ) + for( ; get_index != get_tab_len && cur->request->get_tab[get_index].empty() ; ++get_index ) log << log3 << msg << logend; } @@ -31,14 +31,14 @@ void FunctionParser::ParseDirectories() if( !pdir ) { // there is no the root dir - request->status = WINIX_ERR_NO_ROOT_DIR; + cur->request->status = WINIX_ERR_NO_ROOT_DIR; return; } while( true ) { - request->dir_tab.push_back( pdir ); + cur->request->dir_tab.push_back( pdir ); log << log3 << "FP: Directory: "; if( pdir->parent_id == -1 ) @@ -51,7 +51,7 @@ void FunctionParser::ParseDirectories() if( get_index == get_tab_len ) break; - pdir = system->dirs.GetDir(request->get_tab[get_index], pdir->id); + pdir = system->dirs.GetDir(cur->request->get_tab[get_index], pdir->id); if( !pdir ) break; @@ -59,7 +59,7 @@ void FunctionParser::ParseDirectories() ++get_index; } - request->last_item = request->dir_tab.back(); + cur->request->last_item = cur->request->dir_tab.back(); } @@ -71,26 +71,26 @@ void FunctionParser::ParseItem() if( get_index == get_tab_len ) return; - // request->dir_tab has at least one element - long parent_id = request->dir_tab.back()->id; - const std::wstring & url = request->get_tab[get_index]; + // cur->request->dir_tab has at least one element + long parent_id = cur->request->dir_tab.back()->id; + const std::wstring & url = cur->request->get_tab[get_index]; - request->status = db->GetItem(parent_id, url, request->item); + cur->request->status = db->GetItem(parent_id, url, cur->request->item); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) { - request->last_item = &request->item; + cur->request->last_item = &cur->request->item; - if( request->role == Request::authorizer && request->item.file_type == WINIX_ITEM_FILETYPE_NONE ) + if( cur->request->role == Request::authorizer && cur->request->item.file_type == WINIX_ITEM_FILETYPE_NONE ) { log << log1 << "FP: item.url: " << url << " exists but has not a static content (authorizer role)" << logend; - request->status = WINIX_ERR_NO_ITEM; + cur->request->status = WINIX_ERR_NO_ITEM; return; } ++get_index; - request->is_item = true; - log << log3 << "FP: Item: id: " << request->item.id << ", url: " << request->item.url << logend; + cur->request->is_item = true; + log << log3 << "FP: Item: id: " << cur->request->item.id << ", url: " << cur->request->item.url << logend; } else { @@ -107,13 +107,13 @@ void FunctionParser::ParseFunction() if( get_index == get_tab_len ) return; - request->function = functions->Find(request->get_tab[get_index]); + cur->request->function = functions->Find(cur->request->get_tab[get_index]); - if( request->function ) + if( cur->request->function ) { ++get_index; - log << log3 << "FP: Function: " << request->function->fun.url << logend; + log << log3 << "FP: Function: " << cur->request->function->fun.url << logend; } } @@ -144,7 +144,7 @@ size_t i; param.value = par.substr(i+1); } - request->param_tab.push_back(param); + cur->request->param_tab.push_back(param); log << log3 << "FP: Param: name=" << param.name; @@ -165,45 +165,45 @@ void FunctionParser::ParseParams() if( get_index == get_tab_len ) break; - ParseParams(request->get_tab[get_index]); + ParseParams(cur->request->get_tab[get_index]); } } -void FunctionParser::Parse(Request * prequest, Db * pdb, Functions * pfunctions, System * psystem) +void FunctionParser::Parse(Cur * pcur, Db * pdb, Functions * pfunctions, System * psystem) { - request = prequest; db = pdb; - functions = pfunctions; + cur = pcur; system = psystem; + functions = pfunctions; - request->status = WINIX_ERR_OK; + cur->request->status = WINIX_ERR_OK; get_index = 0; - get_tab_len = request->get_tab.size(); - request->function = 0; - request->is_item = false; + get_tab_len = cur->request->get_tab.size(); + cur->request->function = 0; + cur->request->is_item = false; ParseDirectories(); - if( request->status != WINIX_ERR_OK ) + if( cur->request->status != WINIX_ERR_OK ) return; ParseFunction(); - if( !request->function ) + if( !cur->request->function ) { ParseItem(); - if( request->status != WINIX_ERR_OK ) + if( cur->request->status != WINIX_ERR_OK ) return; ParseFunction(); - if( !request->function && get_index != get_tab_len ) + if( !cur->request->function && get_index != get_tab_len ) { - request->status = WINIX_ERR_NO_FUNCTION; - log << log3 << "FP: Parse: unknown function: \"" << request->get_tab[get_index] << "\"" << logend; + cur->request->status = WINIX_ERR_NO_FUNCTION; + log << log3 << "FP: Parse: unknown function: \"" << cur->request->get_tab[get_index] << "\"" << logend; return; } } diff --git a/functions/functionparser.h b/functions/functionparser.h index 6b07dad..b1fac31 100755 --- a/functions/functionparser.h +++ b/functions/functionparser.h @@ -7,11 +7,11 @@ * */ -#ifndef headerfilecmslucorefunctionparser -#define headerfilecmslucorefunctionparser +#ifndef headerfile_winix_functions_functionparser +#define headerfile_winix_functions_functionparser -#include "core/request.h" #include "db/db.h" +#include "core/cur.h" #include "core/system.h" @@ -21,10 +21,10 @@ class Functions; class FunctionParser { - Request * request; Db * db; - Functions * functions; + Cur * cur; System * system; + Functions * functions; GetTab::size_type get_index; GetTab::size_type get_tab_len; @@ -40,7 +40,7 @@ class FunctionParser public: - void Parse(Request * prequest, Db * pdb, Functions * pfunctions, System * psystem); + void Parse(Cur * pcur, Db * pdb, Functions * pfunctions, System * psystem); }; diff --git a/functions/functions.cpp b/functions/functions.cpp index 0b61469..29eab14 100755 --- a/functions/functions.cpp +++ b/functions/functions.cpp @@ -21,12 +21,13 @@ void Functions::SetConfig(Config * pconfig) } -void Functions::SetRequest(Request * prequest) +void Functions::SetCur(Cur * pcur) { - request = prequest; + cur = pcur; } + void Functions::SetDb(Db * pdb) { db = pdb; @@ -135,7 +136,7 @@ return WINIX_NOTHING_TO_DO; void Functions::SetObjects(FunctionBase * fun) { fun->SetConfig(config); - fun->SetRequest(request); + fun->SetCur(cur); fun->SetDb(db); fun->SetSystem(system); fun->SetFunctions(this); @@ -224,22 +225,22 @@ void Functions::Init() void Functions::Parse() { - function_parser.Parse(request, db, this, system); + function_parser.Parse(cur, db, this, system); } void Functions::SetDefaultFunctionForFile() { - if( request->item.file_type != WINIX_ITEM_FILETYPE_NONE ) - request->function = &fun_download; + if( cur->request->item.file_type != WINIX_ITEM_FILETYPE_NONE ) + cur->request->function = &fun_download; else - if( system->HasReadExecAccess(request->item) ) - request->function = &fun_run; + if( system->HasReadExecAccess(cur->request->item) ) + cur->request->function = &fun_run; else - request->function = &fun_cat; + cur->request->function = &fun_cat; - log << log3 << "Functions: default function: " << request->function->fun.url << logend; + log << log3 << "Functions: default function: " << cur->request->function->fun.url << logend; } @@ -249,30 +250,30 @@ void Functions::SetDefaultFunctionForDir() { // !! nie potrzebne // if( system->mounts.pmount->type == system->mounts.MountTypeThread() ) -// request->function = &fun_thread; +// cur->request->function = &fun_thread; // else - request->function = &fun_ls; + cur->request->function = &fun_ls; - log << log3 << "Functions: default function: " << request->function->fun.url << logend; + log << log3 << "Functions: default function: " << cur->request->function->fun.url << logend; } void Functions::SetDefaultFunction() { - request->function = 0; + cur->request->function = 0; plugin.Call(WINIX_SELECT_DEFAULT_FUNCTION); - if( request->function ) + if( cur->request->function ) { - log << log3 << "Functions: default function: " << request->function->fun.url + log << log3 << "Functions: default function: " << cur->request->function->fun.url << " (set by a plugin)" << logend; return; } - if( request->is_item ) + if( cur->request->is_item ) SetDefaultFunctionForFile(); else SetDefaultFunctionForDir(); @@ -288,13 +289,13 @@ void Functions::CheckFunctionFollowDir(bool was_default_function) if( was_default_function ) { - if( request->dir_tab.back()->link_redirect == 1 ) + if( cur->request->dir_tab.back()->link_redirect == 1 ) { - system->RedirectTo(request->dir_tab.back()->link_to); + system->RedirectTo(cur->request->dir_tab.back()->link_to); } else { - if( system->FollowAllLinks(request->dir_tab.back()->link_to, true, true) ) + if( system->FollowAllLinks(cur->request->dir_tab.back()->link_to, true, true) ) SetDefaultFunction(); } } @@ -304,25 +305,25 @@ void Functions::CheckFunctionFollowDir(bool was_default_function) void Functions::CheckFunctionFollowSymlink(bool was_default_function) { - if( request->item.link_redirect == 1 ) + if( cur->request->item.link_redirect == 1 ) { if( was_default_function ) - system->RedirectTo(request->item.link_to); + system->RedirectTo(cur->request->item.link_to); else - system->RedirectWithFunctionAndParamsTo(request->item.link_to); + system->RedirectWithFunctionAndParamsTo(cur->request->item.link_to); } else - if( system->FollowAllLinks(request->item.link_to, true, true) ) + if( system->FollowAllLinks(cur->request->item.link_to, true, true) ) { if( was_default_function ) SetDefaultFunction(); - if( request->status == WINIX_ERR_OK && !request->redirect_to.empty() && !was_default_function && request->function ) + if( cur->request->status == WINIX_ERR_OK && !cur->request->redirect_to.empty() && !was_default_function && cur->request->function ) { // !! nie jestem pewny dodania tej nowej funkcji do redirecta... (sprawdzic to) - request->redirect_to += '/'; - request->redirect_to += request->function->fun.url; - system->AddParams(request->param_tab, request->redirect_to, false); + cur->request->redirect_to += '/'; + cur->request->redirect_to += cur->request->function->fun.url; + system->AddParams(cur->request->param_tab, cur->request->redirect_to, false); } } } @@ -334,19 +335,19 @@ void Functions::CheckFunctionAndSymlink() { bool was_default_function = false; - if( !request->function || request->function == &fun_special_default ) + if( !cur->request->function || cur->request->function == &fun_special_default ) { was_default_function = true; SetDefaultFunction(); } - if( request->status != WINIX_ERR_OK || !request->redirect_to.empty() ) + if( cur->request->status != WINIX_ERR_OK || !cur->request->redirect_to.empty() ) return; - if( !request->is_item && !request->dir_tab.back()->link_to.empty() ) + if( !cur->request->is_item && !cur->request->dir_tab.back()->link_to.empty() ) CheckFunctionFollowDir(was_default_function); else - if( request->is_item && request->item.type == Item::symlink && request->function && request->function->follow_symlinks ) + if( cur->request->is_item && cur->request->item.type == Item::symlink && cur->request->function && cur->request->function->follow_symlinks ) CheckFunctionFollowSymlink(was_default_function); } @@ -354,38 +355,38 @@ bool was_default_function = false; void Functions::MakeFunction() { - if( !request->function ) + if( !cur->request->function ) { - request->status = WINIX_ERR_NO_FUNCTION; + cur->request->status = WINIX_ERR_NO_FUNCTION; log << log1 << "Functions: no function (neither cat nor ls)" << logend; return; } if( !system->DirsHaveReadExecPerm() || - !system->HasReadExecAccess(request->function->fun) || - !request->function->HasAccess() ) + !system->HasReadExecAccess(cur->request->function->fun) || + !cur->request->function->HasAccess() ) { - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return; } - if( request->method == Request::get ) + if( cur->request->method == Request::get ) { - if( request->redirect_to.empty() ) - request->function->MakeGet(); + if( cur->request->redirect_to.empty() ) + cur->request->function->MakeGet(); } else - if( request->method == Request::post ) + if( cur->request->method == Request::post ) { // we don't use post with redirecting (the post variables would be lost) - if( request->redirect_to.empty() ) - request->function->MakePost(); + if( cur->request->redirect_to.empty() ) + cur->request->function->MakePost(); else - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; } else - if( request->method == Request::head ) + if( cur->request->method == Request::head ) { // do nothing } @@ -401,19 +402,19 @@ void Functions::CheckGetPostTimes(time_t difference) { time_t now = std::time(0); - if( request->session->puser ) + if( cur->session->puser ) return; - if( request->method != Request::post ) + if( cur->request->method != Request::post ) return; - if( now - request->session->last_time_get >= (time_t)difference ) + if( now - cur->session->last_time_get >= (time_t)difference ) return; - if( request->AllPostVarEmpty() ) + if( cur->request->AllPostVarEmpty() ) return; - request->session->spam_score += 1; + cur->session->spam_score += 1; log << log1 << "Functions: spam +1: POST after GET sent too fast" << logend; } @@ -424,15 +425,15 @@ bool Functions::CheckAbuse() { if( !system->rebus.CheckRebus() ) { - request->status = WINIX_ERR_INCORRECT_REBUS; + cur->request->status = WINIX_ERR_INCORRECT_REBUS; return true; } CheckGetPostTimes(); - if( request->session->spam_score > 0 ) + if( cur->session->spam_score > 0 ) { - request->status = WINIX_ERR_SPAM; + cur->request->status = WINIX_ERR_SPAM; log << log1 << "Functions: ignoring due to suspected spamming" << logend; return true; } @@ -446,17 +447,17 @@ return false; // returning true if the 'url' has to be changed void Functions::ReadItemUrlSubject(Item & item, Item::Type item_type) { - std::wstring * new_subject = request->PostVarp(L"subject"); - std::wstring * new_url = request->PostVarp(L"url"); + std::wstring * new_subject = cur->request->PostVarp(L"subject"); + std::wstring * new_url = cur->request->PostVarp(L"url"); if( new_subject ) item.subject = *new_subject; if( item.subject.empty() ) { - item.subject = request->dir_tab.back()->subject; + item.subject = cur->request->dir_tab.back()->subject; item.subject += L"_msg_"; - Toa(db->Size(request->dir_tab.back()->id, Item::file), item.subject, 10, false); + Toa(db->Size(cur->request->dir_tab.back()->id, Item::file), item.subject, 10, false); } if( new_url ) @@ -475,13 +476,13 @@ void Functions::ReadItemFilterHtml(Item & item) html_filter.CheckOrphans(HTMLFilter::lang_none); html_filter.SafeMode(true); - html_filter.Filter(request->PostVar(L"itemcontent"), item.content); + html_filter.Filter(cur->request->PostVar(L"itemcontent"), item.content); } void Functions::ReadItemContent(Item & item, const std::wstring & content_type) { - bool is_root = request->session->puser && request->session->puser->super_user; + bool is_root = cur->session->puser && cur->session->puser->super_user; bool filter_html = (content_type == L"2") && config->editors_html_safe_mode; if( filter_html && is_root && config->editors_html_safe_mode_skip_root ) @@ -490,14 +491,14 @@ void Functions::ReadItemContent(Item & item, const std::wstring & content_type) if( filter_html ) ReadItemFilterHtml(item); else - request->PostVar(L"itemcontent", item.content); + cur->request->PostVar(L"itemcontent", item.content); } void Functions::ReadItemContentWithType(Item & item) { item.content_type = Item::ct_formatted_text; // default is formatted text - request->PostVar(L"contenttype", temp); + cur->request->PostVar(L"contenttype", temp); ReadItemContent(item, temp); @@ -513,10 +514,10 @@ void Functions::ReadItemContentWithType(Item & item) // those below need special privileges - if( !request->session->puser ) + if( !cur->session->puser ) return; - long user_id = request->session->puser->id; + long user_id = cur->session->puser->id; if( temp == L"2" ) @@ -551,7 +552,7 @@ void Functions::ReadItem(Item & item, Item::Type item_type) return; item.type = item_type; - item.parent_id = request->dir_tab.back()->id; // !! moze to dac jako parametr? + item.parent_id = cur->request->dir_tab.back()->id; // !! moze to dac jako parametr? ReadItemUrlSubject(item, item_type); @@ -562,16 +563,16 @@ void Functions::ReadItem(Item & item, Item::Type item_type) void Functions::SetUser(Item & item) { - if( request->session && request->session->puser ) + if( cur->session && cur->session->puser ) { - item.user_id = request->session->puser->id; + item.user_id = cur->session->puser->id; item.guest_name.clear(); } else { item.user_id = -1; - request->PostVar(L"guestname", item.guest_name); + cur->request->PostVar(L"guestname", item.guest_name); } - item.group_id = request->dir_tab.back()->group_id; + item.group_id = cur->request->dir_tab.back()->group_id; } diff --git a/functions/functions.h b/functions/functions.h index ba35226..bb811fb 100755 --- a/functions/functions.h +++ b/functions/functions.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentfunctions -#define headerfilecmslucontentfunctions +#ifndef headerfile_winix_functions_functions +#define headerfile_winix_functions_functions #include #include "functionbase.h" @@ -102,7 +102,7 @@ public: void SetConfig(Config * pconfig); - void SetRequest(Request * prequest); + void SetCur(Cur * pcur); void SetDb(Db * pdb); void SetSystem(System * psystem); void SetTemplates(Templates * ptemplates); @@ -136,7 +136,7 @@ public: private: Config * config; - Request * request; + Cur * cur; Db * db; System * system; Synchro * synchro; diff --git a/functions/last.h b/functions/last.h index 5028a89..1242cb7 100755 --- a/functions/last.h +++ b/functions/last.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentlast -#define headerfilecmslucontentlast +#ifndef headerfile_winix_functions_last +#define headerfile_winix_functions_last #include "functionbase.h" diff --git a/functions/ln.cpp b/functions/ln.cpp index a7760e1..7735e74 100755 --- a/functions/ln.cpp +++ b/functions/ln.cpp @@ -25,7 +25,7 @@ Ln::Ln() bool Ln::HasAccess() { - return system->HasWriteAccess(*request->dir_tab.back()); + return system->HasWriteAccess(*cur->request->dir_tab.back()); } @@ -33,53 +33,53 @@ void Ln::CreateSymbolicLink(const std::wstring & link_to) { item.Clear(); // setting the date to now item.type = Item::symlink; - item.parent_id = request->dir_tab.back()->id; - item.url = request->PostVar(L"url"); + item.parent_id = cur->request->dir_tab.back()->id; + item.url = cur->request->PostVar(L"url"); item.link_to = link_to; - item.link_redirect = request->IsPostVar(L"makeredirect") ? 1 : 0; + item.link_redirect = cur->request->IsPostVar(L"makeredirect") ? 1 : 0; item.privileges = 0644; // !! tymczasowo, bedzie uzyte umask functions->SetUser(item); functions->PrepareUrl(item); - request->status = db->AddItem(item); + cur->request->status = db->AddItem(item); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) log << log3 << "Ln: created a symbolic link to: " << link_to << logend; } void Ln::CreateHardLink(const std::wstring & link_to) { - int res = system->FollowAllLinks(request->dir_tab, link_to, dir_tab, item, false, false); + int res = system->FollowAllLinks(cur->request->dir_tab, link_to, dir_tab, item, false, false); if( res == 0 ) { log << log2 << "Ln: " << link_to << " is a directory (can't create a hard link)" << logend; - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; } else if( res == 1 ) { item.SetDateToNow(); item.type = Item::file; - item.parent_id = request->dir_tab.back()->id; - item.url = request->PostVar(L"url"); + item.parent_id = cur->request->dir_tab.back()->id; + item.url = cur->request->PostVar(L"url"); item.privileges = 0644; // !! tymczasowo, bedzie uzyte umask functions->SetUser(item); functions->PrepareUrl(item); - request->status = db->AddHardLink(item); + cur->request->status = db->AddHardLink(item); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) log << log3 << "Ln: created a hard link to: " << link_to << logend; } else if( res == 5 || res == 6 ) { - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; } else { - request->status = WINIX_ERR_NO_ITEM; + cur->request->status = WINIX_ERR_NO_ITEM; } } @@ -88,20 +88,20 @@ void Ln::CreateHardLink(const std::wstring & link_to) // we do not use notifications for links void Ln::MakePost() { - link_to = request->PostVar(L"linkto"); + link_to = cur->request->PostVar(L"linkto"); TrimWhite(link_to); if( link_to.empty() ) return; - int type = Toi(request->PostVar(L"linktype")); + int type = Toi(cur->request->PostVar(L"linktype")); if( type == 0 ) CreateHardLink(link_to); else CreateSymbolicLink(link_to); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) system->RedirectTo(item); } diff --git a/functions/ln.h b/functions/ln.h index ef88bdc..6944bcb 100755 --- a/functions/ln.h +++ b/functions/ln.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentln -#define headerfilecmslucontentln +#ifndef headerfile_winix_functions_ln +#define headerfile_winix_functions_ln #include "functionbase.h" diff --git a/functions/login.cpp b/functions/login.cpp index 695dc55..98a28da 100755 --- a/functions/login.cpp +++ b/functions/login.cpp @@ -22,15 +22,15 @@ Login::Login() void Login::MakePost() { - if( request->session->id == 0 ) + if( cur->session->id == 0 ) { log << log1 << "Login: can't login in a temporary session (skipped)" << logend; return; } - const std::wstring & login = request->PostVar(L"login"); - const std::wstring & pass = request->PostVar(L"password"); - const std::wstring & remem = request->PostVar(L"rememberme"); + const std::wstring & login = cur->request->PostVar(L"login"); + const std::wstring & pass = cur->request->PostVar(L"password"); + const std::wstring & remem = cur->request->PostVar(L"rememberme"); long user_id; if( db->CheckUser(login, pass, user_id) ) diff --git a/functions/login.h b/functions/login.h index adc41d3..11d9fc7 100755 --- a/functions/login.h +++ b/functions/login.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentlogin -#define headerfilecmslucontentlogin +#ifndef headerfile_winix_functions_login +#define headerfile_winix_functions_login #include "functionbase.h" diff --git a/functions/logout.h b/functions/logout.h index fbf5835..7a84e9c 100755 --- a/functions/logout.h +++ b/functions/logout.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentlogout -#define headerfilecmslucontentlogout +#ifndef headerfile_winix_functions_logout +#define headerfile_winix_functions_logout #include "functionbase.h" diff --git a/functions/ls.cpp b/functions/ls.cpp index 02277fd..94b4ff0 100755 --- a/functions/ls.cpp +++ b/functions/ls.cpp @@ -23,23 +23,23 @@ Ls::Ls() void Ls::MakeGet() { - if( !request->is_item ) + if( !cur->request->is_item ) { DbItemQuery iq; iq.sel_content = false; - iq.WhereParentId(request->dir_tab.back()->id); + iq.WhereParentId(cur->request->dir_tab.back()->id); iq.WhereType(Item::dir, false); - if( request->IsParam(L"ckeditor_browse") ) + if( cur->request->IsParam(L"ckeditor_browse") ) { iq.WhereFileType(WINIX_ITEM_FILETYPE_IMAGE); - db->GetItems(request->item_tab, iq); + db->GetItems(cur->request->item_tab, iq); } else { - db->GetItems(request->item_tab, iq); + db->GetItems(cur->request->item_tab, iq); } } } diff --git a/functions/ls.h b/functions/ls.h index 7edab83..7d66599 100755 --- a/functions/ls.h +++ b/functions/ls.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentls -#define headerfilecmslucontentls +#ifndef headerfile_winix_functions_ls +#define headerfile_winix_functions_ls #include "functionbase.h" diff --git a/functions/mkdir.cpp b/functions/mkdir.cpp index defc9a8..cb23306 100755 --- a/functions/mkdir.cpp +++ b/functions/mkdir.cpp @@ -30,7 +30,7 @@ bool Mkdir::HasAccess(const Item & item) if( item.type != Item::dir ) return false; - if( request->session->puser && request->session->puser->super_user ) + if( cur->session->puser && cur->session->puser->super_user ) // super user can use mkdir everywhere return true; @@ -40,7 +40,7 @@ bool Mkdir::HasAccess(const Item & item) if( !system->mounts.pmount->IsPar(system->mounts.MountParMkdirOn()) ) return true; - if( system->mounts.pmount->IsArg(system->mounts.MountParMkdirOn(), request->dir_tab.size()) ) + if( system->mounts.pmount->IsArg(system->mounts.MountParMkdirOn(), cur->request->dir_tab.size()) ) return true; return false; @@ -49,7 +49,7 @@ return false; bool Mkdir::HasAccess() { - if( request->is_item || !HasAccess(*request->dir_tab.back()) ) + if( cur->request->is_item || !HasAccess(*cur->request->dir_tab.back()) ) return false; return true; @@ -60,19 +60,19 @@ return true; void Mkdir::PostFunMkdir(bool add_to_dir_tab, int privileges) { - functions->ReadItem(request->item, Item::dir); - functions->SetUser(request->item); - request->item.privileges = privileges; + functions->ReadItem(cur->request->item, Item::dir); + functions->SetUser(cur->request->item); + cur->request->item.privileges = privileges; - request->status = system->dirs.AddDirectory(request->item, add_to_dir_tab); + cur->request->status = system->dirs.AddDirectory(cur->request->item, add_to_dir_tab); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) { - system->RedirectTo(request->item); + system->RedirectTo(cur->request->item); } else { - log << log1 << "Content: PostFunMkdir: Error: " << request->status << logend; + log << log1 << "Content: PostFunMkdir: Error: " << cur->request->status << logend; } } diff --git a/functions/mkdir.h b/functions/mkdir.h index d4d90ec..b36809a 100755 --- a/functions/mkdir.h +++ b/functions/mkdir.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentmkdir -#define headerfilecmslucontentmkdir +#ifndef headerfile_winix_functions_mkdir +#define headerfile_winix_functions_mkdir #include "functionbase.h" diff --git a/functions/mv.cpp b/functions/mv.cpp index c3c6521..a295e92 100755 --- a/functions/mv.cpp +++ b/functions/mv.cpp @@ -35,15 +35,15 @@ Item * last; Item * last_but_one = 0; size_t dir_tab_size; - last = request->dir_tab.back(); - dir_tab_size = request->dir_tab.size(); + last = cur->request->dir_tab.back(); + dir_tab_size = cur->request->dir_tab.size(); if( dir_tab_size <= 1 ) return false; // you cannot move the root directory - last_but_one = request->dir_tab[dir_tab_size - 2]; + last_but_one = cur->request->dir_tab[dir_tab_size - 2]; - if( request->method != Request::post ) + if( cur->request->method != Request::post ) { // used in GET or HEAD // we don't now whether we move the last directory or the last but one @@ -56,7 +56,7 @@ size_t dir_tab_size; { // used in POST when the moving is performed - if( request->IsPostVar(L"onlycontent") ) + if( cur->request->IsPostVar(L"onlycontent") ) return system->HasWriteAccess(*last); else return system->HasWriteAccess(*last_but_one); @@ -70,13 +70,13 @@ return true; bool Mv::CheckAccessFrom() { - if( request->is_item ) + if( cur->request->is_item ) { // moving a file - if( !system->HasWriteAccess(*request->dir_tab.back()) ) + if( !system->HasWriteAccess(*cur->request->dir_tab.back()) ) { - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return false; } } @@ -84,7 +84,7 @@ bool Mv::CheckAccessFrom() { if( !CheckAccessFromToDir() ) { - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return false; } } @@ -99,7 +99,7 @@ bool Mv::CheckAccessTo() !system->HasReadExecAccessToPath(dir_tab) || !system->HasWriteAccess(*dir_tab.back()) ) { - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return false; } @@ -112,14 +112,14 @@ return true; bool Mv::ParseDir() { - const std::wstring & new_dir = request->PostVar(L"to"); - int res = system->dirs.FollowLink(request->dir_tab, new_dir, dir_tab, file); + const std::wstring & new_dir = cur->request->PostVar(L"to"); + int res = system->dirs.FollowLink(cur->request->dir_tab, new_dir, dir_tab, file); if( res == 3 ) - request->status = WINIX_ERR_NO_ROOT_DIR; + cur->request->status = WINIX_ERR_NO_ROOT_DIR; else if( res != 0 && res != 1 ) - request->status = WINIX_ERR_INCORRECT_DIR; + cur->request->status = WINIX_ERR_INCORRECT_DIR; return res == 0 || res == 1; } @@ -142,7 +142,7 @@ bool Mv::MoveStaticFile(const std::wstring & from, const std::wstring & to) else { log << log1 << "Mv: can't move a file from: " << from << ", to: " << to << logend; - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return false; } } @@ -161,13 +161,13 @@ bool res1, res2, res3, res4, res5; if( !res1 || !res2 || !res3 || !res4 || !res5 ) { - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return; } if( MoveStaticFile(old_path, new_path) ) { - request->status = db->EditFileById(item, item.id); + cur->request->status = db->EditFileById(item, item.id); if( item.has_thumb ) MoveStaticFile(old_path_thumb, new_path_thumb); @@ -189,9 +189,9 @@ void Mv::MoveFileOrSymlink(Item & item) } item.parent_id = dir_tab.back()->id; - request->status = db->EditParentUrlById(item, item.id); + cur->request->status = db->EditParentUrlById(item, item.id); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) { if( item.type == Item::file ) log << log3 << "Mv: file: "; @@ -280,13 +280,13 @@ void Mv::MoveDir(Item & dir) if( dst_dir_id == dir.id || system->dirs.HasParent(dst_dir_id, dir.id) ) { log << log1 << "Mv: cannot move directory to inside it" << logend; - request->status = WINIX_ERR_INCORRECT_DIR; + cur->request->status = WINIX_ERR_INCORRECT_DIR; return; } if( !system->dirs.ChangeParent(dir.id, dst_dir_id) ) { - request->status = WINIX_ERR_INCORRECT_DIR; + cur->request->status = WINIX_ERR_INCORRECT_DIR; return; } @@ -299,9 +299,9 @@ void Mv::MoveDir(Item & dir) file.clear(); } - request->status = db->EditParentUrlById(dir, dir.id); + cur->request->status = db->EditParentUrlById(dir, dir.id); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) { log << log3 << "Mv: directory: " << old_url << " was moved to: "; system->dirs.LogDir(dir_tab); @@ -334,13 +334,13 @@ return false; void Mv::PostMoveFile() { - if( IsTheSameFile(request->item) ) + if( IsTheSameFile(cur->request->item) ) return; - MoveFileOrSymlink(request->item); + MoveFileOrSymlink(cur->request->item); - if( request->status == WINIX_ERR_OK ) - system->RedirectTo(request->item); + if( cur->request->status == WINIX_ERR_OK ) + system->RedirectTo(cur->request->item); } @@ -349,14 +349,14 @@ void Mv::PostMoveDirContent() { if( !file.empty() ) { - request->status = WINIX_ERR_INCORRECT_DIR; + cur->request->status = WINIX_ERR_INCORRECT_DIR; return; } - if( request->dir_tab.back()->id == dir_tab.back()->id ) + if( cur->request->dir_tab.back()->id == dir_tab.back()->id ) return; // nothing to do - MoveDirContent(*request->dir_tab.back()); + MoveDirContent(*cur->request->dir_tab.back()); system->RedirectToLastDir(); } @@ -364,7 +364,7 @@ void Mv::PostMoveDirContent() void Mv::PostMoveDir() { - Item & last_dir = *request->dir_tab.back(); + Item & last_dir = *cur->request->dir_tab.back(); Item & new_dir = *dir_tab.back(); if( file.empty() && new_dir.id == last_dir.id ) @@ -372,7 +372,7 @@ void Mv::PostMoveDir() MoveDir(last_dir); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) system->RedirectToLastDir(); } @@ -387,13 +387,13 @@ void Mv::MakePost() { Prepare(); - if( request->is_item ) + if( cur->request->is_item ) { PostMoveFile(); } else { - if( request->IsPostVar(L"onlycontent") ) + if( cur->request->IsPostVar(L"onlycontent") ) PostMoveDirContent(); else PostMoveDir(); diff --git a/functions/mv.h b/functions/mv.h index 935c378..a18f781 100755 --- a/functions/mv.h +++ b/functions/mv.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentmv -#define headerfilecmslucontentmv +#ifndef headerfile_winix_functions_mv +#define headerfile_winix_functions_mv #include "functionbase.h" diff --git a/functions/node.cpp b/functions/node.cpp index 31ea598..69710f1 100755 --- a/functions/node.cpp +++ b/functions/node.cpp @@ -21,14 +21,14 @@ Node::Node() void Node::MakeGet() { - if( request->param_tab.empty() ) + if( cur->request->param_tab.empty() ) { - //request->status = Error + //cur->request->status = Error //!!zglosic 404 return; } - long id = Tol(request->param_tab[0].name); + long id = Tol(cur->request->param_tab[0].name); system->RedirectTo(id); } diff --git a/functions/node.h b/functions/node.h index fdaf4c9..93c79ae 100755 --- a/functions/node.h +++ b/functions/node.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentnode -#define headerfilecmslucontentnode +#ifndef headerfile_winix_functions_node +#define headerfile_winix_functions_node #include "functionbase.h" diff --git a/functions/priv.cpp b/functions/priv.cpp index 05f6388..d6923db 100755 --- a/functions/priv.cpp +++ b/functions/priv.cpp @@ -23,7 +23,7 @@ Priv::Priv() void Priv::MakePost() { - priv_changer.SetRequest(request); + priv_changer.SetCur(cur); priv_changer.SetSystem(system); priv_changer.SetDb(db); @@ -33,7 +33,7 @@ void Priv::MakePost() void Priv::MakeGet() { - priv_changer.SetRequest(request); + priv_changer.SetCur(cur); priv_changer.SetSystem(system); priv_changer.SetDb(db); diff --git a/functions/priv.h b/functions/priv.h index 61e4471..ea7d73e 100755 --- a/functions/priv.h +++ b/functions/priv.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentpriv -#define headerfilecmslucontentpriv +#ifndef headerfile_winix_functions_priv +#define headerfile_winix_functions_priv #include "functionbase.h" #include "privchanger.h" diff --git a/functions/privchanger.cpp b/functions/privchanger.cpp index 99fe8ca..aabbf67 100755 --- a/functions/privchanger.cpp +++ b/functions/privchanger.cpp @@ -10,9 +10,9 @@ #include "privchanger.h" -void PrivChanger::SetRequest(Request * prequest) +void PrivChanger::SetCur(Cur * pcur) { - request = prequest; + cur = pcur; } @@ -34,9 +34,9 @@ bool PrivChanger::CheckAccess() // but we cannot use parameter 'r' on files // and only logged users can change permissions - if( !request->session->puser || (request->is_item && request->IsParam(L"r")) ) + if( !cur->session->puser || (cur->request->is_item && cur->request->IsParam(L"r")) ) { - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return false; } @@ -102,7 +102,7 @@ void PrivChanger::ChangePriv(Item & item, long user_id, long group_id, int privi return; } - request->status = db->EditPrivById(item, item.id); + cur->request->status = db->EditPrivById(item, item.id); } @@ -174,12 +174,12 @@ void PrivChanger::PrivFilesInDir(long parent_id) iq.WhereParentId(parent_id); iq.WhereType(Item::dir, false); - db->GetItems(request->item_tab, iq); + db->GetItems(cur->request->item_tab, iq); - std::vector::iterator i = request->item_tab.begin(); + std::vector::iterator i = cur->request->item_tab.begin(); - for( ; i != request->item_tab.end() ; ++i) + for( ; i != cur->request->item_tab.end() ; ++i) { PrivLog(L"changed file: ", -1, i->url); ChangePriv(*i, user_id_file, group_id_file, priv_file); @@ -210,9 +210,9 @@ void PrivChanger::PrivDir(long parent_id) void PrivChanger::ReadPriv(const wchar_t * user_in, const wchar_t * group_in, const wchar_t * priv_in, long & user_id, long & group_id, int & priv) { - const std::wstring & user_str = request->PostVar(user_in); - const std::wstring & group_str = request->PostVar(group_in); - const std::wstring & priv_str = request->PostVar(priv_in); + const std::wstring & user_str = cur->request->PostVar(user_in); + const std::wstring & group_str = cur->request->PostVar(group_in); + const std::wstring & priv_str = cur->request->PostVar(priv_in); if( change_owner ) { @@ -234,18 +234,18 @@ void PrivChanger::PrivDir() PrivLogStart(L"Content: changes for dirs: ", user_id_dir, group_id_dir, priv_dir); - if( request->IsPostVar(L"changecurrentdir") ) + if( cur->request->IsPostVar(L"changecurrentdir") ) { - Item & last_dir = *request->dir_tab.back(); + Item & last_dir = *cur->request->dir_tab.back(); PrivLog(L"changed dir: ", last_dir.id, last_dir.url); - ChangePriv(*request->dir_tab.back(), user_id_dir, group_id_dir, priv_dir); + ChangePriv(*cur->request->dir_tab.back(), user_id_dir, group_id_dir, priv_dir); } - subdirectories = request->IsPostVar(L"changesubdirs"); + subdirectories = cur->request->IsPostVar(L"changesubdirs"); // go through all directories - PrivDir(request->dir_tab.back()->id); + PrivDir(cur->request->dir_tab.back()->id); system->RedirectToLastDir(); } @@ -258,14 +258,14 @@ void PrivChanger::PrivOneItem() ReadPriv(L"user", L"group", L"privileges", user_id_file, group_id_file, priv_file); PrivLogStart(L"Content: changes: ", user_id_file, group_id_file, priv_file); - if( request->is_item ) + if( cur->request->is_item ) { - ChangePriv(request->item, user_id_file, group_id_file, priv_file); - system->RedirectTo(request->item); + ChangePriv(cur->request->item, user_id_file, group_id_file, priv_file); + system->RedirectTo(cur->request->item); } else { - ChangePriv(*request->dir_tab.back(), user_id_file, group_id_file, priv_file); + ChangePriv(*cur->request->dir_tab.back(), user_id_file, group_id_file, priv_file); system->RedirectToLastDir(); } } @@ -280,7 +280,7 @@ void PrivChanger::Change(bool change_owner_, bool change_priv_) change_owner = change_owner_; change_priv = change_priv_; - if( request->IsParam(L"r") ) + if( cur->request->IsParam(L"r") ) { PrivDir(); } diff --git a/functions/privchanger.h b/functions/privchanger.h index 29f6083..3e31b50 100755 --- a/functions/privchanger.h +++ b/functions/privchanger.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentprivchanger -#define headerfilecmslucontentprivchanger +#ifndef headerfile_winix_functions_privchanger +#define headerfile_winix_functions_privchanger #include "core/request.h" @@ -24,13 +24,13 @@ public: bool CheckAccess(); void Change(bool change_owner_, bool change_priv_); - void SetRequest(Request * prequest); + void SetCur(Cur * pcur); void SetSystem(System * psystem); void SetDb(Db * pdb); private: - Request * request; + Cur * cur; System * system; Db * db; diff --git a/functions/reload.cpp b/functions/reload.cpp index b83b74c..7712fbf 100755 --- a/functions/reload.cpp +++ b/functions/reload.cpp @@ -38,14 +38,14 @@ void Reload::MakeGet() { // !! temporarily only an admin has access - if( !request->session->puser || !request->session->puser->super_user ) + if( !cur->session->puser || !cur->session->puser->super_user ) { log << log1 << "Content: Only an admin has access to reload function" << logend; - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return; } - if( request->IsParam(L"templates") ) + if( cur->request->IsParam(L"templates") ) FunReloadTemplates(); } diff --git a/functions/reload.h b/functions/reload.h index 2c89961..c9118dd 100755 --- a/functions/reload.h +++ b/functions/reload.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentreload -#define headerfilecmslucontentreload +#ifndef headerfile_winix_functions_reload +#define headerfile_winix_functions_reload #include "functionbase.h" diff --git a/functions/rm.cpp b/functions/rm.cpp index 172d634..e7ca693 100755 --- a/functions/rm.cpp +++ b/functions/rm.cpp @@ -31,7 +31,7 @@ bool Rm::HasAccess(const Item & item) { // !! temporarily (we're waiting for the sticky bit to be implemented) // not logged users cannot remove anything - if( !request->session->puser ) + if( !cur->session->puser ) return false; if( item.parent_id == -1 ) @@ -55,7 +55,7 @@ bool Rm::HasAccess(const Item & item) } if( system->mounts.pmount->IsPar(system->mounts.MountParOnlyRootRemove()) ) - if( !request->session->puser || !request->session->puser->super_user ) + if( !cur->session->puser || !cur->session->puser->super_user ) return false; return true; @@ -64,10 +64,10 @@ return true; bool Rm::HasAccess() { - if( !request->is_item ) - return HasAccess(*request->dir_tab.back()); + if( !cur->request->is_item ) + return HasAccess(*cur->request->dir_tab.back()); else - return HasAccess(request->item); + return HasAccess(cur->request->item); return true; } @@ -103,7 +103,7 @@ bool Rm::RemoveStaticFile(const std::wstring & path) else { log << log1 << "Rm: can't remove a file: " << path << logend; - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return false; } } @@ -128,7 +128,7 @@ void Rm::RemoveStaticFile(Item & item) } else { - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; } } @@ -156,7 +156,7 @@ void Rm::RemoveFileOrSymlink(Item & item) } else { - // request->status = WINIX_ERR_NO_ITEM; + // cur->request->status = WINIX_ERR_NO_ITEM; } } @@ -199,7 +199,7 @@ void Rm::RemoveDir(const Item & dir) old_url = dir.url; RemoveDirTree(dir.id); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) log << log3 << "Rm: removed directory " << old_url << logend; } @@ -207,9 +207,9 @@ void Rm::RemoveDir(const Item & dir) void Rm::RemoveFile() { - RemoveFileOrSymlink(request->item); + RemoveFileOrSymlink(cur->request->item); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) system->RedirectToLastDir(); } @@ -217,13 +217,13 @@ void Rm::RemoveFile() void Rm::RemoveDirContent() { - if( !request->IsParam(L"r") ) + if( !cur->request->IsParam(L"r") ) { - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return; } - content_dir_iq.WhereParentId(request->dir_tab.back()->id); + content_dir_iq.WhereParentId(cur->request->dir_tab.back()->id); db->GetItems(item_tab, content_dir_iq); for(size_t i=0 ; istatus == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) system->RedirectToLastDir(); } @@ -242,17 +242,17 @@ void Rm::RemoveDirContent() void Rm::RemoveDir() { - if( !request->IsParam(L"r") || request->dir_tab.size() <= 1 ) + if( !cur->request->IsParam(L"r") || cur->request->dir_tab.size() <= 1 ) { // we cannot remove the root directory (dir_tab.size()==1) - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return; } - RemoveDir(*request->dir_tab.back()); - request->dir_tab.erase(--request->dir_tab.end()); + RemoveDir(*cur->request->dir_tab.back()); + cur->request->dir_tab.erase(--cur->request->dir_tab.end()); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) system->RedirectToLastDir(); } @@ -271,13 +271,13 @@ void Rm::MakePost() { Prepare(); - if( request->is_item ) + if( cur->request->is_item ) { RemoveFile(); } else { - if( request->IsPostVar(L"onlycontent") ) + if( cur->request->IsPostVar(L"onlycontent") ) RemoveDirContent(); else RemoveDir(); diff --git a/functions/rm.h b/functions/rm.h index 8b655b9..5b9ea11 100755 --- a/functions/rm.h +++ b/functions/rm.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentrm -#define headerfilecmslucontentrm +#ifndef headerfile_winix_functions_rm +#define headerfile_winix_functions_rm #include "functionbase.h" diff --git a/functions/run.cpp b/functions/run.cpp index 333b0ba..0d8dee5 100755 --- a/functions/run.cpp +++ b/functions/run.cpp @@ -29,16 +29,16 @@ void Run::MakePost() void Run::MakeGet() { - if( !request->is_item ) + if( !cur->request->is_item ) { log << log1 << "Content: Run function requires an item" << logend; - request->status = WINIX_ERR_NO_ITEM; + cur->request->status = WINIX_ERR_NO_ITEM; return; } - if( !system->HasReadExecAccess(request->item) ) + if( !system->HasReadExecAccess(cur->request->item) ) { - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return; } } diff --git a/functions/run.h b/functions/run.h index 62a5a4c..3cfe6c6 100755 --- a/functions/run.h +++ b/functions/run.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentrun -#define headerfilecmslucontentrun +#ifndef headerfile_winix_functions_run +#define headerfile_winix_functions_run #include "functionbase.h" diff --git a/functions/specialdefault.h b/functions/specialdefault.h index e3ee390..028898a 100755 --- a/functions/specialdefault.h +++ b/functions/specialdefault.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentspecialdefault -#define headerfilecmslucontentspecialdefault +#ifndef headerfile_winix_functions_specialdefault +#define headerfile_winix_functions_specialdefault #include "functionbase.h" diff --git a/functions/stat.h b/functions/stat.h index 27a6a71..527a33c 100755 --- a/functions/stat.h +++ b/functions/stat.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentstat -#define headerfilecmslucontentstat +#ifndef headerfile_winix_functions_stat +#define headerfile_winix_functions_stat #include "functionbase.h" diff --git a/functions/subject.cpp b/functions/subject.cpp index 5516854..c4aa97a 100755 --- a/functions/subject.cpp +++ b/functions/subject.cpp @@ -23,18 +23,18 @@ Subject::Subject() bool Subject::SubjectCheckAccess() { // super user can always - if( request->session->puser && request->session->puser->super_user ) + if( cur->session->puser && cur->session->puser->super_user ) return true; bool access; - if( request->is_item ) - access = system->HasWriteAccess(request->item); + if( cur->request->is_item ) + access = system->HasWriteAccess(cur->request->item); else - access = system->HasWriteAccess(*request->dir_tab.back()); + access = system->HasWriteAccess(*cur->request->dir_tab.back()); if( !access ) - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return access; } @@ -43,9 +43,9 @@ return access; void Subject::EditDirSubject() { - Item & dir = *request->dir_tab.back(); + Item & dir = *cur->request->dir_tab.back(); - request->PostVar(L"subject", dir.subject); + cur->request->PostVar(L"subject", dir.subject); db->EditSubjectById(dir, dir.id); system->RedirectToLastDir(); @@ -55,10 +55,10 @@ void Subject::EditDirSubject() void Subject::EditFileSubject() { - request->PostVar(L"subject", request->item.subject); - db->EditSubjectById(request->item, request->item.id); + cur->request->PostVar(L"subject", cur->request->item.subject); + db->EditSubjectById(cur->request->item, cur->request->item.id); - system->RedirectTo(request->item); + system->RedirectTo(cur->request->item); } @@ -69,7 +69,7 @@ void Subject::MakePost() if( !SubjectCheckAccess() ) return; - if( request->is_item ) + if( cur->request->is_item ) EditFileSubject(); else EditDirSubject(); diff --git a/functions/subject.h b/functions/subject.h index c3ba187..ab80738 100755 --- a/functions/subject.h +++ b/functions/subject.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentsubject -#define headerfilecmslucontentsubject +#ifndef headerfile_winix_functions_subject +#define headerfile_winix_functions_subject #include "functionbase.h" diff --git a/functions/template.cpp b/functions/template.cpp index 21fb1f5..2cf0387 100755 --- a/functions/template.cpp +++ b/functions/template.cpp @@ -29,14 +29,14 @@ bool Template::HasAccess() if( config->template_only_root_use_template_fun ) { // only root is allowed to change the template - return (request->session->puser && request->session->puser->super_user); + return (cur->session->puser && cur->session->puser->super_user); } - if( request->is_item ) - return system->HasWriteAccess(request->item); + if( cur->request->is_item ) + return system->HasWriteAccess(cur->request->item); else - return system->HasWriteAccess(*request->dir_tab.back()); + return system->HasWriteAccess(*cur->request->dir_tab.back()); } @@ -83,9 +83,9 @@ void Template::ChangeTemplate(Item & item) { if( html_template != item.html_template ) { - request->status = db->EditTemplateItemById(item.id, html_template); + cur->request->status = db->EditTemplateItemById(item.id, html_template); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) { item.html_template = html_template; PutLog(item); @@ -96,8 +96,8 @@ void Template::ChangeTemplate(Item & item) void Template::MakePost() { - CreateTemplateFileName(request->PostVar(L"template")); - ChangeTemplate(*request->last_item); + CreateTemplateFileName(cur->request->PostVar(L"template")); + ChangeTemplate(*cur->request->last_item); system->RedirectToLastItem(); } diff --git a/functions/template.h b/functions/template.h index f5ae809..c7c97e5 100755 --- a/functions/template.h +++ b/functions/template.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontenttemplate -#define headerfilecmslucontenttemplate +#ifndef headerfile_winix_functions_template +#define headerfile_winix_functions_template #include "functionbase.h" diff --git a/functions/tinymce.h b/functions/tinymce.h index 1733e99..e6dc307 100755 --- a/functions/tinymce.h +++ b/functions/tinymce.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontenttinymce -#define headerfilecmslucontenttinymce +#ifndef headerfile_winix_functions_tinymce +#define headerfile_winix_functions_tinymce #include "functionbase.h" diff --git a/functions/uname.h b/functions/uname.h index b556691..7c263f2 100755 --- a/functions/uname.h +++ b/functions/uname.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentuname -#define headerfilecmslucontentuname +#ifndef headerfile_winix_functions_uname +#define headerfile_winix_functions_uname #include "functionbase.h" diff --git a/functions/upload.cpp b/functions/upload.cpp index 1f05b1d..46e9e08 100755 --- a/functions/upload.cpp +++ b/functions/upload.cpp @@ -45,7 +45,7 @@ bool Upload::HasAccess(const Item & item) return false; } - if( request->session->puser && request->session->puser->super_user ) + if( cur->session->puser && cur->session->puser->super_user ) // super user can use upload everywhere return true; @@ -58,7 +58,7 @@ return true; bool Upload::HasAccess() { - if( request->is_item || !HasAccess(*request->dir_tab.back()) ) + if( cur->request->is_item || !HasAccess(*cur->request->dir_tab.back()) ) return false; return true; @@ -71,7 +71,7 @@ bool Upload::UploadSaveStaticFile(const Item & item, const std::wstring & tmp_fi { if( !system->MakeFilePath(item, path, false, true, config->upload_dirs_chmod) ) { - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return false; } @@ -83,7 +83,7 @@ bool Upload::UploadSaveStaticFile(const Item & item, const std::wstring & tmp_fi else { log << log1 << "Upload: can't move the tmp file from: " << tmp_filename << ", to: " << path << logend; - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return false; } } @@ -92,15 +92,15 @@ bool Upload::UploadSaveStaticFile(const Item & item, const std::wstring & tmp_fi void Upload::UploadFile(Item & item, const std::wstring & tmp_filename) { // we should add the file beforehand to get the proper item.id - request->status = system->AddFile(item); + cur->request->status = system->AddFile(item); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) { if( system->CreateNewFile(item) ) { if( UploadSaveStaticFile(item, tmp_filename) ) { - request->status = db->EditFileById(item, item.id); + cur->request->status = db->EditFileById(item, item.id); if( item.file_type == WINIX_ITEM_FILETYPE_IMAGE && config->create_thumb ) system->thumb.CreateThumb(item, config->thumb_cx, config->thumb_cy, config->thumb_mode); @@ -118,15 +118,15 @@ bool Upload::FunUploadCheckAbuse() { if( !system->rebus.CheckRebus() ) { - request->status = WINIX_ERR_INCORRECT_REBUS; + cur->request->status = WINIX_ERR_INCORRECT_REBUS; return false; } functions->CheckGetPostTimes(4); - if( request->session->spam_score > 0 ) + if( cur->session->spam_score > 0 ) { - request->status = WINIX_ERR_SPAM; + cur->request->status = WINIX_ERR_SPAM; log << log1 << "Content: ignoring due to suspected spamming" << logend; return false; } @@ -140,24 +140,24 @@ return true; void Upload::UploadMulti() { - request->item.Clear(); // clearing and setting date - request->item.parent_id = request->dir_tab.back()->id; - request->item.type = Item::file; - request->item.privileges = 0644; // !! tymczasowo - functions->SetUser(request->item); + cur->request->item.Clear(); // clearing and setting date + cur->request->item.parent_id = cur->request->dir_tab.back()->id; + cur->request->item.type = Item::file; + cur->request->item.privileges = 0644; // !! tymczasowo + functions->SetUser(cur->request->item); - PostFileTab::iterator i = request->post_file_tab.begin(); + PostFileTab::iterator i = cur->request->post_file_tab.begin(); - for( ; i != request->post_file_tab.end() ; ++i) + for( ; i != cur->request->post_file_tab.end() ; ++i) { const wchar_t * file_name = i->second.filename.c_str(); - request->item.subject = file_name; - request->item.url = file_name; - request->item.file_type = SelectFileType(file_name); + cur->request->item.subject = file_name; + cur->request->item.url = file_name; + cur->request->item.file_type = SelectFileType(file_name); - functions->PrepareUrl(request->item); - UploadFile(request->item, i->second.tmp_filename); + functions->PrepareUrl(cur->request->item); + UploadFile(cur->request->item, i->second.tmp_filename); } system->RedirectToLastDir(); @@ -166,31 +166,31 @@ void Upload::UploadMulti() void Upload::UploadSingle() { - const std::wstring & new_subject = request->PostVar(L"subject"); - const std::wstring & new_url = request->PostVar(L"url"); + const std::wstring & new_subject = cur->request->PostVar(L"subject"); + const std::wstring & new_url = cur->request->PostVar(L"url"); bool has_subject = !new_subject.empty(); bool has_url = !new_url.empty(); - functions->ReadItem(request->item, Item::file); // ReadItem() changes the url if it is empty - functions->SetUser(request->item); - request->item.privileges = 0644; // !! tymczasowo + functions->ReadItem(cur->request->item, Item::file); // ReadItem() changes the url if it is empty + functions->SetUser(cur->request->item); + cur->request->item.privileges = 0644; // !! tymczasowo - const wchar_t * file_name = request->post_file_tab.begin()->second.filename.c_str(); - request->item.file_type = SelectFileType(file_name); + const wchar_t * file_name = cur->request->post_file_tab.begin()->second.filename.c_str(); + cur->request->item.file_type = SelectFileType(file_name); if( !has_subject ) - request->item.subject = file_name; + cur->request->item.subject = file_name; if( !has_url ) { - request->item.url = file_name; - functions->PrepareUrl(request->item); + cur->request->item.url = file_name; + functions->PrepareUrl(cur->request->item); } - UploadFile(request->item, request->post_file_tab.begin()->second.tmp_filename); + UploadFile(cur->request->item, cur->request->post_file_tab.begin()->second.tmp_filename); - if( request->status == WINIX_ERR_OK ) - system->RedirectTo(request->item, L"/cat"); + if( cur->request->status == WINIX_ERR_OK ) + system->RedirectTo(cur->request->item, L"/cat"); } @@ -198,16 +198,16 @@ void Upload::UploadSingle() // !! dodac usuwanie plikow statycznych przez rm void Upload::MakePost() { - if( request->post_file_tab.empty() ) + if( cur->request->post_file_tab.empty() ) { - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return; } if( !FunUploadCheckAbuse() ) return; - if( request->post_file_tab.size() > 1 ) + if( cur->request->post_file_tab.size() > 1 ) UploadMulti(); else UploadSingle(); diff --git a/functions/upload.h b/functions/upload.h index 30e52e3..778c18f 100755 --- a/functions/upload.h +++ b/functions/upload.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentupload -#define headerfilecmslucontentupload +#ifndef headerfile_winix_functions_upload +#define headerfile_winix_functions_upload #include "functionbase.h" diff --git a/functions/uptime.h b/functions/uptime.h index 507049e..22e4ebd 100755 --- a/functions/uptime.h +++ b/functions/uptime.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentuptime -#define headerfilecmslucontentuptime +#ifndef headerfile_winix_functions_uptime +#define headerfile_winix_functions_uptime #include "functionbase.h" diff --git a/functions/vim.h b/functions/vim.h index 0b22fd8..33551da 100755 --- a/functions/vim.h +++ b/functions/vim.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentvim -#define headerfilecmslucontentvim +#ifndef headerfile_winix_functions_vim +#define headerfile_winix_functions_vim #include "functionbase.h" diff --git a/functions/who.h b/functions/who.h index b98c97b..1e407da 100755 --- a/functions/who.h +++ b/functions/who.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucontentwho -#define headerfilecmslucontentwho +#ifndef headerfile_winix_functions_who +#define headerfile_winix_functions_who #include "functionbase.h" diff --git a/main/Makefile.dep b/main/Makefile.dep index 407dea8..0bf92a2 100755 --- a/main/Makefile.dep +++ b/main/Makefile.dep @@ -8,24 +8,23 @@ main.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h main.o: ../core/log.h ../db/dbitemquery.h ../core/item.h main.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h main.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h -main.o: ../core/requesttypes.h ../core/session.h ../core/error.h -main.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -main.o: ../templates/htmltextstream.h ../notify/notify.h -main.o: ../notify/notifypool.h ../templates/locale.h ../core/confparser.h -main.o: ../templates/misc.h ../templates/localefilter.h ../templates/locale.h -main.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -main.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h -main.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h -main.o: ../templates/htmltextstream.h ../notify/notifythread.h -main.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h -main.o: ../core/config.h ../core/users.h ../core/ugcontainer.h -main.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -main.o: ../core/mountparser.h ../core/users.h ../core/groups.h -main.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -main.o: ../core/basethread.h ../core/sessionmanager.h +main.o: ../core/requesttypes.h ../core/error.h ../templates/htmltextstream.h +main.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h +main.o: ../core/confparser.h ../templates/misc.h ../templates/localefilter.h +main.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h +main.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h +main.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h +main.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h +main.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h +main.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h +main.o: ../core/user.h ../core/ugcontainer.h ../core/lastcontainer.h +main.o: ../core/cur.h ../core/session.h ../core/plugindata.h ../core/rebus.h +main.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h +main.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h +main.o: ../core/thumb.h ../core/basethread.h ../core/sessionmanager.h main.o: ../core/sessioncontainer.h ../functions/functions.h main.o: ../functions/functionbase.h ../core/request.h ../core/system.h -main.o: ../core/synchro.h ../functions/functionparser.h +main.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h main.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h main.o: ../functions/privchanger.h ../functions/chown.h main.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h diff --git a/notify/Makefile.dep b/notify/Makefile.dep index ce11951..2a76a04 100755 --- a/notify/Makefile.dep +++ b/notify/Makefile.dep @@ -11,34 +11,35 @@ notify.o: ../core/user.h notifythread.h ../core/basethread.h notify.o: ../core/synchro.h templatesnotify.h ../core/config.h notify.o: ../core/confparser.h ../core/htmlfilter.h ../core/users.h notify.o: ../core/user.h ../core/ugcontainer.h ../core/log.h -notify.o: ../core/textstream.h ../core/lastcontainer.h ../core/request.h -notify.o: ../core/requesttypes.h ../core/session.h ../core/error.h -notify.o: ../core/plugindata.h ../core/rebus.h ../core/config.h -notify.o: ../templates/htmltextstream.h ../db/db.h ../db/dbbase.h +notify.o: ../core/textstream.h ../core/lastcontainer.h ../core/cur.h +notify.o: ../core/request.h ../core/requesttypes.h ../core/error.h +notify.o: ../core/config.h ../templates/htmltextstream.h ../core/session.h +notify.o: ../core/plugindata.h ../core/rebus.h ../db/db.h ../db/dbbase.h notify.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h notify.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h notify.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h notify.o: ../templates/templates.h ../templates/patterncacher.h notify.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h -notify.o: ../core/log.h ../templates/indexpatterns.h ../core/request.h +notify.o: ../core/log.h ../templates/indexpatterns.h ../core/cur.h notify.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h notify.o: ../notify/notify.h ../core/mounts.h ../core/mount.h notify.o: ../core/mountparser.h ../core/users.h ../core/groups.h notify.o: ../core/group.h ../core/loadavg.h ../core/thumb.h notify.o: ../core/basethread.h ../core/sessionmanager.h -notify.o: ../core/sessioncontainer.h ../core/system.h ../core/dirs.h -notify.o: ../core/synchro.h ../core/plugin.h ../core/pluginmsg.h -notify.o: ../core/sessionmanager.h ../functions/functions.h -notify.o: ../functions/functionbase.h ../functions/functionparser.h -notify.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h -notify.o: ../functions/privchanger.h ../functions/chown.h -notify.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h -notify.o: ../functions/download.h ../functions/emacs.h ../functions/last.h -notify.o: ../functions/login.h ../functions/logout.h ../functions/ln.h -notify.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h -notify.o: ../functions/node.h ../functions/priv.h ../functions/reload.h -notify.o: ../functions/rm.h ../functions/run.h ../functions/specialdefault.h -notify.o: ../functions/stat.h ../functions/subject.h ../functions/template.h +notify.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h +notify.o: ../core/dirs.h ../core/synchro.h ../core/plugin.h +notify.o: ../core/pluginmsg.h ../core/sessionmanager.h +notify.o: ../functions/functions.h ../functions/functionbase.h +notify.o: ../functions/functionparser.h ../functions/adduser.h +notify.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h +notify.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h +notify.o: ../functions/default.h ../functions/download.h ../functions/emacs.h +notify.o: ../functions/last.h ../functions/login.h ../functions/logout.h +notify.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h +notify.o: ../functions/mv.h ../functions/node.h ../functions/priv.h +notify.o: ../functions/reload.h ../functions/rm.h ../functions/run.h +notify.o: ../functions/specialdefault.h ../functions/stat.h +notify.o: ../functions/subject.h ../functions/template.h notify.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h notify.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h notify.o: ../core/htmlfilter.h @@ -55,13 +56,14 @@ notifythread.o: ../templates/locale.h ../templates/htmltextstream.h notifythread.o: ../core/user.h ../core/config.h ../core/confparser.h notifythread.o: ../core/htmlfilter.h ../core/users.h ../core/user.h notifythread.o: ../core/ugcontainer.h ../core/log.h ../core/textstream.h -notifythread.o: ../core/lastcontainer.h ../core/request.h -notifythread.o: ../core/requesttypes.h ../core/session.h ../core/error.h -notifythread.o: ../core/plugindata.h ../core/rebus.h ../core/config.h -notifythread.o: ../templates/htmltextstream.h ../db/db.h ../db/dbbase.h -notifythread.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h -notifythread.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h -notifythread.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +notifythread.o: ../core/lastcontainer.h ../core/cur.h ../core/request.h +notifythread.o: ../core/requesttypes.h ../core/error.h ../core/config.h +notifythread.o: ../templates/htmltextstream.h ../core/session.h +notifythread.o: ../core/plugindata.h ../core/rebus.h ../db/db.h +notifythread.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h +notifythread.o: ../core/error.h ../db/dbitemquery.h ../core/item.h +notifythread.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h +notifythread.o: ../core/ugcontainer.h templatesnotify.o: templatesnotify.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h templatesnotify.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h templatesnotify.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h @@ -70,8 +72,7 @@ templatesnotify.o: ../core/textstream.h ../core/misc.h notifypool.h templatesnotify.o: ../templates/locale.h ../core/confparser.h templatesnotify.o: ../core/plugin.h ../core/pluginmsg.h ../core/log.h templatesnotify.o: ../core/textstream.h ../core/plugindata.h ../core/config.h -templatesnotify.o: ../core/request.h ../core/requesttypes.h ../core/session.h -templatesnotify.o: ../core/error.h ../core/user.h ../core/rebus.h +templatesnotify.o: ../core/request.h ../core/requesttypes.h ../core/error.h templatesnotify.o: ../templates/htmltextstream.h ../core/system.h templatesnotify.o: ../core/sessionmanager.h ../core/synchro.h templatesnotify.o: ../functions/functions.h ../functions/functionbase.h @@ -84,8 +85,9 @@ templatesnotify.o: ../core/htmlfilter.h ../core/system.h ../core/dirs.h templatesnotify.o: ../core/dircontainer.h ../notify/notify.h ../core/mounts.h templatesnotify.o: ../core/mount.h ../core/mountparser.h ../core/users.h templatesnotify.o: ../core/groups.h ../core/group.h ../core/ugcontainer.h -templatesnotify.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -templatesnotify.o: ../core/synchro.h ../functions/functionparser.h +templatesnotify.o: ../core/rebus.h ../core/loadavg.h ../core/thumb.h +templatesnotify.o: ../core/basethread.h ../core/synchro.h +templatesnotify.o: ../functions/functionparser.h ../core/cur.h templatesnotify.o: ../functions/adduser.h ../functions/cat.h templatesnotify.o: ../functions/chmod.h ../functions/privchanger.h templatesnotify.o: ../functions/chown.h ../functions/ckeditor.h @@ -107,4 +109,5 @@ templatesnotify.o: ../core/httpsimpleparser.h ../core/log.h templatesnotify.o: ../templates/indexpatterns.h ../templates/localefilter.h templatesnotify.o: ../templates/locale.h ../templates/htmltextstream.h templatesnotify.o: ../core/sessionmanager.h ../core/sessioncontainer.h +templatesnotify.o: ../core/session.h ../core/user.h ../core/cur.h templatesnotify.o: ../core/lastcontainer.h diff --git a/notify/notify.cpp b/notify/notify.cpp index 5bdb0ad..4f215d1 100755 --- a/notify/notify.cpp +++ b/notify/notify.cpp @@ -32,9 +32,9 @@ void Notify::SetSynchro(Synchro * psynchro) -void Notify::SetRequest(Request * prequest) +void Notify::SetCur(Cur * pcur) { - request = prequest; + cur = pcur; } diff --git a/notify/notify.h b/notify/notify.h index 853e242..943b479 100755 --- a/notify/notify.h +++ b/notify/notify.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslunotify -#define headerfilecmslunotify +#ifndef headerfile_winix_notify_notify +#define headerfile_winix_notify_notify #include #include @@ -31,7 +31,7 @@ public: Notify(); void SetSynchro(Synchro * psynchro); - void SetRequest(Request * prequest); + void SetCur(Cur * pcur); void SetConfig(Config * pconfig); void SetUsers(Users * pusers); void SetDirs(Dirs * pdirs); @@ -50,7 +50,7 @@ public: private: - Request * request; + Cur * cur; Config * config; Dirs * dirs; Users * users; diff --git a/notify/notifypool.h b/notify/notifypool.h index 5df8234..3179e1b 100755 --- a/notify/notifypool.h +++ b/notify/notifypool.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslunotifypool -#define headerfilecmslunotifypool +#ifndef headerfile_winix_notify_notifypool +#define headerfile_winix_notify_notifypool #include #include diff --git a/notify/notifythread.h b/notify/notifythread.h index bac1cb0..778d49b 100755 --- a/notify/notifythread.h +++ b/notify/notifythread.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslunotifythread -#define headerfilecmslunotifythread +#ifndef headerfile_winix_notify_notifythread +#define headerfile_winix_notify_notifythread #include "core/basethread.h" #include "templatesnotify.h" diff --git a/plugins/stats/Makefile.dep b/plugins/stats/Makefile.dep index 64593e4..f50dc93 100755 --- a/plugins/stats/Makefile.dep +++ b/plugins/stats/Makefile.dep @@ -3,17 +3,16 @@ bot.o: bot.h init.o: ../../core/log.h ../../core/textstream.h ../../core/misc.h init.o: ../../core/item.h ../../core/request.h ../../core/requesttypes.h -init.o: ../../core/session.h ../../core/error.h ../../core/log.h -init.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h -init.o: ../../core/config.h ../../core/confparser.h ../../core/htmlfilter.h +init.o: ../../core/error.h ../../core/log.h ../../core/config.h +init.o: ../../core/confparser.h ../../core/htmlfilter.h init.o: ../../templates/htmltextstream.h ../../core/textstream.h init.o: ../../core/config.h ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h init.o: ../../db/dbtextstream.h ../../core/error.h ../../db/dbitemquery.h init.o: ../../core/item.h ../../db/dbitemcolumns.h ../../core/user.h init.o: ../../core/group.h ../../core/dircontainer.h ../../core/ugcontainer.h init.o: bot.h stats.h templates.h ../../core/plugin.h ../../core/pluginmsg.h -init.o: ../../core/request.h ../../core/system.h ../../core/dirs.h -init.o: ../../core/dircontainer.h ../../notify/notify.h +init.o: ../../core/plugindata.h ../../core/request.h ../../core/system.h +init.o: ../../core/dirs.h ../../core/dircontainer.h ../../notify/notify.h init.o: ../../notify/notifypool.h ../../templates/locale.h init.o: ../../core/confparser.h ../../templates/misc.h init.o: ../../templates/localefilter.h ../../templates/locale.h @@ -23,15 +22,16 @@ init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h init.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h init.o: ../../notify/notifythread.h ../../core/basethread.h init.o: ../../core/synchro.h ../../notify/templatesnotify.h -init.o: ../../core/users.h ../../core/ugcontainer.h -init.o: ../../core/lastcontainer.h ../../core/mounts.h ../../core/mount.h +init.o: ../../core/users.h ../../core/user.h ../../core/ugcontainer.h +init.o: ../../core/lastcontainer.h ../../core/cur.h ../../core/session.h +init.o: ../../core/rebus.h ../../core/mounts.h ../../core/mount.h init.o: ../../core/mountparser.h ../../core/users.h ../../core/groups.h init.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h init.o: ../../core/basethread.h ../../core/sessionmanager.h init.o: ../../core/sessioncontainer.h ../../functions/functions.h init.o: ../../functions/functionbase.h ../../core/system.h init.o: ../../core/synchro.h ../../functions/functionparser.h -init.o: ../../functions/adduser.h ../../functions/cat.h +init.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h init.o: ../../functions/chmod.h ../../functions/privchanger.h init.o: ../../functions/chown.h ../../functions/ckeditor.h init.o: ../../functions/cp.h ../../functions/default.h @@ -73,18 +73,18 @@ templates.o: ../../templates/htmltextstream.h ../../notify/notifythread.h templates.o: ../../core/basethread.h ../../core/synchro.h templates.o: ../../notify/templatesnotify.h ../../core/config.h templates.o: ../../core/users.h ../../core/user.h ../../core/ugcontainer.h -templates.o: ../../core/lastcontainer.h ../../core/mounts.h -templates.o: ../../core/mount.h ../../core/error.h ../../core/mountparser.h -templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h -templates.o: ../../core/rebus.h ../../core/loadavg.h ../../core/thumb.h -templates.o: ../../core/basethread.h ../../core/textstream.h -templates.o: ../../core/misc.h ../../core/sessionmanager.h -templates.o: ../../core/sessioncontainer.h ../../core/session.h +templates.o: ../../core/lastcontainer.h ../../core/cur.h ../../core/session.h +templates.o: ../../core/error.h ../../core/rebus.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 +templates.o: ../../core/textstream.h ../../core/misc.h +templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h templates.o: ../../functions/functions.h ../../functions/functionbase.h templates.o: ../../core/request.h ../../core/requesttypes.h templates.o: ../../templates/htmltextstream.h ../../core/system.h templates.o: ../../core/synchro.h ../../functions/functionparser.h -templates.o: ../../functions/adduser.h ../../functions/cat.h +templates.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h templates.o: ../../functions/chmod.h ../../functions/privchanger.h templates.o: ../../functions/chown.h ../../functions/ckeditor.h templates.o: ../../functions/cp.h ../../functions/default.h diff --git a/plugins/stats/init.cpp b/plugins/stats/init.cpp index 3017645..f362645 100755 --- a/plugins/stats/init.cpp +++ b/plugins/stats/init.cpp @@ -42,13 +42,13 @@ long current_item_id; -void CalcItemId(Request * request) +void CalcItemId(Cur * cur) { - if( request->is_item ) - current_item_id = request->item.id; + if( cur->request->is_item ) + current_item_id = cur->request->item.id; else - if( !request->dir_tab.empty() ) - current_item_id = request->dir_tab.back()->id; + if( !cur->request->dir_tab.empty() ) + current_item_id = cur->request->dir_tab.back()->id; else current_item_id = -1; } @@ -59,7 +59,7 @@ void CalcItemId(Request * request) void UpdateStats(PluginInfo & info, Stats::ItemStats & item_stats) { - bot.SetBrowserName(info.request->env_http_user_agent); + bot.SetBrowserName(info.cur->request->env_http_user_agent); stats.global_all += 1; item_stats.all += 1; @@ -89,13 +89,13 @@ void ContentMake(PluginInfo & info) { StatsSession * stats_session = 0; - CalcItemId(info.request); + CalcItemId(info.cur); if( current_item_id == - 1 || !info.plugin_data_base ) return; stats_session = reinterpret_cast(info.plugin_data_base); - stats_session->nostat = info.request->IsParam(nostat_param); + stats_session->nostat = info.cur->request->IsParam(nostat_param); if( stats_session->nostat ) return; @@ -123,9 +123,9 @@ StatsSession * stats_session = 0; void SessionCreated(PluginInfo & info) { StatsSession * d = new StatsSession(); - info.request->session->plugin_data.Assign(d); + info.cur->session->plugin_data.Assign(d); - if( !info.request->IsParam(nostat_param) ) + if( !info.cur->request->IsParam(nostat_param) ) { log << log4 << "Stats: created stats plugin data" << ", plugin id: " << info.plugin_id @@ -141,7 +141,8 @@ void RemoveSession(PluginInfo & info) { // temporarily for debug // sometimes the pointer is null here - log << log1 << "Stats: why the info.plugin_data_base is zero? !!!!" << logend; + log << log1 << "Stats: why the info.plugin_data_base is zero? !!!!, ses_id: " << info.cur->session->id << logend; + return; } diff --git a/plugins/thread/Makefile.dep b/plugins/thread/Makefile.dep index 4c5396e..9945673 100755 --- a/plugins/thread/Makefile.dep +++ b/plugins/thread/Makefile.dep @@ -9,11 +9,10 @@ createthread.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h createthread.o: ../../core/user.h ../../core/group.h createthread.o: ../../core/dircontainer.h ../../core/ugcontainer.h createthread.o: ../../core/request.h ../../core/requesttypes.h -createthread.o: ../../core/session.h ../../core/error.h ../../core/user.h -createthread.o: ../../core/plugindata.h ../../core/rebus.h -createthread.o: ../../core/config.h ../../core/confparser.h -createthread.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h -createthread.o: ../../core/config.h ../../core/system.h ../../core/dirs.h +createthread.o: ../../core/error.h ../../core/config.h +createthread.o: ../../core/confparser.h ../../core/htmlfilter.h +createthread.o: ../../templates/htmltextstream.h ../../core/config.h +createthread.o: ../../core/system.h ../../core/dirs.h createthread.o: ../../core/dircontainer.h ../../core/request.h createthread.o: ../../notify/notify.h ../../notify/notifypool.h createthread.o: ../../templates/locale.h ../../core/confparser.h @@ -25,31 +24,34 @@ createthread.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h createthread.o: ../../templates/htmltextstream.h ../../notify/notifythread.h createthread.o: ../../core/basethread.h ../../core/synchro.h createthread.o: ../../notify/templatesnotify.h ../../core/users.h -createthread.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -createthread.o: ../../core/mounts.h ../../core/mount.h +createthread.o: ../../core/user.h ../../core/ugcontainer.h +createthread.o: ../../core/lastcontainer.h ../../core/cur.h +createthread.o: ../../core/session.h ../../core/plugindata.h +createthread.o: ../../core/rebus.h ../../core/mounts.h ../../core/mount.h createthread.o: ../../core/mountparser.h ../../core/users.h createthread.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h createthread.o: ../../core/thumb.h ../../core/basethread.h createthread.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h createthread.o: threadinfo.h ../../functions/functions.h createthread.o: ../../functions/functionbase.h -createthread.o: ../../functions/functionparser.h ../../functions/adduser.h -createthread.o: ../../functions/cat.h ../../functions/chmod.h -createthread.o: ../../functions/privchanger.h ../../functions/chown.h -createthread.o: ../../functions/ckeditor.h ../../functions/cp.h -createthread.o: ../../functions/default.h ../../functions/download.h -createthread.o: ../../functions/emacs.h ../../functions/last.h -createthread.o: ../../functions/login.h ../../functions/logout.h -createthread.o: ../../functions/ln.h ../../functions/ls.h -createthread.o: ../../functions/mkdir.h ../../functions/mv.h -createthread.o: ../../functions/node.h ../../functions/priv.h -createthread.o: ../../functions/reload.h ../../functions/rm.h -createthread.o: ../../functions/run.h ../../functions/specialdefault.h -createthread.o: ../../functions/stat.h ../../functions/subject.h -createthread.o: ../../functions/template.h ../../functions/tinymce.h -createthread.o: ../../functions/uname.h ../../functions/upload.h -createthread.o: ../../functions/uptime.h ../../functions/who.h -createthread.o: ../../functions/vim.h ../../core/htmlfilter.h +createthread.o: ../../functions/functionparser.h ../../core/cur.h +createthread.o: ../../functions/adduser.h ../../functions/cat.h +createthread.o: ../../functions/chmod.h ../../functions/privchanger.h +createthread.o: ../../functions/chown.h ../../functions/ckeditor.h +createthread.o: ../../functions/cp.h ../../functions/default.h +createthread.o: ../../functions/download.h ../../functions/emacs.h +createthread.o: ../../functions/last.h ../../functions/login.h +createthread.o: ../../functions/logout.h ../../functions/ln.h +createthread.o: ../../functions/ls.h ../../functions/mkdir.h +createthread.o: ../../functions/mv.h ../../functions/node.h +createthread.o: ../../functions/priv.h ../../functions/reload.h +createthread.o: ../../functions/rm.h ../../functions/run.h +createthread.o: ../../functions/specialdefault.h ../../functions/stat.h +createthread.o: ../../functions/subject.h ../../functions/template.h +createthread.o: ../../functions/tinymce.h ../../functions/uname.h +createthread.o: ../../functions/upload.h ../../functions/uptime.h +createthread.o: ../../functions/who.h ../../functions/vim.h +createthread.o: ../../core/htmlfilter.h funthread.o: ../../core/misc.h ../../core/item.h funthread.h funthread.o: ../../functions/functionbase.h ../../core/item.h ../../db/db.h funthread.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h @@ -58,23 +60,23 @@ funthread.o: ../../core/log.h ../../core/textstream.h ../../db/dbitemquery.h funthread.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h funthread.o: ../../core/dircontainer.h ../../core/ugcontainer.h funthread.o: ../../core/request.h ../../core/requesttypes.h -funthread.o: ../../core/session.h ../../core/error.h ../../core/user.h -funthread.o: ../../core/plugindata.h ../../core/rebus.h ../../core/config.h -funthread.o: ../../core/confparser.h ../../core/htmlfilter.h -funthread.o: ../../templates/htmltextstream.h ../../core/config.h -funthread.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h -funthread.o: ../../core/request.h ../../notify/notify.h -funthread.o: ../../notify/notifypool.h ../../templates/locale.h -funthread.o: ../../core/confparser.h ../../templates/misc.h -funthread.o: ../../templates/localefilter.h ../../templates/locale.h -funthread.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h -funthread.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h -funthread.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -funthread.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h -funthread.o: ../../notify/notifythread.h ../../core/basethread.h -funthread.o: ../../core/synchro.h ../../notify/templatesnotify.h -funthread.o: ../../core/users.h ../../core/ugcontainer.h -funthread.o: ../../core/lastcontainer.h ../../core/mounts.h +funthread.o: ../../core/error.h ../../core/config.h ../../core/confparser.h +funthread.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h +funthread.o: ../../core/config.h ../../core/system.h ../../core/dirs.h +funthread.o: ../../core/dircontainer.h ../../core/request.h +funthread.o: ../../notify/notify.h ../../notify/notifypool.h +funthread.o: ../../templates/locale.h ../../core/confparser.h +funthread.o: ../../templates/misc.h ../../templates/localefilter.h +funthread.o: ../../templates/locale.h ../../../ezc/src/ezc.h +funthread.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h +funthread.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h +funthread.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h +funthread.o: ../../templates/htmltextstream.h ../../notify/notifythread.h +funthread.o: ../../core/basethread.h ../../core/synchro.h +funthread.o: ../../notify/templatesnotify.h ../../core/users.h +funthread.o: ../../core/user.h ../../core/ugcontainer.h +funthread.o: ../../core/lastcontainer.h ../../core/cur.h ../../core/session.h +funthread.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mounts.h funthread.o: ../../core/mount.h ../../core/mountparser.h ../../core/users.h funthread.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h funthread.o: ../../core/thumb.h ../../core/basethread.h ../../core/synchro.h @@ -86,9 +88,8 @@ init.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h init.o: ../../core/item.h ../../db/dbitemquery.h ../../db/dbitemcolumns.h init.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h init.o: ../../core/ugcontainer.h ../../core/request.h -init.o: ../../core/requesttypes.h ../../core/session.h ../../core/error.h -init.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h -init.o: ../../core/config.h ../../core/confparser.h ../../core/htmlfilter.h +init.o: ../../core/requesttypes.h ../../core/error.h ../../core/config.h +init.o: ../../core/confparser.h ../../core/htmlfilter.h init.o: ../../templates/htmltextstream.h ../../core/config.h init.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h init.o: ../../core/request.h ../../notify/notify.h ../../notify/notifypool.h @@ -100,8 +101,9 @@ init.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h init.o: ../../templates/htmltextstream.h ../../notify/notifythread.h init.o: ../../core/basethread.h ../../core/synchro.h -init.o: ../../notify/templatesnotify.h ../../core/users.h -init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h +init.o: ../../notify/templatesnotify.h ../../core/users.h ../../core/user.h +init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h ../../core/cur.h +init.o: ../../core/session.h ../../core/plugindata.h ../../core/rebus.h init.o: ../../core/mounts.h ../../core/mount.h ../../core/mountparser.h init.o: ../../core/users.h ../../core/groups.h ../../core/group.h init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h @@ -110,7 +112,7 @@ init.o: showthreads.h ../../core/log.h ../../core/plugin.h pluginmsg.h init.o: ../../core/system.h ../../core/sessionmanager.h init.o: ../../core/sessioncontainer.h ../../functions/functions.h init.o: ../../functions/functionbase.h ../../functions/functionparser.h -init.o: ../../functions/adduser.h ../../functions/cat.h +init.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h init.o: ../../functions/chmod.h ../../functions/privchanger.h init.o: ../../functions/chown.h ../../functions/ckeditor.h init.o: ../../functions/cp.h ../../functions/default.h @@ -136,28 +138,28 @@ reply.o: ../../core/item.h ../../core/error.h ../../core/log.h reply.o: ../../core/textstream.h ../../db/dbitemquery.h reply.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h reply.o: ../../core/dircontainer.h ../../core/ugcontainer.h -reply.o: ../../core/request.h ../../core/requesttypes.h ../../core/session.h -reply.o: ../../core/error.h ../../core/user.h ../../core/plugindata.h -reply.o: ../../core/rebus.h ../../core/config.h ../../core/confparser.h -reply.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h -reply.o: ../../core/config.h ../../core/system.h ../../core/dirs.h -reply.o: ../../core/dircontainer.h ../../core/request.h ../../notify/notify.h -reply.o: ../../notify/notifypool.h ../../templates/locale.h -reply.o: ../../core/confparser.h ../../templates/misc.h -reply.o: ../../templates/localefilter.h ../../templates/locale.h -reply.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h -reply.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h -reply.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h -reply.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h -reply.o: ../../notify/notifythread.h ../../core/basethread.h -reply.o: ../../core/synchro.h ../../notify/templatesnotify.h -reply.o: ../../core/users.h ../../core/ugcontainer.h -reply.o: ../../core/lastcontainer.h ../../core/mounts.h ../../core/mount.h -reply.o: ../../core/mountparser.h ../../core/users.h ../../core/groups.h -reply.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h -reply.o: ../../core/basethread.h ../../core/synchro.h tdb.h thread.h -reply.o: ../../db/dbbase.h threadinfo.h ../../functions/functions.h -reply.o: ../../functions/functionbase.h ../../functions/functionparser.h +reply.o: ../../core/request.h ../../core/requesttypes.h ../../core/error.h +reply.o: ../../core/config.h ../../core/confparser.h ../../core/htmlfilter.h +reply.o: ../../templates/htmltextstream.h ../../core/config.h +reply.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h +reply.o: ../../core/request.h ../../notify/notify.h ../../notify/notifypool.h +reply.o: ../../templates/locale.h ../../core/confparser.h +reply.o: ../../templates/misc.h ../../templates/localefilter.h +reply.o: ../../templates/locale.h ../../../ezc/src/ezc.h +reply.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h +reply.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h +reply.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h +reply.o: ../../templates/htmltextstream.h ../../notify/notifythread.h +reply.o: ../../core/basethread.h ../../core/synchro.h +reply.o: ../../notify/templatesnotify.h ../../core/users.h ../../core/user.h +reply.o: ../../core/ugcontainer.h ../../core/lastcontainer.h ../../core/cur.h +reply.o: ../../core/session.h ../../core/plugindata.h ../../core/rebus.h +reply.o: ../../core/mounts.h ../../core/mount.h ../../core/mountparser.h +reply.o: ../../core/users.h ../../core/groups.h ../../core/group.h +reply.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h +reply.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h threadinfo.h +reply.o: ../../functions/functions.h ../../functions/functionbase.h +reply.o: ../../functions/functionparser.h ../../core/cur.h reply.o: ../../functions/adduser.h ../../functions/cat.h reply.o: ../../functions/chmod.h ../../functions/privchanger.h reply.o: ../../functions/chown.h ../../functions/ckeditor.h @@ -186,9 +188,8 @@ showthreads.o: ../../core/log.h ../../core/textstream.h showthreads.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h showthreads.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h showthreads.o: ../../core/ugcontainer.h ../../core/request.h -showthreads.o: ../../core/requesttypes.h ../../core/session.h -showthreads.o: ../../core/error.h ../../core/user.h ../../core/plugindata.h -showthreads.o: ../../core/rebus.h ../../core/config.h ../../core/confparser.h +showthreads.o: ../../core/requesttypes.h ../../core/error.h +showthreads.o: ../../core/config.h ../../core/confparser.h showthreads.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h showthreads.o: ../../core/config.h ../../core/system.h ../../core/dirs.h showthreads.o: ../../core/dircontainer.h ../../core/request.h @@ -202,8 +203,10 @@ showthreads.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h showthreads.o: ../../templates/htmltextstream.h ../../notify/notifythread.h showthreads.o: ../../core/basethread.h ../../core/synchro.h showthreads.o: ../../notify/templatesnotify.h ../../core/users.h -showthreads.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -showthreads.o: ../../core/mounts.h ../../core/mount.h +showthreads.o: ../../core/user.h ../../core/ugcontainer.h +showthreads.o: ../../core/lastcontainer.h ../../core/cur.h +showthreads.o: ../../core/session.h ../../core/plugindata.h +showthreads.o: ../../core/rebus.h ../../core/mounts.h ../../core/mount.h showthreads.o: ../../core/mountparser.h ../../core/users.h showthreads.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h showthreads.o: ../../core/thumb.h ../../core/basethread.h @@ -231,20 +234,20 @@ templates.o: ../../notify/notifythread.h ../../core/basethread.h templates.o: ../../core/synchro.h ../../notify/templatesnotify.h templates.o: ../../core/config.h ../../core/users.h ../../core/user.h templates.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -templates.o: ../../core/mounts.h ../../core/mount.h ../../core/error.h -templates.o: ../../core/mountparser.h ../../core/config.h +templates.o: ../../core/cur.h ../../core/session.h ../../core/error.h +templates.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mounts.h +templates.o: ../../core/mount.h ../../core/mountparser.h ../../core/config.h templates.o: ../../core/confparser.h ../../core/htmlfilter.h templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h -templates.o: ../../core/rebus.h ../../core/loadavg.h ../../core/thumb.h -templates.o: ../../core/basethread.h reply.h ../../functions/functionbase.h -templates.o: ../../core/request.h ../../core/requesttypes.h -templates.o: ../../core/session.h ../../core/plugindata.h -templates.o: ../../templates/htmltextstream.h ../../core/synchro.h tdb.h -templates.o: ../../db/dbbase.h funthread.h createthread.h showthreads.h -templates.o: ../../core/misc.h ../../core/plugin.h pluginmsg.h -templates.o: ../../core/system.h ../../core/sessionmanager.h -templates.o: ../../core/sessioncontainer.h ../../functions/functions.h -templates.o: ../../functions/functionbase.h ../../functions/functionparser.h +templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h +templates.o: reply.h ../../functions/functionbase.h ../../core/request.h +templates.o: ../../core/requesttypes.h ../../templates/htmltextstream.h +templates.o: ../../core/synchro.h tdb.h ../../db/dbbase.h funthread.h +templates.o: createthread.h showthreads.h ../../core/misc.h +templates.o: ../../core/plugin.h pluginmsg.h ../../core/system.h +templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h +templates.o: ../../functions/functions.h ../../functions/functionbase.h +templates.o: ../../functions/functionparser.h ../../core/cur.h templates.o: ../../functions/adduser.h ../../functions/cat.h templates.o: ../../functions/chmod.h ../../functions/privchanger.h templates.o: ../../functions/chown.h ../../functions/ckeditor.h @@ -286,9 +289,9 @@ threadinfo.o: ../../notify/notifythread.h ../../core/basethread.h threadinfo.o: ../../core/synchro.h ../../notify/templatesnotify.h threadinfo.o: ../../core/config.h ../../core/users.h ../../core/user.h threadinfo.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -threadinfo.o: ../../core/mounts.h ../../core/mount.h ../../core/error.h -threadinfo.o: ../../core/mountparser.h ../../core/config.h +threadinfo.o: ../../core/cur.h ../../core/session.h ../../core/error.h +threadinfo.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mounts.h +threadinfo.o: ../../core/mount.h ../../core/mountparser.h ../../core/config.h threadinfo.o: ../../core/confparser.h ../../core/htmlfilter.h threadinfo.o: ../../core/users.h ../../core/groups.h ../../core/group.h -threadinfo.o: ../../core/rebus.h ../../core/loadavg.h ../../core/thumb.h -threadinfo.o: ../../core/basethread.h +threadinfo.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h diff --git a/plugins/thread/createthread.cpp b/plugins/thread/createthread.cpp index 7767117..02ce140 100755 --- a/plugins/thread/createthread.cpp +++ b/plugins/thread/createthread.cpp @@ -40,7 +40,7 @@ void CreateThread::SetThreadInfo(ThreadInfo * pthread_info) // returning true if we can create a thread in the current directory bool CreateThread::HasAccess() { - if( request->is_item || !system->HasWriteAccess(*request->dir_tab.back()) ) + if( cur->request->is_item || !system->HasWriteAccess(*cur->request->dir_tab.back()) ) return false; if( system->mounts.pmount->type != thread_info->mount_type_thread ) @@ -54,34 +54,34 @@ return true; void CreateThread::MakePost() { - request->item.Clear(); - functions->ReadItem(request->item, Item::file); - functions->SetUser(request->item); - functions->PrepareUrl(request->item); - request->item.parent_id = request->dir_tab.back()->id; - request->item.privileges = 0644; // !! tymczasowo + cur->request->item.Clear(); + functions->ReadItem(cur->request->item, Item::file); + functions->SetUser(cur->request->item); + functions->PrepareUrl(cur->request->item); + cur->request->item.parent_id = cur->request->dir_tab.back()->id; + cur->request->item.privileges = 0644; // !! tymczasowo if( functions->CheckAbuse() ) return; - request->status = system->AddFile(request->item); + cur->request->status = system->AddFile(cur->request->item); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) { thread.Clear(); - thread.file_id = request->item.id; - request->status = tdb->AddThread(thread); + thread.file_id = cur->request->item.id; + cur->request->status = tdb->AddThread(thread); } - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) { log << log2 << "CreateThread: added a new thread" << logend; - system->RedirectTo(request->item); + system->RedirectTo(cur->request->item); } else { log << log1 << "CreateThread: problem with adding a new thread, error code: " - << request->status << logend; + << cur->request->status << logend; } } diff --git a/plugins/thread/funthread.cpp b/plugins/thread/funthread.cpp index ecd9cbb..afdcca5 100755 --- a/plugins/thread/funthread.cpp +++ b/plugins/thread/funthread.cpp @@ -36,7 +36,7 @@ void FunThread::SetThreadInfo(ThreadInfo * pthread_info) bool FunThread::HasAccess() { - if( !request->is_item ) + if( !cur->request->is_item ) return false; if( system->mounts.pmount->type != thread_info->mount_type_thread ) @@ -52,9 +52,9 @@ void FunThread::PrepareThread(long file_id) { thread_info->Clear(); - //request->status = tdb->GetThreadByFileId(file_id, thread); + //cur->request->status = tdb->GetThreadByFileId(file_id, thread); - request->status = tdb->GetAnswers(file_id, id_tab); + cur->request->status = tdb->GetAnswers(file_id, id_tab); if( !id_tab.empty() ) { @@ -82,7 +82,7 @@ void FunThread::PrepareThread(long file_id) void FunThread::MakeGet() { - PrepareThread(request->item.id); + PrepareThread(cur->request->item.id); } diff --git a/plugins/thread/init.cpp b/plugins/thread/init.cpp index 2240aa9..2907c30 100755 --- a/plugins/thread/init.cpp +++ b/plugins/thread/init.cpp @@ -51,10 +51,10 @@ void SelectDefaultFunction(PluginInfo & info) { if( info.system->mounts.pmount->type == thread_info.mount_type_thread ) { - if( info.request->is_item ) - info.request->function = &fun_thread; + if( info.cur->request->is_item ) + info.cur->request->function = &fun_thread; else - info.request->function = &fun_show_threads; + info.cur->request->function = &fun_show_threads; } } diff --git a/plugins/thread/reply.cpp b/plugins/thread/reply.cpp index 5187125..a66ff26 100755 --- a/plugins/thread/reply.cpp +++ b/plugins/thread/reply.cpp @@ -39,7 +39,7 @@ void Reply::SetThreadInfo(ThreadInfo * pthread_info) bool Reply::HasAccess() { - if( !request->is_item ) + if( !cur->request->is_item ) return false; Item * dir = thread_info->FindThreadDir(); @@ -66,19 +66,19 @@ void Reply::MakePost() if( !dir ) { - request->status = WINIX_ERR_PERMISSION_DENIED; + cur->request->status = WINIX_ERR_PERMISSION_DENIED; return; } - if( tdb->GetThreadByFileId(request->item.id, thread) != WINIX_ERR_OK ) + if( tdb->GetThreadByFileId(cur->request->item.id, thread) != WINIX_ERR_OK ) { thread.Clear(); - thread.file_id = request->item.id; + thread.file_id = cur->request->item.id; tdb->AddThread(thread); } answer.Clear(); - answer.url = request->item.url; + answer.url = cur->request->item.url; answer.url += L"_msg_"; answer.url += Toa(thread.replies + 1); answer.subject = answer.url; @@ -91,21 +91,21 @@ void Reply::MakePost() if( functions->CheckAbuse() ) return; - request->status = system->AddFile(answer); + cur->request->status = system->AddFile(answer); - if( request->status == WINIX_ERR_OK ) - request->status = tdb->EditThreadAddItem(request->item.id, answer.id); + if( cur->request->status == WINIX_ERR_OK ) + cur->request->status = tdb->EditThreadAddItem(cur->request->item.id, answer.id); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) { log << log2 << "Reply: added an answer in a thread" << logend; - system->RedirectTo(request->item); + system->RedirectTo(cur->request->item); } else { log << log1 << "Reply: problem with adding an answer, error code: " - << request->status << logend; + << cur->request->status << logend; } } diff --git a/plugins/thread/showthreads.cpp b/plugins/thread/showthreads.cpp index b52ca0e..41ba1a2 100755 --- a/plugins/thread/showthreads.cpp +++ b/plugins/thread/showthreads.cpp @@ -39,7 +39,7 @@ void ShowThreads::SetThreadInfo(ThreadInfo * pthread_info) bool ShowThreads::HasAccess() { - if( request->is_item ) + if( cur->request->is_item ) return false; if( system->mounts.pmount->type != thread_info->mount_type_thread ) @@ -87,7 +87,7 @@ void ShowThreads::ReadFiles() iq.sel_guest_name = true; iq.sel_privileges = true; iq.sel_date = true; - iq.WhereParentId(request->dir_tab.back()->id); + iq.WhereParentId(cur->request->dir_tab.back()->id); iq.WhereType(Item::file); iq.WhereFileType(WINIX_ITEM_FILETYPE_NONE); @@ -123,7 +123,7 @@ void ShowThreads::SortPointers() { int sort_type = 1; - if( request->ParamValue(L"sort") == L"url" ) + if( cur->request->ParamValue(L"sort") == L"url" ) sort_type = 0; std::vector & table = thread_info->item_sort_tab; diff --git a/plugins/thread/templates.h b/plugins/thread/templates.h index 1159c10..fe60915 100755 --- a/plugins/thread/templates.h +++ b/plugins/thread/templates.h @@ -16,16 +16,16 @@ namespace Thread { - - -bool thread_sort_tab(size_t sort_index); - - + + +bool thread_sort_tab(size_t sort_index); + + void AddEzcFunctions(PluginInfo & info); - - - -} // namespace - -#endif - + + + +} // namespace + +#endif + diff --git a/plugins/ticket/Makefile.dep b/plugins/ticket/Makefile.dep index 400999b..fa29b54 100755 --- a/plugins/ticket/Makefile.dep +++ b/plugins/ticket/Makefile.dep @@ -9,11 +9,10 @@ createticket.o: ../../db/db.h ../../db/dbbase.h ../../db/dbitemquery.h createticket.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h createticket.o: ../../core/dircontainer.h ../../core/ugcontainer.h createticket.o: ../../core/request.h ../../core/requesttypes.h -createticket.o: ../../core/session.h ../../core/error.h ../../core/user.h -createticket.o: ../../core/plugindata.h ../../core/rebus.h -createticket.o: ../../core/config.h ../../core/confparser.h -createticket.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h -createticket.o: ../../core/config.h ../../core/system.h ../../core/dirs.h +createticket.o: ../../core/error.h ../../core/config.h +createticket.o: ../../core/confparser.h ../../core/htmlfilter.h +createticket.o: ../../templates/htmltextstream.h ../../core/config.h +createticket.o: ../../core/system.h ../../core/dirs.h createticket.o: ../../core/dircontainer.h ../../core/request.h createticket.o: ../../notify/notify.h ../../notify/notifypool.h createticket.o: ../../templates/locale.h ../../core/confparser.h @@ -25,31 +24,33 @@ createticket.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h createticket.o: ../../templates/htmltextstream.h ../../notify/notifythread.h createticket.o: ../../core/basethread.h ../../core/synchro.h createticket.o: ../../notify/templatesnotify.h ../../core/users.h -createticket.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -createticket.o: ../../core/mounts.h ../../core/mount.h +createticket.o: ../../core/user.h ../../core/ugcontainer.h +createticket.o: ../../core/lastcontainer.h ../../core/cur.h +createticket.o: ../../core/session.h ../../core/plugindata.h +createticket.o: ../../core/rebus.h ../../core/mounts.h ../../core/mount.h createticket.o: ../../core/mountparser.h ../../core/users.h createticket.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h createticket.o: ../../core/thumb.h ../../core/basethread.h createticket.o: ../../core/synchro.h ticketinfo.h ticketparser.h ticketconf.h createticket.o: ../../functions/functions.h ../../functions/functionbase.h -createticket.o: ../../functions/functionparser.h ../../functions/adduser.h -createticket.o: ../../functions/cat.h ../../functions/chmod.h -createticket.o: ../../functions/privchanger.h ../../functions/chown.h -createticket.o: ../../functions/ckeditor.h ../../functions/cp.h -createticket.o: ../../functions/default.h ../../functions/download.h -createticket.o: ../../functions/emacs.h ../../functions/last.h -createticket.o: ../../functions/login.h ../../functions/logout.h -createticket.o: ../../functions/ln.h ../../functions/ls.h -createticket.o: ../../functions/mkdir.h ../../functions/mv.h -createticket.o: ../../functions/node.h ../../functions/priv.h -createticket.o: ../../functions/reload.h ../../functions/rm.h -createticket.o: ../../functions/run.h ../../functions/specialdefault.h -createticket.o: ../../functions/stat.h ../../functions/subject.h -createticket.o: ../../functions/template.h ../../functions/tinymce.h -createticket.o: ../../functions/uname.h ../../functions/upload.h -createticket.o: ../../functions/uptime.h ../../functions/who.h -createticket.o: ../../functions/vim.h ../../core/htmlfilter.h sessiondata.h -createticket.o: ../../core/plugindata.h +createticket.o: ../../functions/functionparser.h ../../core/cur.h +createticket.o: ../../functions/adduser.h ../../functions/cat.h +createticket.o: ../../functions/chmod.h ../../functions/privchanger.h +createticket.o: ../../functions/chown.h ../../functions/ckeditor.h +createticket.o: ../../functions/cp.h ../../functions/default.h +createticket.o: ../../functions/download.h ../../functions/emacs.h +createticket.o: ../../functions/last.h ../../functions/login.h +createticket.o: ../../functions/logout.h ../../functions/ln.h +createticket.o: ../../functions/ls.h ../../functions/mkdir.h +createticket.o: ../../functions/mv.h ../../functions/node.h +createticket.o: ../../functions/priv.h ../../functions/reload.h +createticket.o: ../../functions/rm.h ../../functions/run.h +createticket.o: ../../functions/specialdefault.h ../../functions/stat.h +createticket.o: ../../functions/subject.h ../../functions/template.h +createticket.o: ../../functions/tinymce.h ../../functions/uname.h +createticket.o: ../../functions/upload.h ../../functions/uptime.h +createticket.o: ../../functions/who.h ../../functions/vim.h +createticket.o: ../../core/htmlfilter.h sessiondata.h ../../core/plugindata.h editticket.o: editticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h editticket.o: ../../db/dbtextstream.h ../../core/textstream.h editticket.o: ../../core/misc.h ../../core/item.h ../../core/error.h @@ -71,18 +72,18 @@ editticket.o: ../../notify/notifythread.h ../../core/basethread.h editticket.o: ../../core/synchro.h ../../notify/templatesnotify.h editticket.o: ../../core/config.h ../../core/users.h ../../core/user.h editticket.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -editticket.o: ../../core/mounts.h ../../core/mount.h ../../core/error.h -editticket.o: ../../core/mountparser.h ../../core/config.h +editticket.o: ../../core/cur.h ../../core/session.h ../../core/error.h +editticket.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mounts.h +editticket.o: ../../core/mount.h ../../core/mountparser.h ../../core/config.h editticket.o: ../../core/confparser.h ../../core/htmlfilter.h editticket.o: ../../core/users.h ../../core/groups.h ../../core/group.h -editticket.o: ../../core/rebus.h ../../core/loadavg.h ../../core/thumb.h -editticket.o: ../../core/basethread.h ../../functions/functions.h -editticket.o: ../../functions/functionbase.h ../../functions/functionparser.h +editticket.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h +editticket.o: ../../functions/functions.h ../../functions/functionbase.h +editticket.o: ../../functions/functionparser.h ../../core/cur.h +editticket.o: ../../functions/adduser.h ../../functions/cat.h +editticket.o: ../../functions/chmod.h ../../functions/privchanger.h editticket.o: ../../core/request.h ../../core/requesttypes.h -editticket.o: ../../core/session.h ../../core/plugindata.h -editticket.o: ../../templates/htmltextstream.h ../../functions/adduser.h -editticket.o: ../../functions/cat.h ../../functions/chmod.h -editticket.o: ../../functions/privchanger.h ../../functions/chown.h +editticket.o: ../../templates/htmltextstream.h ../../functions/chown.h editticket.o: ../../functions/ckeditor.h ../../functions/cp.h editticket.o: ../../functions/default.h ../../functions/download.h editticket.o: ../../functions/emacs.h ../../functions/last.h @@ -120,18 +121,18 @@ funticket.o: ../../notify/notifythread.h ../../core/basethread.h funticket.o: ../../core/synchro.h ../../notify/templatesnotify.h funticket.o: ../../core/config.h ../../core/users.h ../../core/user.h funticket.o: ../../core/ugcontainer.h ../../core/lastcontainer.h -funticket.o: ../../core/mounts.h ../../core/mount.h ../../core/error.h -funticket.o: ../../core/mountparser.h ../../core/config.h +funticket.o: ../../core/cur.h ../../core/session.h ../../core/error.h +funticket.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mounts.h +funticket.o: ../../core/mount.h ../../core/mountparser.h ../../core/config.h funticket.o: ../../core/confparser.h ../../core/htmlfilter.h funticket.o: ../../core/users.h ../../core/groups.h ../../core/group.h -funticket.o: ../../core/rebus.h ../../core/loadavg.h ../../core/thumb.h -funticket.o: ../../core/basethread.h ../../functions/functions.h -funticket.o: ../../functions/functionbase.h ../../functions/functionparser.h +funticket.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h +funticket.o: ../../functions/functions.h ../../functions/functionbase.h +funticket.o: ../../functions/functionparser.h ../../core/cur.h +funticket.o: ../../functions/adduser.h ../../functions/cat.h +funticket.o: ../../functions/chmod.h ../../functions/privchanger.h funticket.o: ../../core/request.h ../../core/requesttypes.h -funticket.o: ../../core/session.h ../../core/plugindata.h -funticket.o: ../../templates/htmltextstream.h ../../functions/adduser.h -funticket.o: ../../functions/cat.h ../../functions/chmod.h -funticket.o: ../../functions/privchanger.h ../../functions/chown.h +funticket.o: ../../templates/htmltextstream.h ../../functions/chown.h funticket.o: ../../functions/ckeditor.h ../../functions/cp.h funticket.o: ../../functions/default.h ../../functions/download.h funticket.o: ../../functions/emacs.h ../../functions/last.h @@ -173,38 +174,38 @@ init.o: ../../templates/htmltextstream.h ../../notify/notifythread.h init.o: ../../core/basethread.h ../../core/synchro.h init.o: ../../notify/templatesnotify.h ../../core/config.h ../../core/users.h init.o: ../../core/user.h ../../core/ugcontainer.h ../../core/lastcontainer.h -init.o: ../../core/mounts.h ../../core/mount.h ../../core/error.h -init.o: ../../core/mountparser.h ../../core/config.h ../../core/confparser.h -init.o: ../../core/htmlfilter.h ../../core/users.h ../../core/groups.h -init.o: ../../core/group.h ../../core/rebus.h ../../core/loadavg.h +init.o: ../../core/cur.h ../../core/session.h ../../core/error.h +init.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mounts.h +init.o: ../../core/mount.h ../../core/mountparser.h ../../core/config.h +init.o: ../../core/confparser.h ../../core/htmlfilter.h ../../core/users.h +init.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h init.o: ../../core/thumb.h ../../core/basethread.h init.o: ../../functions/functions.h ../../functions/functionbase.h -init.o: ../../functions/functionparser.h ../../core/request.h -init.o: ../../core/requesttypes.h ../../core/session.h -init.o: ../../core/plugindata.h ../../templates/htmltextstream.h +init.o: ../../functions/functionparser.h ../../core/cur.h init.o: ../../functions/adduser.h ../../functions/cat.h init.o: ../../functions/chmod.h ../../functions/privchanger.h -init.o: ../../functions/chown.h ../../functions/ckeditor.h -init.o: ../../functions/cp.h ../../functions/default.h -init.o: ../../functions/download.h ../../functions/emacs.h -init.o: ../../functions/last.h ../../functions/login.h -init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h -init.o: ../../functions/mkdir.h ../../functions/mv.h ../../functions/node.h -init.o: ../../functions/priv.h ../../functions/reload.h ../../functions/rm.h -init.o: ../../functions/run.h ../../functions/specialdefault.h -init.o: ../../functions/stat.h ../../functions/subject.h -init.o: ../../functions/template.h ../../functions/tinymce.h -init.o: ../../functions/uname.h ../../functions/upload.h -init.o: ../../functions/uptime.h ../../functions/who.h ../../functions/vim.h -init.o: ../../core/htmlfilter.h ../../functions/functionbase.h -init.o: ../../core/synchro.h editticket.h createticket.h showtickets.h -init.o: ../../core/log.h ../../core/plugin.h ../../core/pluginmsg.h -init.o: ../../core/system.h ../../core/sessionmanager.h -init.o: ../../core/sessioncontainer.h ../../templates/templates.h -init.o: ../../templates/patterncacher.h ../../templates/ckeditorgetparser.h -init.o: ../../core/httpsimpleparser.h ../../core/log.h -init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h -init.o: sessiondata.h ../../core/plugindata.h +init.o: ../../core/request.h ../../core/requesttypes.h +init.o: ../../templates/htmltextstream.h ../../functions/chown.h +init.o: ../../functions/ckeditor.h ../../functions/cp.h +init.o: ../../functions/default.h ../../functions/download.h +init.o: ../../functions/emacs.h ../../functions/last.h +init.o: ../../functions/login.h ../../functions/logout.h ../../functions/ln.h +init.o: ../../functions/ls.h ../../functions/mkdir.h ../../functions/mv.h +init.o: ../../functions/node.h ../../functions/priv.h +init.o: ../../functions/reload.h ../../functions/rm.h ../../functions/run.h +init.o: ../../functions/specialdefault.h ../../functions/stat.h +init.o: ../../functions/subject.h ../../functions/template.h +init.o: ../../functions/tinymce.h ../../functions/uname.h +init.o: ../../functions/upload.h ../../functions/uptime.h +init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h +init.o: ../../functions/functionbase.h ../../core/synchro.h editticket.h +init.o: createticket.h showtickets.h ../../core/log.h ../../core/plugin.h +init.o: ../../core/pluginmsg.h ../../core/system.h +init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h +init.o: ../../templates/templates.h ../../templates/patterncacher.h +init.o: ../../templates/ckeditorgetparser.h ../../core/httpsimpleparser.h +init.o: ../../core/log.h ../../templates/indexpatterns.h +init.o: ../../core/sessionmanager.h sessiondata.h ../../core/plugindata.h init.o: ../../plugins/thread/showthreads.h ../../plugins/thread/threadinfo.h init.o: ../../plugins/thread/thread.h ../../plugins/thread/pluginmsg.h sessiondata.o: sessiondata.h ../../core/plugindata.h ticket.h @@ -229,35 +230,37 @@ showtickets.o: ../../templates/htmltextstream.h ../../notify/notifythread.h showtickets.o: ../../core/basethread.h ../../core/synchro.h showtickets.o: ../../notify/templatesnotify.h ../../core/config.h showtickets.o: ../../core/users.h ../../core/user.h ../../core/ugcontainer.h -showtickets.o: ../../core/lastcontainer.h ../../core/mounts.h -showtickets.o: ../../core/mount.h ../../core/error.h ../../core/mountparser.h +showtickets.o: ../../core/lastcontainer.h ../../core/cur.h +showtickets.o: ../../core/session.h ../../core/error.h +showtickets.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mounts.h +showtickets.o: ../../core/mount.h ../../core/mountparser.h showtickets.o: ../../core/config.h ../../core/confparser.h showtickets.o: ../../core/htmlfilter.h ../../core/users.h ../../core/groups.h -showtickets.o: ../../core/group.h ../../core/rebus.h ../../core/loadavg.h -showtickets.o: ../../core/thumb.h ../../core/basethread.h -showtickets.o: ../../functions/functions.h ../../functions/functionbase.h -showtickets.o: ../../functions/functionparser.h ../../core/request.h -showtickets.o: ../../core/requesttypes.h ../../core/session.h -showtickets.o: ../../core/plugindata.h ../../templates/htmltextstream.h +showtickets.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h +showtickets.o: ../../core/basethread.h ../../functions/functions.h +showtickets.o: ../../functions/functionbase.h +showtickets.o: ../../functions/functionparser.h ../../core/cur.h showtickets.o: ../../functions/adduser.h ../../functions/cat.h showtickets.o: ../../functions/chmod.h ../../functions/privchanger.h -showtickets.o: ../../functions/chown.h ../../functions/ckeditor.h -showtickets.o: ../../functions/cp.h ../../functions/default.h -showtickets.o: ../../functions/download.h ../../functions/emacs.h -showtickets.o: ../../functions/last.h ../../functions/login.h -showtickets.o: ../../functions/logout.h ../../functions/ln.h -showtickets.o: ../../functions/ls.h ../../functions/mkdir.h -showtickets.o: ../../functions/mv.h ../../functions/node.h -showtickets.o: ../../functions/priv.h ../../functions/reload.h -showtickets.o: ../../functions/rm.h ../../functions/run.h -showtickets.o: ../../functions/specialdefault.h ../../functions/stat.h -showtickets.o: ../../functions/subject.h ../../functions/template.h -showtickets.o: ../../functions/tinymce.h ../../functions/uname.h -showtickets.o: ../../functions/upload.h ../../functions/uptime.h -showtickets.o: ../../functions/who.h ../../functions/vim.h -showtickets.o: ../../core/htmlfilter.h ../../functions/functionbase.h -showtickets.o: ../../core/synchro.h ../../plugins/thread/pluginmsg.h -showtickets.o: ../../core/plugin.h ../../core/pluginmsg.h ../../core/system.h +showtickets.o: ../../core/request.h ../../core/requesttypes.h +showtickets.o: ../../templates/htmltextstream.h ../../functions/chown.h +showtickets.o: ../../functions/ckeditor.h ../../functions/cp.h +showtickets.o: ../../functions/default.h ../../functions/download.h +showtickets.o: ../../functions/emacs.h ../../functions/last.h +showtickets.o: ../../functions/login.h ../../functions/logout.h +showtickets.o: ../../functions/ln.h ../../functions/ls.h +showtickets.o: ../../functions/mkdir.h ../../functions/mv.h +showtickets.o: ../../functions/node.h ../../functions/priv.h +showtickets.o: ../../functions/reload.h ../../functions/rm.h +showtickets.o: ../../functions/run.h ../../functions/specialdefault.h +showtickets.o: ../../functions/stat.h ../../functions/subject.h +showtickets.o: ../../functions/template.h ../../functions/tinymce.h +showtickets.o: ../../functions/uname.h ../../functions/upload.h +showtickets.o: ../../functions/uptime.h ../../functions/who.h +showtickets.o: ../../functions/vim.h ../../core/htmlfilter.h +showtickets.o: ../../functions/functionbase.h ../../core/synchro.h +showtickets.o: ../../plugins/thread/pluginmsg.h ../../core/plugin.h +showtickets.o: ../../core/pluginmsg.h ../../core/system.h showtickets.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h showtickets.o: ../../templates/templates.h ../../templates/patterncacher.h showtickets.o: ../../templates/ckeditorgetparser.h @@ -286,37 +289,36 @@ templates.o: ../../notify/notifythread.h ../../core/basethread.h templates.o: ../../core/synchro.h ../../notify/templatesnotify.h templates.o: ../../core/textstream.h ../../core/misc.h ../../core/config.h templates.o: ../../core/users.h ../../core/user.h ../../core/ugcontainer.h -templates.o: ../../core/lastcontainer.h ../../core/mounts.h -templates.o: ../../core/mount.h ../../core/error.h ../../core/mountparser.h +templates.o: ../../core/lastcontainer.h ../../core/cur.h ../../core/session.h +templates.o: ../../core/error.h ../../core/plugindata.h ../../core/rebus.h +templates.o: ../../core/mounts.h ../../core/mount.h ../../core/mountparser.h templates.o: ../../core/config.h ../../core/confparser.h templates.o: ../../core/htmlfilter.h ../../core/users.h ../../core/groups.h -templates.o: ../../core/group.h ../../core/rebus.h ../../core/loadavg.h -templates.o: ../../core/thumb.h ../../core/basethread.h -templates.o: ../../functions/functions.h ../../functions/functionbase.h -templates.o: ../../functions/functionparser.h ../../core/request.h -templates.o: ../../core/requesttypes.h ../../core/session.h -templates.o: ../../core/plugindata.h ../../templates/htmltextstream.h -templates.o: ../../functions/adduser.h ../../functions/cat.h +templates.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h +templates.o: ../../core/basethread.h ../../functions/functions.h +templates.o: ../../functions/functionbase.h ../../functions/functionparser.h +templates.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h templates.o: ../../functions/chmod.h ../../functions/privchanger.h -templates.o: ../../functions/chown.h ../../functions/ckeditor.h -templates.o: ../../functions/cp.h ../../functions/default.h -templates.o: ../../functions/download.h ../../functions/emacs.h -templates.o: ../../functions/last.h ../../functions/login.h -templates.o: ../../functions/logout.h ../../functions/ln.h -templates.o: ../../functions/ls.h ../../functions/mkdir.h -templates.o: ../../functions/mv.h ../../functions/node.h -templates.o: ../../functions/priv.h ../../functions/reload.h -templates.o: ../../functions/rm.h ../../functions/run.h -templates.o: ../../functions/specialdefault.h ../../functions/stat.h -templates.o: ../../functions/subject.h ../../functions/template.h -templates.o: ../../functions/tinymce.h ../../functions/uname.h -templates.o: ../../functions/upload.h ../../functions/uptime.h -templates.o: ../../functions/who.h ../../functions/vim.h -templates.o: ../../core/htmlfilter.h tdb.h ../../db/dbbase.h -templates.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h -templates.o: editticket.h ../../functions/functionbase.h ../../core/synchro.h -templates.o: createticket.h ../../core/misc.h ../../core/plugin.h -templates.o: ../../core/pluginmsg.h ../../core/system.h +templates.o: ../../core/request.h ../../core/requesttypes.h +templates.o: ../../templates/htmltextstream.h ../../functions/chown.h +templates.o: ../../functions/ckeditor.h ../../functions/cp.h +templates.o: ../../functions/default.h ../../functions/download.h +templates.o: ../../functions/emacs.h ../../functions/last.h +templates.o: ../../functions/login.h ../../functions/logout.h +templates.o: ../../functions/ln.h ../../functions/ls.h +templates.o: ../../functions/mkdir.h ../../functions/mv.h +templates.o: ../../functions/node.h ../../functions/priv.h +templates.o: ../../functions/reload.h ../../functions/rm.h +templates.o: ../../functions/run.h ../../functions/specialdefault.h +templates.o: ../../functions/stat.h ../../functions/subject.h +templates.o: ../../functions/template.h ../../functions/tinymce.h +templates.o: ../../functions/uname.h ../../functions/upload.h +templates.o: ../../functions/uptime.h ../../functions/who.h +templates.o: ../../functions/vim.h ../../core/htmlfilter.h tdb.h +templates.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h +templates.o: ../../core/error.h editticket.h ../../functions/functionbase.h +templates.o: ../../core/synchro.h createticket.h ../../core/misc.h +templates.o: ../../core/plugin.h ../../core/pluginmsg.h ../../core/system.h templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h templates.o: ../../templates/templates.h ../../templates/patterncacher.h templates.o: ../../templates/ckeditorgetparser.h @@ -344,35 +346,35 @@ ticketinfo.o: ../../core/basethread.h ../../core/synchro.h ticketinfo.o: ../../notify/templatesnotify.h ../../core/textstream.h ticketinfo.o: ../../core/misc.h ../../core/config.h ../../core/users.h ticketinfo.o: ../../core/user.h ../../core/ugcontainer.h -ticketinfo.o: ../../core/lastcontainer.h ../../core/mounts.h -ticketinfo.o: ../../core/mount.h ../../core/error.h ../../core/mountparser.h -ticketinfo.o: ../../core/config.h ../../core/confparser.h -ticketinfo.o: ../../core/htmlfilter.h ../../core/users.h ../../core/groups.h -ticketinfo.o: ../../core/group.h ../../core/rebus.h ../../core/loadavg.h -ticketinfo.o: ../../core/thumb.h ../../core/basethread.h +ticketinfo.o: ../../core/lastcontainer.h ../../core/cur.h +ticketinfo.o: ../../core/session.h ../../core/error.h ../../core/plugindata.h +ticketinfo.o: ../../core/rebus.h ../../core/mounts.h ../../core/mount.h +ticketinfo.o: ../../core/mountparser.h ../../core/config.h +ticketinfo.o: ../../core/confparser.h ../../core/htmlfilter.h +ticketinfo.o: ../../core/users.h ../../core/groups.h ../../core/group.h +ticketinfo.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h ticketinfo.o: ../../functions/functions.h ../../functions/functionbase.h -ticketinfo.o: ../../functions/functionparser.h ../../core/request.h -ticketinfo.o: ../../core/requesttypes.h ../../core/session.h -ticketinfo.o: ../../core/plugindata.h ../../templates/htmltextstream.h +ticketinfo.o: ../../functions/functionparser.h ../../core/cur.h ticketinfo.o: ../../functions/adduser.h ../../functions/cat.h ticketinfo.o: ../../functions/chmod.h ../../functions/privchanger.h -ticketinfo.o: ../../functions/chown.h ../../functions/ckeditor.h -ticketinfo.o: ../../functions/cp.h ../../functions/default.h -ticketinfo.o: ../../functions/download.h ../../functions/emacs.h -ticketinfo.o: ../../functions/last.h ../../functions/login.h -ticketinfo.o: ../../functions/logout.h ../../functions/ln.h -ticketinfo.o: ../../functions/ls.h ../../functions/mkdir.h -ticketinfo.o: ../../functions/mv.h ../../functions/node.h -ticketinfo.o: ../../functions/priv.h ../../functions/reload.h -ticketinfo.o: ../../functions/rm.h ../../functions/run.h -ticketinfo.o: ../../functions/specialdefault.h ../../functions/stat.h -ticketinfo.o: ../../functions/subject.h ../../functions/template.h -ticketinfo.o: ../../functions/tinymce.h ../../functions/uname.h -ticketinfo.o: ../../functions/upload.h ../../functions/uptime.h -ticketinfo.o: ../../functions/who.h ../../functions/vim.h -ticketinfo.o: ../../core/htmlfilter.h tdb.h ../../db/dbbase.h -ticketinfo.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h -ticketinfo.o: ../../core/log.h ../../core/misc.h sessiondata.h -ticketinfo.o: ../../core/plugindata.h +ticketinfo.o: ../../core/request.h ../../core/requesttypes.h +ticketinfo.o: ../../templates/htmltextstream.h ../../functions/chown.h +ticketinfo.o: ../../functions/ckeditor.h ../../functions/cp.h +ticketinfo.o: ../../functions/default.h ../../functions/download.h +ticketinfo.o: ../../functions/emacs.h ../../functions/last.h +ticketinfo.o: ../../functions/login.h ../../functions/logout.h +ticketinfo.o: ../../functions/ln.h ../../functions/ls.h +ticketinfo.o: ../../functions/mkdir.h ../../functions/mv.h +ticketinfo.o: ../../functions/node.h ../../functions/priv.h +ticketinfo.o: ../../functions/reload.h ../../functions/rm.h +ticketinfo.o: ../../functions/run.h ../../functions/specialdefault.h +ticketinfo.o: ../../functions/stat.h ../../functions/subject.h +ticketinfo.o: ../../functions/template.h ../../functions/tinymce.h +ticketinfo.o: ../../functions/uname.h ../../functions/upload.h +ticketinfo.o: ../../functions/uptime.h ../../functions/who.h +ticketinfo.o: ../../functions/vim.h ../../core/htmlfilter.h tdb.h +ticketinfo.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h +ticketinfo.o: ../../core/error.h ../../core/log.h ../../core/misc.h +ticketinfo.o: sessiondata.h ../../core/plugindata.h ticketparser.o: ticketparser.h ticketconf.h ../../core/log.h ticketparser.o: ../../core/misc.h diff --git a/plugins/ticket/createticket.cpp b/plugins/ticket/createticket.cpp index ff039f6..257704b 100755 --- a/plugins/ticket/createticket.cpp +++ b/plugins/ticket/createticket.cpp @@ -40,7 +40,7 @@ void CreateTicket::SetTicketInfo(TicketInfo * pinfo) bool CreateTicket::HasAccess() { - if( request->is_item || !system->HasWriteAccess(*request->dir_tab.back()) ) + if( cur->request->is_item || !system->HasWriteAccess(*cur->request->dir_tab.back()) ) return false; if( !system->mounts.pmount || system->mounts.pmount->type != ticket_info->mount_type_ticket ) @@ -54,9 +54,9 @@ return true; void CreateTicket::AddTicket(Ticket & ticket, Item & item) { ticket.file_id = item.id; - request->status = tdb->AddTicket(ticket); + cur->request->status = tdb->AddTicket(ticket); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) { // sending notification notify_msg.code = WINIX_NOTIFY_CODE_USER1; @@ -80,15 +80,15 @@ void CreateTicket::Submit(Ticket & ticket, Item & item) functions->SetUser(item); item.privileges = 0644; // !! tymczasowo - item.parent_id = request->dir_tab.back()->id; + item.parent_id = cur->request->dir_tab.back()->id; // adding without notificating - request->status = system->AddFile(item, false); + cur->request->status = system->AddFile(item, false); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) AddTicket(ticket, item); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) { log << log2 << "CreateTicket: added a new ticket" << logend; RemoveTicket(); @@ -97,7 +97,7 @@ void CreateTicket::Submit(Ticket & ticket, Item & item) else { log << log1 << "CreateTicket: problem with adding a new ticket, error code: " - << request->status << logend; + << cur->request->status << logend; } } @@ -106,9 +106,9 @@ void CreateTicket::Submit(Ticket & ticket, Item & item) void CreateTicket::RemoveTicket() { SessionData * session_data = reinterpret_cast( - request->session->plugin_data.Get(ticket_info->plugin_id) ); + cur->session->plugin_data.Get(ticket_info->plugin_id) ); - long dir_id = request->dir_tab.back()->id; + long dir_id = cur->request->dir_tab.back()->id; session_data->create_ticket_map.erase(dir_id); } @@ -117,9 +117,9 @@ void CreateTicket::RemoveTicket() Ticket & CreateTicket::PrepareTicket() { SessionData * session_data = reinterpret_cast( - request->session->plugin_data.Get(ticket_info->plugin_id) ); + cur->session->plugin_data.Get(ticket_info->plugin_id) ); - long dir_id = request->dir_tab.back()->id; + long dir_id = cur->request->dir_tab.back()->id; Ticket & ticket = session_data->GetTicket(dir_id, session_data->create_ticket_map); return ticket; @@ -133,13 +133,13 @@ void CreateTicket::MakePost() ticket_info->FindCurrentConf(); Ticket & ticket = PrepareTicket(); - Item & item = request->item; + Item & item = cur->request->item; ticket_info->ticket = &ticket; ticket_info->ReadTicketParams(ticket, false); functions->ReadItem(item, Item::file); - if( !request->IsPostVar(L"fileuploadsubmit") ) + if( !cur->request->IsPostVar(L"fileuploadsubmit") ) Submit(ticket, item); } diff --git a/plugins/ticket/editticket.cpp b/plugins/ticket/editticket.cpp index 6429465..4394f04 100755 --- a/plugins/ticket/editticket.cpp +++ b/plugins/ticket/editticket.cpp @@ -41,10 +41,10 @@ bool EditTicket::HasAccess() { // not logged users cannot edit tickets // !! we are waiting for the sticky bit - if( !request->session->puser ) + if( !cur->session->puser ) return false; - if( !request->is_item || !system->HasWriteAccess(request->item) ) + if( !cur->request->is_item || !system->HasWriteAccess(cur->request->item) ) return false; if( !system->mounts.pmount || system->mounts.pmount->type != ticket_info->mount_type_ticket ) @@ -58,9 +58,9 @@ return true; void EditTicket::ChangeTicket(Ticket & ticket, Item & item) { - request->status = tdb->RemoveAddTicket(ticket); + cur->request->status = tdb->RemoveAddTicket(ticket); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) { // sending notification /* @@ -83,12 +83,12 @@ void EditTicket::Submit(Ticket & ticket, Item & item) return; // adding without notificating - request->status = system->EditFile(item, old_url != item.url); + cur->request->status = system->EditFile(item, old_url != item.url); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) ChangeTicket(ticket, item); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) { log << log2 << "EditTicket: ticket modified" << logend; RemoveTicket(); @@ -97,7 +97,7 @@ void EditTicket::Submit(Ticket & ticket, Item & item) else { log << log1 << "EditTicket: problem with editing a ticket, error code: " - << request->status << logend; + << cur->request->status << logend; } } @@ -107,9 +107,9 @@ void EditTicket::Submit(Ticket & ticket, Item & item) void EditTicket::RemoveTicket() { SessionData * session_data = reinterpret_cast( - request->session->plugin_data.Get(ticket_info->plugin_id) ); + cur->session->plugin_data.Get(ticket_info->plugin_id) ); - long file_id = request->item.id; + long file_id = cur->request->item.id; session_data->create_ticket_map.erase(file_id); session_data->new_file_map.erase(file_id); } @@ -119,10 +119,10 @@ void EditTicket::RemoveTicket() Ticket & EditTicket::PrepareTicket() { SessionData * session_data = reinterpret_cast( - request->session->plugin_data.Get(ticket_info->plugin_id) ); + cur->session->plugin_data.Get(ticket_info->plugin_id) ); bool is_new; - long file_id = request->item.id; + long file_id = cur->request->item.id; Ticket & ticket = session_data->GetTicket(file_id, session_data->edit_ticket_map, &is_new); if( is_new ) @@ -138,9 +138,9 @@ return ticket; std::vector & EditTicket::PrepareFileMap() { SessionData * session_data = reinterpret_cast( - request->session->plugin_data.Get(ticket_info->plugin_id) ); + cur->session->plugin_data.Get(ticket_info->plugin_id) ); - long file_id = request->item.id; + long file_id = cur->request->item.id; std::vector & file_map = session_data->GetFileTab(file_id, session_data->new_file_map); return file_map; @@ -152,7 +152,7 @@ void EditTicket::MakePost() ticket_info->FindCurrentConf(); Ticket & ticket = PrepareTicket(); - Item & item = request->item; + Item & item = cur->request->item; old_url = item.url; std::vector & file_map = PrepareFileMap(); ticket_info->ticket = &ticket; @@ -160,7 +160,7 @@ void EditTicket::MakePost() ticket_info->ReadTicketParams(ticket, false, &file_map); functions->ReadItem(item, Item::file); - if( !request->IsPostVar(L"fileuploadsubmit") ) + if( !cur->request->IsPostVar(L"fileuploadsubmit") ) Submit(ticket, item); } diff --git a/plugins/ticket/funticket.cpp b/plugins/ticket/funticket.cpp index d57d81e..84f2066 100755 --- a/plugins/ticket/funticket.cpp +++ b/plugins/ticket/funticket.cpp @@ -38,7 +38,7 @@ void FunTicket::SetTicketInfo(TicketInfo * pinfo) bool FunTicket::HasAccess() { - return request->is_item && system->HasReadAccess(request->item); + return cur->request->is_item && system->HasReadAccess(cur->request->item); } @@ -48,9 +48,9 @@ void FunTicket::MakeGet() ticket_info->FindCurrentConf(); ticket_info->ticket = &ticket; - tdb->GetTicket(request->item.id, ticket); + tdb->GetTicket(cur->request->item.id, ticket); - plugin.Call(WINIX_PL_THREAD_PREPARE_THREAD, request->item.id); + plugin.Call(WINIX_PL_THREAD_PREPARE_THREAD, cur->request->item.id); } diff --git a/plugins/ticket/init.cpp b/plugins/ticket/init.cpp index 094fdc1..bb1c3db 100755 --- a/plugins/ticket/init.cpp +++ b/plugins/ticket/init.cpp @@ -49,10 +49,10 @@ void SelectDefaultFunction(PluginInfo & info) { if( info.system->mounts.pmount->type == ticket_info.mount_type_ticket ) { - if( info.request->is_item ) - info.request->function = &fun_ticket; + if( info.cur->request->is_item ) + info.cur->request->function = &fun_ticket; else - info.request->function = &fun_show_tickets; + info.cur->request->function = &fun_show_tickets; } } @@ -76,9 +76,9 @@ void FstabChanged(PluginInfo & info) void ProcessRequest(PluginInfo & info) { - if( info.request->function == &info.functions->fun_reload ) + if( info.cur->request->function == &info.functions->fun_reload ) { - if( info.request->IsParam(L"tickets") ) + if( info.cur->request->IsParam(L"tickets") ) ticket_info.ReadTicketConf(); } } @@ -107,7 +107,7 @@ void AddNotifyTemplate(PluginInfo & info) void CreateSession(PluginInfo & info) { SessionData * p = new SessionData(); - info.request->session->plugin_data.Assign(p); + info.cur->session->plugin_data.Assign(p); log << log4 << "Ticket: created ticket plugin data: " << (void*)p << logend; } @@ -158,7 +158,7 @@ using namespace Ticket; ticket_info.SetTDb(&tdb); ticket_info.SetConfig(info.config); ticket_info.SetSystem(info.system); - ticket_info.SetRequest(info.request); + ticket_info.SetCur(info.cur); ticket_info.SetFunctions(info.functions); ticket_info.plugin_id = info.plugin_id; diff --git a/plugins/ticket/showtickets.cpp b/plugins/ticket/showtickets.cpp index 4529c7f..2c98b4e 100755 --- a/plugins/ticket/showtickets.cpp +++ b/plugins/ticket/showtickets.cpp @@ -41,7 +41,7 @@ void ShowTickets::SetTicketInfo(TicketInfo * pinfo) bool ShowTickets::HasAccess() { - return !request->is_item; + return !cur->request->is_item; } @@ -82,7 +82,7 @@ void ShowTickets::ReadFiles() iq.sel_guest_name = true; iq.sel_privileges = true; iq.sel_date = true; - iq.WhereParentId(request->dir_tab.back()->id); + iq.WhereParentId(cur->request->dir_tab.back()->id); iq.WhereType(Item::file); iq.WhereFileType(WINIX_ITEM_FILETYPE_NONE); @@ -118,7 +118,7 @@ void ShowTickets::SortPointers() { int sort_type = 1; - if( request->ParamValue(L"sort") == L"url" ) + if( cur->request->ParamValue(L"sort") == L"url" ) sort_type = 0; std::vector & table = ticket_info->item_sort_tab; diff --git a/plugins/ticket/ticketconf.cpp b/plugins/ticket/ticketconf.cpp index 976c1b5..8c62a84 100755 --- a/plugins/ticket/ticketconf.cpp +++ b/plugins/ticket/ticketconf.cpp @@ -1,3 +1,12 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2010, Tomasz Sowa + * All rights reserved. + * + */ + #include #include "ticketconf.h" diff --git a/plugins/ticket/ticketconf.h b/plugins/ticket/ticketconf.h index 156a77d..2c1bf47 100755 --- a/plugins/ticket/ticketconf.h +++ b/plugins/ticket/ticketconf.h @@ -1,3 +1,12 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2010, Tomasz Sowa + * All rights reserved. + * + */ + #ifndef headerfile_winix_plugins_ticket_ticketconf #define headerfile_winix_plugins_ticket_ticketconf diff --git a/plugins/ticket/ticketinfo.cpp b/plugins/ticket/ticketinfo.cpp index 513b847..58938bf 100755 --- a/plugins/ticket/ticketinfo.cpp +++ b/plugins/ticket/ticketinfo.cpp @@ -51,9 +51,9 @@ void TicketInfo::SetSystem(System * psystem) } -void TicketInfo::SetRequest(Request * prequest) +void TicketInfo::SetCur(Cur * pcur) { - request = prequest; + cur = pcur; } @@ -299,7 +299,7 @@ bool add = false; functions->SetUser(file); functions->fun_upload.UploadFile(file, value.tmp_filename); - if( request->status == WINIX_ERR_OK ) + if( cur->request->status == WINIX_ERR_OK ) { add = true; system->MakePath(file, par.str_value); @@ -409,13 +409,13 @@ PostFileTab::iterator i2; if( clear_ticket ) ticket.Clear(); - for(i=request->post_tab.begin() ; i!=request->post_tab.end() ; ++i) + for(i=cur->request->post_tab.begin() ; i!=cur->request->post_tab.end() ; ++i) { if( IsSubString(config->ticket_form_prefix, i->first) ) ReadTicketParam(ticket, Toi(i->first.c_str() + config->ticket_form_prefix.size()), i->second); } - for(i2=request->post_file_tab.begin() ; i2!=request->post_file_tab.end() ; ++i2) + for(i2=cur->request->post_file_tab.begin() ; i2!=cur->request->post_file_tab.end() ; ++i2) { if( IsSubString(config->ticket_form_prefix, i2->first) ) ReadTicketParam(ticket, Toi(i2->first.c_str() + config->ticket_form_prefix.size()), i2->second, file_map); diff --git a/plugins/ticket/ticketinfo.h b/plugins/ticket/ticketinfo.h index 853526d..83b4d50 100755 --- a/plugins/ticket/ticketinfo.h +++ b/plugins/ticket/ticketinfo.h @@ -49,7 +49,7 @@ public: void SetDb(Db * pdb); void SetConfig(Config * pconfig); void SetSystem(System * psystem); - void SetRequest(Request * prequest); + void SetCur(Cur * pcur); void SetFunctions(Functions * pfunctions); void Clear(); @@ -99,7 +99,7 @@ private: TDb * tdb; Config * config; System * system; - Request * request; + Cur * cur; Functions * functions; // for reading parameters diff --git a/plugins/ticket/ticketparser.cpp b/plugins/ticket/ticketparser.cpp index df0a0b7..610a3cb 100755 --- a/plugins/ticket/ticketparser.cpp +++ b/plugins/ticket/ticketparser.cpp @@ -1,3 +1,12 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2010, Tomasz Sowa + * All rights reserved. + * + */ + #include "ticketparser.h" #include "core/log.h" #include "core/misc.h" diff --git a/plugins/ticket/ticketparser.h b/plugins/ticket/ticketparser.h index da2b9d7..008eaaf 100755 --- a/plugins/ticket/ticketparser.h +++ b/plugins/ticket/ticketparser.h @@ -1,3 +1,12 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2010, Tomasz Sowa + * All rights reserved. + * + */ + #ifndef headerfile_winix_plugins_ticket_ticketparser #define headerfile_winix_plugins_ticket_ticketparser diff --git a/templates/Makefile.dep b/templates/Makefile.dep index ef742b3..cc7ffaa 100755 --- a/templates/Makefile.dep +++ b/templates/Makefile.dep @@ -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 diff --git a/templates/adduser.cpp b/templates/adduser.cpp index 4538f24..794b2a8 100755 --- a/templates/adduser.cpp +++ b/templates/adduser.cpp @@ -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"); } diff --git a/templates/ckeditorgetparser.h b/templates/ckeditorgetparser.h index 17ead27..464748d 100755 --- a/templates/ckeditorgetparser.h +++ b/templates/ckeditorgetparser.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslutemplatesckeditorgetparser -#define headerfilecmslutemplatesckeditorgetparser +#ifndef headerfile_winix_templates_ckeditorgetparser +#define headerfile_winix_templates_ckeditorgetparser #include diff --git a/templates/dir.cpp b/templates/dir.cpp index 9a7e779..dbf898d 100755 --- a/templates/dir.cpp +++ b/templates/dir.cpp @@ -19,18 +19,18 @@ namespace TemplatesFunctions void dir(Info & i) { - for(size_t a=0 ; adir_tab.size() ; ++a) - i.out << request->dir_tab[a]->url << '/'; + for(size_t a=0 ; arequest->dir_tab.size() ; ++a) + i.out << cur->request->dir_tab[a]->url << '/'; } void dir_without_slash(Info & i) { - for(size_t a=0 ; adir_tab.size() ; ++a) + for(size_t a=0 ; arequest->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 ; adir_tab.size()-1 ; ++a) + for(size_t a=0 ; arequest->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 ; adir_tab.size()-1 ; ++a) + for(size_t a=0 ; arequest->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 && adir_tab.size()-2 ) + if( cur->request->dir_tab.size()>=2 && arequest->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 ; adir_tab.size() ; ++a) + for(size_t a=0 ; arequest->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 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(); } diff --git a/templates/doc.cpp b/templates/doc.cpp index bbed535..efb3f48 100755 --- a/templates/doc.cpp +++ b/templates/doc.cpp @@ -27,21 +27,21 @@ void doc_title(Info & i) bool was_dir = false; // from 1 means skipping the root directory - for(a = 1 ; adir_tab.size() ; ++a) + for(a = 1 ; arequest->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; } diff --git a/templates/indexpatterns.h b/templates/indexpatterns.h index f82222b..008435b 100755 --- a/templates/indexpatterns.h +++ b/templates/indexpatterns.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslutemplatesindexpatterns -#define headerfilecmslutemplatesindexpatterns +#ifndef headerfile_winix_templates_indexpatterns +#define headerfile_winix_templates_indexpatterns #include #include diff --git a/templates/item.cpp b/templates/item.cpp index afc9915..3092c47 100755 --- a/templates/item.cpp +++ b/templates/item.cpp @@ -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 << ""; 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; } diff --git a/templates/last.cpp b/templates/last.cpp index f10d8b4..54b8c85 100755 --- a/templates/last.cpp +++ b/templates/last.cpp @@ -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(); } diff --git a/templates/locale.h b/templates/locale.h index a25b832..4cfca0b 100755 --- a/templates/locale.h +++ b/templates/locale.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslucorelocale -#define headerfilecmslucorelocale +#ifndef headerfile_winix_templates_locale +#define headerfile_winix_templates_locale #include #include diff --git a/templates/localefilter.h b/templates/localefilter.h index d741323..8857c02 100755 --- a/templates/localefilter.h +++ b/templates/localefilter.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslutemplateslocalefilter -#define headerfilecmslutemplateslocalefilter +#ifndef headerfile_winix_templates_localefilter +#define headerfile_winix_templates_localefilter #include "locale.h" diff --git a/templates/ls.cpp b/templates/ls.cpp index 371add0..ee9a69f 100755 --- a/templates/ls.cpp +++ b/templates/ls.cpp @@ -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(); } diff --git a/templates/misc.cpp b/templates/misc.cpp index 4ca019d..77e8793 100755 --- a/templates/misc.cpp +++ b/templates/misc.cpp @@ -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 '?' } } diff --git a/templates/misc.h b/templates/misc.h index f3e1973..c767004 100755 --- a/templates/misc.h +++ b/templates/misc.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslutemplatesmisc -#define headerfilecmslutemplatesmisc +#ifndef headerfile_winix_templates_misc +#define headerfile_winix_templates_misc #include diff --git a/templates/patterncacher.cpp b/templates/patterncacher.cpp index 8e714d2..23f2de6 100755 --- a/templates/patterncacher.cpp +++ b/templates/patterncacher.cpp @@ -8,7 +8,7 @@ */ #include "patterncacher.h" -#include "../core/log.h" +#include "core/log.h" diff --git a/templates/patterncacher.h b/templates/patterncacher.h index 1eaaf01..338605d 100755 --- a/templates/patterncacher.h +++ b/templates/patterncacher.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslutemplatespatterncacher -#define headerfilecmslutemplatespatterncacher +#ifndef headerfile_winix_templates_patterncacher +#define headerfile_winix_templates_patterncacher #include #include diff --git a/templates/priv.cpp b/templates/priv.cpp index b574536..976fc9e 100755 --- a/templates/priv.cpp +++ b/templates/priv.cpp @@ -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 ; iusers.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 ; igroups.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 ; isession->puser->groups.size() ; ++i) + for(size_t i=0 ; isession->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); } diff --git a/templates/rebus.cpp b/templates/rebus.cpp index 3d4e905..62599c9 100755 --- a/templates/rebus.cpp +++ b/templates/rebus.cpp @@ -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; } diff --git a/templates/stat.cpp b/templates/stat.cpp index 7fccfb1..d1229ed 100755 --- a/templates/stat.cpp +++ b/templates/stat.cpp @@ -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(); } diff --git a/templates/template.cpp b/templates/template.cpp index dff5074..8c0aefa 100755 --- a/templates/template.cpp +++ b/templates/template.cpp @@ -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(); } diff --git a/templates/templates.cpp b/templates/templates.cpp index e1acf56..1cec844 100755 --- a/templates/templates.cpp +++ b/templates/templates.cpp @@ -31,9 +31,9 @@ CKEditorGetParser ckeditor_getparser; std::vector 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(locale.GetLang()); - const size_t fun_id = static_cast(request->function->id); + const size_t fun_id = static_cast(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; diff --git a/templates/templates.h b/templates/templates.h index 0fedaaf..34ee117 100755 --- a/templates/templates.h +++ b/templates/templates.h @@ -7,8 +7,8 @@ * */ -#ifndef headerfilecmslutemplatestemplates -#define headerfilecmslutemplatestemplates +#ifndef headerfile_winix_templates_templates +#define headerfile_winix_templates_templates #include #include @@ -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); diff --git a/templates/upload.cpp b/templates/upload.cpp index 9f2d0e8..b40c64b 100755 --- a/templates/upload.cpp +++ b/templates/upload.cpp @@ -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(); } diff --git a/templates/user.cpp b/templates/user.cpp index e3e1e26..3327fb2 100755 --- a/templates/user.cpp +++ b/templates/user.cpp @@ -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 ; agroups.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 ; agroups.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); } diff --git a/templates/who.cpp b/templates/who.cpp index fdf9484..c0322e9 100755 --- a/templates/who.cpp +++ b/templates/who.cpp @@ -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; } diff --git a/templates/winix.cpp b/templates/winix.cpp index 90c0dd1..da53508 100755 --- a/templates/winix.cpp +++ b/templates/winix.cpp @@ -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); }