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
|
||||
@@ -24,14 +24,14 @@ bool Content::FunEmacsCheckAccess()
|
||||
// adding a new item
|
||||
if( !request.CanUseEmacs(*request.dir_table.back()) )
|
||||
{
|
||||
request.status = Error::permission_denied;
|
||||
request.status = WINIX_ERR_PERMISSION_DENIED;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else // editing an existing item
|
||||
if( !request.CanUseEmacs(request.item) )
|
||||
{
|
||||
request.status = Error::permission_denied;
|
||||
request.status = WINIX_ERR_PERMISSION_DENIED;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ void Content::PostFunEmacsAdd()
|
||||
request.session->done = Done::added_item;
|
||||
request.session->done_status = db.AddItem(request.item);
|
||||
|
||||
if( request.session->done_status == Error::ok )
|
||||
if( request.session->done_status == WINIX_ERR_OK )
|
||||
{
|
||||
log << log2 << "Content: added a new item" << logend;
|
||||
request.notify_code |= WINIX_NOTIFY_ITEM_ADD;
|
||||
@@ -59,7 +59,7 @@ void Content::PostFunEmacsEdit(bool with_url)
|
||||
request.session->done = Done::edited_item;
|
||||
request.session->done_status = db.EditItemById(request.item, with_url);
|
||||
|
||||
if( request.session->done_status == Error::ok )
|
||||
if( request.session->done_status == WINIX_ERR_OK )
|
||||
{
|
||||
TemplatesFunctions::pattern_cacher.UpdatePattern(request.item);
|
||||
log << log2 << "Content: modified an item" << logend;
|
||||
@@ -73,9 +73,9 @@ bool Content::PostEmacsCheckAbuse(bool adding)
|
||||
{
|
||||
if( !CheckRebus() )
|
||||
{
|
||||
request.status = Error::incorrect_rebus;
|
||||
request.status = WINIX_ERR_INCORRECT_REBUS;
|
||||
request.session->done = (adding)? Done::added_item : Done::edited_item;
|
||||
request.session->done_status = Error::incorrect_rebus;
|
||||
request.session->done_status = WINIX_ERR_INCORRECT_REBUS;
|
||||
|
||||
return false;
|
||||
}
|
||||
@@ -85,9 +85,9 @@ bool Content::PostEmacsCheckAbuse(bool adding)
|
||||
|
||||
if( request.session->spam_score > 0 )
|
||||
{
|
||||
request.status = Error::spam;
|
||||
request.status = WINIX_ERR_SPAM;
|
||||
request.session->done = (adding)? Done::added_item : Done::edited_item;
|
||||
request.session->done_status = Error::spam;
|
||||
request.session->done_status = WINIX_ERR_SPAM;
|
||||
|
||||
log << log1 << "Content: ignoring due to suspected spamming" << logend;
|
||||
return false;
|
||||
@@ -128,7 +128,7 @@ void Content::PostFunEmacs()
|
||||
|
||||
bool adding = !request.is_item;
|
||||
bool edit_with_url = ReadItem(request.item, Item::file);
|
||||
request.session->done_status = Error::ok;
|
||||
request.session->done_status = WINIX_ERR_OK;
|
||||
|
||||
if( !PostEmacsCheckAbuse(adding) )
|
||||
return;
|
||||
@@ -146,7 +146,7 @@ void Content::PostFunEmacs()
|
||||
}
|
||||
|
||||
|
||||
if( request.session->done_status == Error::ok )
|
||||
if( request.session->done_status == WINIX_ERR_OK )
|
||||
{
|
||||
PostFunEmacsModifyMountPoint(adding);
|
||||
CheckSpecialFile();
|
||||
|
Reference in New Issue
Block a user