removed: Done class (core/done.h, core/done.cpp)
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:
@@ -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.
|
||||
*
|
||||
*/
|
||||
@@ -36,9 +36,6 @@ bool Content::FunCreateThreadCheckAbuse()
|
||||
if( !CheckRebus() )
|
||||
{
|
||||
request.status = WINIX_ERR_INCORRECT_REBUS;
|
||||
request.session->done = Done::added_thread;
|
||||
request.session->done_status = WINIX_ERR_INCORRECT_REBUS;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -47,9 +44,6 @@ bool Content::FunCreateThreadCheckAbuse()
|
||||
if( request.session->spam_score > 0 )
|
||||
{
|
||||
request.status = WINIX_ERR_SPAM;
|
||||
request.session->done = Done::added_thread;
|
||||
request.session->done_status = WINIX_ERR_SPAM;
|
||||
|
||||
log << log1 << "Content: ignoring due to suspected spamming" << logend;
|
||||
return false;
|
||||
}
|
||||
@@ -73,24 +67,22 @@ void Content::AddThread()
|
||||
request.thread.items = 1;
|
||||
request.thread.last_item = request.item; // set by PostFunEmacsAdd()
|
||||
|
||||
request.session->done_status = db.AddThread(request.thread);
|
||||
request.status = db.AddThread(request.thread);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void Content::PostFunCreateThreadLogAndRedirect()
|
||||
{
|
||||
if( request.session->done_status == WINIX_ERR_OK )
|
||||
if( request.status == WINIX_ERR_OK )
|
||||
{
|
||||
request.session->done = Done::added_thread;
|
||||
|
||||
log << log2 << "Content: added a new thread" << logend;
|
||||
RedirectToLastDir();
|
||||
}
|
||||
else
|
||||
{
|
||||
log << log1 << "Content: problem with adding a new thread, error code:"
|
||||
<< request.session->done_status << logend;
|
||||
log << log1 << "Content: problem with adding a new thread, error code: "
|
||||
<< request.status << logend;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -113,7 +105,7 @@ void Content::PostFunCreateThread()
|
||||
|
||||
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;
|
||||
@@ -121,7 +113,7 @@ void Content::PostFunCreateThread()
|
||||
request.item.parent_id = request.dir_table.back()->id;
|
||||
PostFunEmacsAdd();
|
||||
|
||||
if( request.session->done_status == WINIX_ERR_OK )
|
||||
if( request.status == WINIX_ERR_OK )
|
||||
AddThread();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user