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

rm function can remove tickets now 

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@667 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa 2010-10-23 23:51:44 +00:00
parent c48241f78a
commit 149fd1629f
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/app.cpp
View File

@ -324,7 +324,7 @@ bool sent = false;
} }
// zmienic nazwe np na ProcessRequest
void App::Make() void App::Make()
{ {
if( request.dir_tab.empty() ) if( request.dir_tab.empty() )
@ -336,6 +336,8 @@ void App::Make()
// request.status can be changed by function_parser // request.status can be changed by function_parser
if( request.status == WINIX_ERR_OK ) if( request.status == WINIX_ERR_OK )
{ {
plugin.Call(WINIX_PREPARE_REQUEST);
if( system.DirsHaveReadExecPerm() ) if( system.DirsHaveReadExecPerm() )
{ {
if( request.method == Request::post ) if( request.method == Request::post )
@ -354,6 +356,9 @@ void App::Make()
if( request.IsParam("noredirect") ) if( request.IsParam("noredirect") )
request.redirect_to.clear(); request.redirect_to.clear();
if( request.status == WINIX_ERR_OK )
plugin.Call(WINIX_PROCESS_REQUEST);
if( !request.redirect_to.empty() ) if( !request.redirect_to.empty() )
return; return;

14
core/pluginmsg.h
View File

@ -15,9 +15,21 @@
// PluginInfo.p1 is a pointer to Ezc::Functions object // PluginInfo.p1 is a pointer to Ezc::Functions object
#define WINIX_TEMPLATES_CREATEFUNCTIONS 999 #define WINIX_TEMPLATES_CREATEFUNCTIONS 999
// winix function and parameters have been parsed
// the request.status is OK
// (the winix function was not called yet)
#define WINIX_PREPARE_REQUEST 2000
#define WINIX_CONTENT_MAKE 2000 // post and get functions have done their jobs
// now you can act
// this is called only if the request.status is OK
#define WINIX_PROCESS_REQUEST 2001
// prepere your content for displaying
// this is called after WINIX_PROCESS_REQUEST
// and when there is not a redirect
// request.status is not checked here
#define WINIX_CONTENT_MAKE 2002
// here you can attach your own session data (based on PluginDataBase class) // here you can attach your own session data (based on PluginDataBase class)
// call request.session->plugin_data.Assign(pointer) // call request.session->plugin_data.Assign(pointer)

11
plugins/ticket/init.cpp
View File

@ -79,7 +79,7 @@ void FstabChanged(PluginInfo & info)
} }
void ContentMake(PluginInfo & info) void ProcessRequest(PluginInfo & info)
{ {
if( info.request->function == &info.functions->fun_reload ) if( info.request->function == &info.functions->fun_reload )
{ {
@ -89,6 +89,12 @@ void ContentMake(PluginInfo & info)
} }
void RemoveTicket(PluginInfo & i)
{
tdb.RemoveTicket(i.l1);
}
void InitTicket(PluginInfo & info) void InitTicket(PluginInfo & info)
{ {
ticket_info.progress_prefix = info.config->Text("ticket_form_progress_prefix", "progress"); ticket_info.progress_prefix = info.config->Text("ticket_form_progress_prefix", "progress");
@ -110,7 +116,8 @@ using namespace Ticket;
plugin.Assign(WINIX_SELECT_DEFAULT_FUNCTION, SelectDefaultFunction); plugin.Assign(WINIX_SELECT_DEFAULT_FUNCTION, SelectDefaultFunction);
plugin.Assign(WINIX_ADD_MOUNTS, AddMounts); plugin.Assign(WINIX_ADD_MOUNTS, AddMounts);
plugin.Assign(WINIX_FSTAB_CHANGED, FstabChanged); plugin.Assign(WINIX_FSTAB_CHANGED, FstabChanged);
plugin.Assign(WINIX_CONTENT_MAKE, ContentMake); plugin.Assign(WINIX_PROCESS_REQUEST, ProcessRequest);
plugin.Assign(WINIX_DIR_REMOVED, RemoveTicket);
tdb.SetConn(info.db->GetConn()); tdb.SetConn(info.db->GetConn());
tdb.LogQueries(info.config->log_db_query); tdb.LogQueries(info.config->log_db_query);