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:
2010-02-28 21:33:06 +00:00
parent 71a63cc70e
commit ebd868fa33
128 changed files with 387 additions and 915 deletions

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.
*
*/
@@ -41,10 +41,9 @@ return true;
void Content::PostFunEmacsAdd()
{
request.session->done = Done::added_item;
request.session->done_status = db.AddItem(request.item);
request.status = db.AddItem(request.item);
if( request.session->done_status == WINIX_ERR_OK )
if( request.status == WINIX_ERR_OK )
{
log << log2 << "Content: added a new item" << logend;
request.notify_code |= WINIX_NOTIFY_ITEM_ADD;
@@ -56,10 +55,9 @@ void Content::PostFunEmacsAdd()
void Content::PostFunEmacsEdit(bool with_url)
{
request.item.SetDateModifyToNow();
request.session->done = Done::edited_item;
request.session->done_status = db.EditItemById(request.item, with_url);
request.status = db.EditItemById(request.item, with_url);
if( request.session->done_status == WINIX_ERR_OK )
if( request.status == WINIX_ERR_OK )
{
TemplatesFunctions::pattern_cacher.UpdatePattern(request.item);
log << log2 << "Content: modified an item" << logend;
@@ -74,9 +72,6 @@ bool Content::PostEmacsCheckAbuse(bool adding)
if( !CheckRebus() )
{
request.status = WINIX_ERR_INCORRECT_REBUS;
request.session->done = (adding)? Done::added_item : Done::edited_item;
request.session->done_status = WINIX_ERR_INCORRECT_REBUS;
return false;
}
@@ -86,9 +81,6 @@ bool Content::PostEmacsCheckAbuse(bool adding)
if( request.session->spam_score > 0 )
{
request.status = WINIX_ERR_SPAM;
request.session->done = (adding)? Done::added_item : Done::edited_item;
request.session->done_status = WINIX_ERR_SPAM;
log << log1 << "Content: ignoring due to suspected spamming" << logend;
return false;
}
@@ -128,7 +120,6 @@ void Content::PostFunEmacs()
bool adding = !request.is_item;
bool edit_with_url = ReadItem(request.item, Item::file);
request.session->done_status = WINIX_ERR_OK;
if( !PostEmacsCheckAbuse(adding) )
return;
@@ -146,7 +137,7 @@ void Content::PostFunEmacs()
}
if( request.session->done_status == WINIX_ERR_OK )
if( request.status == WINIX_ERR_OK )
{
PostFunEmacsModifyMountPoint(adding);
CheckSpecialFile();
@@ -154,7 +145,7 @@ void Content::PostFunEmacs()
else
{
log << log1 << "Content: PostFunEmacs: Error: "
<< request.session->done_status << logend;
<< request.status << logend;
}
}