fixed: static files loaded to /var such as /var/ckeditor_winix.js were not properly returned
(html filter was used but they are mostly javascript files) added: new Item::ContentType: ct_other if an item has ct_other then the html filter is not used for the content git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1040 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (c) 2008-2014, Tomasz Sowa
|
||||
* Copyright (c) 2008-2016, Tomasz Sowa
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -56,7 +56,6 @@ void Cat::MakeGet()
|
||||
cur->request->status = WINIX_ERR_NO_ITEM;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if( !system->HasReadAccess(cur->request->item) )
|
||||
{
|
||||
|
@@ -444,9 +444,14 @@ void Functions::MakeFunction()
|
||||
if( cur->request->method == Request::head )
|
||||
{
|
||||
// do nothing
|
||||
|
||||
// !! IMPROVE ME
|
||||
// we should make a page similar like in a GET request but the content should not be returned only
|
||||
}
|
||||
else
|
||||
{
|
||||
log << log1 << "Functions: unknown request method (skipping)" << logend;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -578,7 +583,6 @@ void Functions::ReadItemContentWithType(Item & item)
|
||||
|
||||
long user_id = cur->session->puser->id;
|
||||
|
||||
|
||||
if( temp == L"2" )
|
||||
{
|
||||
if( system->CanUseHtml(user_id) )
|
||||
@@ -590,6 +594,12 @@ void Functions::ReadItemContentWithType(Item & item)
|
||||
if( system->CanUseBBCode(user_id) )
|
||||
item.content_type = Item::ct_bbcode;
|
||||
}
|
||||
else
|
||||
if( temp == L"4" )
|
||||
{
|
||||
if( system->CanUseOther(user_id) )
|
||||
item.content_type = Item::ct_other;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@@ -1,3 +1,4 @@
|
||||
|
||||
/*
|
||||
* This file is a part of Winix
|
||||
* and is distributed under the 2-Clause BSD licence.
|
||||
|
Reference in New Issue
Block a user