tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

added: item content type: raw

Browse Source 
git-svn-id: svn://ttmath.org/publicrep/cmslu/trunk@549 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2010-01-11 14:47:52 +00:00
parent 59943c87cd
commit 3c95b84633
28 changed files with 319 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
content/cat.cpp
View File

@@ -19,14 +19,14 @@ void Content::FunCat()
if( !request.is_item )
{
log << log1 << "Content: Cat function requires an item" << logend;
request.status = Error::item_required;
request.status = Error::no_item;
return;
}
if( !request.HasReadAccess(request.item) )
{
request.status = Error::permision_denied;
request.status = Error::permission_denied;
return;
}
}

38
content/content.cpp
View File

@@ -114,7 +114,7 @@ void Content::MakeStandardFunction()
if( request.pfunction )
{
request.status = Error::db_no_item;
request.status = Error::no_item;
log << log1 << "Content: in authorizer mode only 'cat' funtion is available and must "
"be default (not in the url)" << logend;
return;
@@ -185,7 +185,7 @@ void Content::MakeStandardFunction()
if( request.pfunction->code == FUN_UPLOAD )
FunUpload();
else
request.status = Error::permision_denied;
request.status = Error::permission_denied;
}
@@ -197,7 +197,7 @@ void Content::MakePost()
{
if( request.role == Request::authorizer )
{
request.status = Error::permision_denied;
request.status = Error::permission_denied;
return;
}
@@ -252,6 +252,32 @@ void Content::MakePost()
}
void Content::MakePage()
{
bool sent = false;
if( request.is_item && request.item.content_type == Item::ct_raw && request.status == Error::ok && request.pfunction )
{
if( request.pfunction->code == FUN_CAT )
{
request.page << request.item.content;
sent = true;
}
else
if( request.pfunction->code == FUN_RUN )
{
templates.GenerateRunRaw();
sent = true;
}
}
if( !sent )
{
templates.Generate();
}
}
void Content::Make()
{
@@ -273,7 +299,7 @@ void Content::Make()
MakeStandardFunction();
}
else
request.status = Error::permision_denied;
request.status = Error::permission_denied;
}
if( request.session->spam_score > 0 )
@@ -289,8 +315,8 @@ void Content::Make()
}
plugin.Call(CMSLU_CONTENT_MAKE);
templates.Generate();
MakePage();
//request.PrintGetTable();
//request.PrintEnv();
//request.PrintIn();

5
content/content.h
View File

