added: function adduser
changed: errors (removed enum, there are macros now) added: error messages to locales (winix_err_NN) removed: templates: err_abuse.html err_others.html git-svn-id: svn://ttmath.org/publicrep/winix/trunk@593 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* This file is a part of CMSLU -- Content Management System like Unix
|
||||
* This file is a part of Winix
|
||||
* and is not publicly distributed
|
||||
*
|
||||
* Copyright (c) 2008-2009, Tomasz Sowa
|
||||
@@ -21,14 +21,14 @@ bool Content::FunRmCheckAccess()
|
||||
{
|
||||
if( !request.CanRemove(*request.dir_table.back()) )
|
||||
{
|
||||
request.status = Error::permission_denied;
|
||||
request.status = WINIX_ERR_PERMISSION_DENIED;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else
|
||||
if( !request.CanRemove(request.item) )
|
||||
{
|
||||
request.status = Error::permission_denied;
|
||||
request.status = WINIX_ERR_PERMISSION_DENIED;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -64,7 +64,7 @@ void Content::FunRmDirRecursive()
|
||||
|
||||
|
||||
request.session->done = Done::deleted_dir;
|
||||
request.session->done_status = Error::ok;
|
||||
request.session->done_status = WINIX_ERR_OK;
|
||||
request.session->done_timer = 2;
|
||||
|
||||
// redirect to the last valid directory
|
||||
@@ -75,7 +75,7 @@ void Content::FunRmDirRecursive()
|
||||
void Content::FunRmDir()
|
||||
{
|
||||
if( request.param_table.empty() )
|
||||
request.status = Error::permission_denied;
|
||||
request.status = WINIX_ERR_PERMISSION_DENIED;
|
||||
else
|
||||
if( request.IsParam("confirm") )
|
||||
return;
|
||||
@@ -83,7 +83,7 @@ void Content::FunRmDir()
|
||||
if( request.IsParam("r") )
|
||||
FunRmDirRecursive();
|
||||
else
|
||||
request.status = Error::unknown_param;
|
||||
request.status = WINIX_ERR_UNKNOWN_PARAM;
|
||||
}
|
||||
|
||||
|
||||
@@ -100,7 +100,7 @@ void Content::FunRm()
|
||||
{
|
||||
if( db.DelItem( request.item ) )
|
||||
{
|
||||
request.session->done_status = Error::ok;
|
||||
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,7 +113,7 @@ void Content::FunRm()
|
||||
}
|
||||
else
|
||||
{
|
||||
request.session->done_status = Error::no_item;
|
||||
request.session->done_status = WINIX_ERR_NO_ITEM;
|
||||
}
|
||||
|
||||
request.session->done = Done::deleted_item;
|
||||
@@ -125,7 +125,7 @@ void Content::FunRm()
|
||||
{
|
||||
if( !request.IsParam("confirm") )
|
||||
//request.result = Request::err404;
|
||||
request.status = Error::unknown_param;
|
||||
request.status = WINIX_ERR_UNKNOWN_PARAM;
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user