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

removed: Done class (core/done.h, core/done.cpp)

Browse Source 
removed: from Session: done, done_status, timers



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@594 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2010-02-28 21:33:06 +00:00
parent 71a63cc70e
commit ebd868fa33
128 changed files with 387 additions and 915 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
content/createticket.cpp
View File

@@ -2,7 +2,7 @@
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2008-2009, Tomasz Sowa
* Copyright (c) 2008-2010, Tomasz Sowa
* All rights reserved.
*
*/
@@ -32,14 +32,11 @@ return true;
bool Content::FunCreateTicketCheckAbuse(const Done & done)
bool Content::FunCreateTicketCheckAbuse()
{
if( !CheckRebus() )
{
request.status = WINIX_ERR_INCORRECT_REBUS;
request.session->done = done;
request.session->done_status = WINIX_ERR_INCORRECT_REBUS;
return false;
}
@@ -48,9 +45,6 @@ bool Content::FunCreateTicketCheckAbuse(const Done & done)
if( request.session->spam_score > 0 )
{
request.status = WINIX_ERR_SPAM;
request.session->done = done;
request.session->done_status = WINIX_ERR_SPAM;
log << log1 << "Content: ignoring due to suspected spamming" << logend;
return false;
}
@@ -162,23 +156,21 @@ void Content::AddTicket()
request.ticket.dir_id = request.dir_table.back()->id; // a new directory created by Mkdir()
request.ticket.item_id = request.item.id; // this id is set by PostFunEmacsAdd()
request.session->done_status = db.AddTicket(request.ticket);
request.status = db.AddTicket(request.ticket);
}
void Content::PostFunCreateTicketLogAndRedirect()
{
if( request.session->done_status == WINIX_ERR_OK )
if( request.status == WINIX_ERR_OK )
{
request.session->done = Done::added_ticket;
log << log2 << "Content: added a new ticket" << logend;
RedirectToLastDir();
}
else
{
log << log1 << "Content: problem with adding a new ticket, error code:"
<< request.session->done_status << logend;
log << log1 << "Content: problem with adding a new ticket, error code: "
<< request.status << logend;
}
}
@@ -193,7 +185,7 @@ void Content::PostFunCreateTicket()
ReadTicket(request.ticket);
request.item.privileges = 0777; // !! tymczasowo 777 aby wszyscy mogli wysylac posty
if( !FunCreateTicketCheckAbuse(Done::added_ticket) )
if( !FunCreateTicketCheckAbuse() )
{
ReadItemContentWithType(request.item); // for correctly displaying the form
return;
@@ -201,7 +193,7 @@ void Content::PostFunCreateTicket()
Mkdir(request.item, true);
if( request.session->done_status == WINIX_ERR_OK )
if( request.status == WINIX_ERR_OK )
{
ReadItemContentWithType(request.item);
request.item.type = Item::file;
@@ -209,7 +201,7 @@ void Content::PostFunCreateTicket()
request.item.parent_id = request.dir_table.back()->id;
PostFunEmacsAdd();
if( request.session->done_status == WINIX_ERR_OK )
if( request.status == WINIX_ERR_OK )
AddTicket();
}