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

changed: added Cur structure

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


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



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

32
plugins/stats/Makefile.dep
View File

@@ -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

23
plugins/stats/init.cpp
View File

@@ -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<StatsSession*>(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;
}

183
plugins/thread/Makefile.dep
View File

@@ -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

28
plugins/thread/createthread.cpp
View File

@@ -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;
}
}

8
plugins/thread/funthread.cpp
View File

@@ -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);
}

6
plugins/thread/init.cpp
View File

@@ -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;
}
}

22
plugins/thread/reply.cpp
View File

@@ -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;
}
}

6
plugins/thread/showthreads.cpp
View File

@@ -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<Item*> & table = thread_info->item_sort_tab;

24
plugins/thread/templates.h
View File

@@ -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

304
plugins/ticket/Makefile.dep
View File

@@ -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

28
plugins/ticket/createticket.cpp
View File

@@ -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<SessionData*>(
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<SessionData*>(
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);
}

32
plugins/ticket/editticket.cpp
View File

@@ -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<SessionData*>(
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<SessionData*>(
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<long> & EditTicket::PrepareFileMap()
{
SessionData * session_data = reinterpret_cast<SessionData*>(
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<long> & 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<long> & 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);
}

6
plugins/ticket/funticket.cpp
View File

@@ -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);
}

14
plugins/ticket/init.cpp
View File

@@ -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;

6
plugins/ticket/showtickets.cpp
View File

@@ -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<Item*> & table = ticket_info->item_sort_tab;

9
plugins/ticket/ticketconf.cpp
View File

@@ -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 <limits>
#include "ticketconf.h"

9
plugins/ticket/ticketconf.h
View File

@@ -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

10
plugins/ticket/ticketinfo.cpp
View File

@@ -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);

4
plugins/ticket/ticketinfo.h
View File

@@ -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

9
plugins/ticket/ticketparser.cpp
View File

@@ -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"

9
plugins/ticket/ticketparser.h
View File

@@ -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