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.
|
||||
*
|
||||
*/
|
||||
@@ -63,10 +63,6 @@ void Content::FunRmDirRecursive()
|
||||
}
|
||||
|
||||
|
||||
request.session->done = Done::deleted_dir;
|
||||
request.session->done_status = WINIX_ERR_OK;
|
||||
request.session->done_timer = 2;
|
||||
|
||||
// redirect to the last valid directory
|
||||
RedirectTo(**(--request.dir_table.end()));
|
||||
}
|
||||
@@ -100,7 +96,6 @@ void Content::FunRm()
|
||||
{
|
||||
if( db.DelItem( request.item ) )
|
||||
{
|
||||
request.session->done_status = WINIX_ERR_OK;
|
||||
log << log2 << "Content: deleted item: subject: " << request.item.subject << ", id: " << request.item.id << logend;
|
||||
TemplatesFunctions::pattern_cacher.DeletePattern(request.item);
|
||||
|
||||
@@ -113,18 +108,14 @@ void Content::FunRm()
|
||||
}
|
||||
else
|
||||
{
|
||||
request.session->done_status = WINIX_ERR_NO_ITEM;
|
||||
request.status = WINIX_ERR_NO_ITEM;
|
||||
}
|
||||
|
||||
request.session->done = Done::deleted_item;
|
||||
|
||||
RedirectTo(*request.dir_table.back());
|
||||
request.session->done_timer = 2;
|
||||
}
|
||||
else
|
||||
{
|
||||
if( !request.IsParam("confirm") )
|
||||
//request.result = Request::err404;
|
||||
request.status = WINIX_ERR_UNKNOWN_PARAM;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user