@@ -24,6 +24,8 @@ class Content
{
Templates templates;
std::string temp;
void CheckSpecialFile();
void PrepareUrl(Item & item);
@@ -69,6 +71,8 @@ class Content
bool PostFunSetUrlSubject();
void PostFunLogin();
void SetContentType();
void PostFunEmacsAdd();
void PostFunEmacsEdit(bool with_url);
void PostFunEmacs();
@@ -88,6 +92,7 @@ class Content
void CheckGetPostTimes(time_t difference = 10);
// bool CreateFile(const std::string & path, const std::string & content);
void MakePage();
public:

3
content/createthread.cpp
View File

@@ -19,7 +19,7 @@ bool Content::FunCreateThreadCheckAccess()
{
if( !request.CanCreateThread() )
{
request.status = Error::permision_denied;
request.status = Error::permission_denied;
return false;
}
@@ -65,6 +65,7 @@ void Content::PostFunCreateThread()
request.PostVar("url", request.item.url);
request.PostVar("subject", request.item.subject);
request.PostVar("content", request.item.content);
SetContentType();
SetUser(request.item);
return;
}

6
content/default.cpp
View File

@@ -49,7 +49,7 @@ long defaultid = -1;
defaultid = db.GetFileId(pdir->id, file);
if( defaultid == -1 )
throw Error(Error::db_no_item);
throw Error(Error::no_item);
}
else
{
@@ -72,7 +72,7 @@ void Content::PostFunDefault()
if( !request.HasWriteAccess(*request.dir_table.back()) )
{
request.status = Error::permision_denied;
request.status = Error::permission_denied;
return;
}
@@ -104,7 +104,7 @@ void Content::FunDefault()
{
if( !request.HasWriteAccess(*request.dir_table.back()) )
{
request.status = Error::permision_denied;
request.status = Error::permission_denied;
return;
}

49
content/emacs.cpp
View File

@@ -51,12 +51,12 @@ void Content::PostFunEmacsAdd()
request.item.privileges = 0644; // !! tymczasowo, bedzie uzyte umask
request.item.parent_id = request.dir_table.back()->id;
request.item.type = Item::file;
request.item.content_type = 1;// !! tymczasowo formatted text
request.item.content_type = Item::ct_formatted_text;// !! tymczasowo formatted text
// dates (creation and modification) is set by request.item.Clear() at the beginning
if( !request.CanUseEmacs(*request.dir_table.back() ) )
throw Error(Error::permision_denied);
throw Error(Error::permission_denied);
request.session->done_status = db.AddItem(request.item);
@@ -74,7 +74,7 @@ void Content::PostFunEmacsEdit(bool with_url)
request.session->done = Done::edited_item;
if( !request.CanUseEmacs(request.item) )
throw Error(Error::permision_denied);
throw Error(Error::permission_denied);
time_t t = std::time(0);
request.item.date_modification = *std::localtime( &t );
@@ -91,7 +91,7 @@ void Content::PostFunEmacsEdit(bool with_url)
}
// returning true if the 'url' has to be changed
// returning true if the 'url' has to be change
bool Content::PostFunSetUrlSubject()
{
bool with_url = false;
@@ -132,6 +132,42 @@ return with_url;
}
void Content::SetContentType()
{
request.item.content_type = Item::ct_formatted_text; // formatted text default
request.PostVar("contenttype", temp);
if( temp == "text" )
request.item.content_type = Item::ct_text;
else
if( temp == "formatted text" )
request.item.content_type = Item::ct_formatted_text;
if( !request.session->puser )
return;
long user_id = request.session->puser->id;
if( temp == "html" )
{
if( request.CanUseHtml(user_id) )
request.item.content_type = Item::ct_html;
}
else
if( temp == "bbcode" )
{
if( request.CanUseBBCode(user_id) )
request.item.content_type = Item::ct_bbcode;
}
else
if( temp == "raw" )
{
if( request.CanUseRaw(user_id) )
request.item.content_type = Item::ct_raw;
}
}
void Content::PostFunEmacs()
{
@@ -141,6 +177,7 @@ bool adding = !request.is_item;
{
bool with_url = PostFunSetUrlSubject();
request.PostVar("content", request.item.content);
SetContentType();
if( !CheckRebus() )
{
@@ -220,7 +257,7 @@ void Content::FunEmacs()
{
// adding a new item
if( !request.CanUseEmacs(*request.dir_table.back()) )
request.status = Error::permision_denied;
request.status = Error::permission_denied;
return;
}
@@ -228,7 +265,7 @@ void Content::FunEmacs()
// editing an existing item
if( !request.CanUseEmacs(request.item) )
{
request.status = Error::permision_denied;
request.status = Error::permission_denied;
return;
}
}

4
content/mkdir.cpp
View File

@@ -21,7 +21,7 @@ void Content::PostFunMkdir(bool add_to_dir_table, int mask)
{
if( !request.CanUseMkdir(*request.dir_table.back()) )
{
request.status = Error::permision_denied;
request.status = Error::permission_denied;
return;
}
@@ -81,7 +81,7 @@ void Content::FunMkdir()
// !! what about an item? (is_item)
if( !request.CanUseMkdir(*request.dir_table.back()) )
{
request.status = Error::permision_denied;
request.status = Error::permission_denied;
return;
}

2
content/reload.cpp
View File

@@ -31,7 +31,7 @@ void Content::FunReload()
if( !request.session->puser || !request.session->puser->super_user )
{
log << log1 << "Content: Only an admin has access to reload function" << logend;
request.status = Error::permision_denied;
request.status = Error::permission_denied;
return;
}

8
content/rm.cpp
View File

@@ -55,12 +55,12 @@ void Content::FunRmDir()
{
if( !request.CanRemove(*request.dir_table.back()) )
{
request.status = Error::permision_denied;
request.status = Error::permission_denied;
return;
}
if( request.param_table.empty() )
request.status = Error::permision_denied;
request.status = Error::permission_denied;
else
if( request.IsParam("confirm") )
return;
@@ -82,7 +82,7 @@ void Content::FunRm()
if( !request.CanRemove(request.item) )
{
request.status = Error::permision_denied;
request.status = Error::permission_denied;
return;
}
@@ -104,7 +104,7 @@ void Content::FunRm()
}
else
{
request.session->done_status = Error::db_no_item;
request.session->done_status = Error::no_item;
}
request.session->done = Done::deleted_item;

4
content/run.cpp
View File

@@ -19,13 +19,13 @@ void Content::FunRun()
if( !request.is_item )
{
log << log1 << "Content: Run function requires an item" << logend;
request.status = Error::item_required;
request.status = Error::no_item;
return;
}
if( !request.HasReadExecAccess(request.item) )
{
request.status = Error::permision_denied;
request.status = Error::permission_denied;
return;
}
}

12
content/upload.cpp
View File

@@ -17,14 +17,14 @@ void Content::FunUpload()
{
if( request.is_item || !request.CanUseUpload(*request.dir_table.back()) )
{
request.status = Error::permision_denied;
request.status = Error::permission_denied;
return;
}
if( data.mounts.CurrentMountType() != Mount::cms )
{
request.status = Error::permision_denied;
request.status = Error::permission_denied;
return;
}
}
@@ -34,19 +34,19 @@ void Content::PostFunUpload()
{
if( request.is_item || !request.CanUseUpload(*request.dir_table.back()) )
{
request.status = Error::permision_denied;
request.status = Error::permission_denied;
return;
}
if( data.mounts.CurrentMountType() != Mount::cms )
{
request.status = Error::permision_denied;
request.status = Error::permission_denied;
return;
}
if( request.post_file_table.empty() )
{
request.status = Error::permision_denied;
request.status = Error::permission_denied;
return;
}
@@ -71,7 +71,7 @@ void Content::PostFunUpload()
// !! skasowac takze plik z bazy danych
log << log1 << "Content: can't move the tmp file from: " << tmp_filename;
log << log1 << ", to: " << path << logend;
request.status = Error::permision_denied;
request.status = Error::permission_denied;
}
}
}