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.
|
||||
*
|
||||
*/
|
||||
@@ -73,9 +73,6 @@ bool Content::FunUploadCheckAbuse()
|
||||
if( !CheckRebus() )
|
||||
{
|
||||
request.status = WINIX_ERR_INCORRECT_REBUS;
|
||||
request.session->done = Done::added_thread;
|
||||
request.session->done_status = WINIX_ERR_INCORRECT_REBUS;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -84,9 +81,6 @@ bool Content::FunUploadCheckAbuse()
|
||||
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;
|
||||
}
|
||||
@@ -123,7 +117,7 @@ void Content::UploadMulti()
|
||||
if( !UploadCreatePath(tmp_path) )
|
||||
return;
|
||||
|
||||
if( request.session->done_status == WINIX_ERR_OK )
|
||||
if( request.status == WINIX_ERR_OK )
|
||||
UploadSaveFile(i->second.tmp_filename, tmp_path);
|
||||
}
|
||||
|
||||
@@ -156,7 +150,7 @@ void Content::UploadSingle()
|
||||
PostFunEmacsAdd(); // always adding a new item
|
||||
|
||||
|
||||
if( request.session->done_status == WINIX_ERR_OK )
|
||||
if( request.status == WINIX_ERR_OK )
|
||||
{
|
||||
const std::string & tmp_filename = request.post_file_table.begin()->second.tmp_filename;
|
||||
|
||||
@@ -167,7 +161,7 @@ void Content::UploadSingle()
|
||||
}
|
||||
|
||||
|
||||
if( request.session->done_status == WINIX_ERR_OK )
|
||||
if( request.status == WINIX_ERR_OK )
|
||||
{
|
||||
if( !request.IsParam("ckeditor_upload") )
|
||||
RedirectTo(request.item);
|
||||
|
Reference in New Issue
Block a user