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

fixed: static files loaded to /var such as /var/ckeditor_winix.js were not properly returned

Browse Source 
(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:
Tomasz Sowa
2016-07-13 13:13:56 +00:00
parent 240bf4dc5d
commit e57840faed
20 changed files with 144 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
winixd/templates/templates.cpp
View File

@@ -211,14 +211,15 @@ void Templates::CreateFunctions()
/*
config
*/
ezc_functions.Insert("config_use_ssl", config_use_ssl);
ezc_functions.Insert("config_use_ssl_static", config_use_ssl_static);
ezc_functions.Insert("config_use_ssl_common", config_use_ssl_common);
ezc_functions.Insert("config_url_proto", config_url_proto);
ezc_functions.Insert("config_url_ssl_proto", config_url_ssl_proto);
ezc_functions.Insert("config_base_url", config_base_url);
ezc_functions.Insert("config_base_url_static", config_base_url_static);
ezc_functions.Insert("config_base_url_common", config_base_url_common);
ezc_functions.Insert("config_use_ssl", config_use_ssl);
ezc_functions.Insert("config_use_ssl_static", config_use_ssl_static);
ezc_functions.Insert("config_use_ssl_common", config_use_ssl_common);
ezc_functions.Insert("config_url_proto", config_url_proto);
ezc_functions.Insert("config_url_ssl_proto", config_url_ssl_proto);
ezc_functions.Insert("config_base_url", config_base_url);
ezc_functions.Insert("config_base_url_static", config_base_url_static);
ezc_functions.Insert("config_base_url_common", config_base_url_common);
ezc_functions.Insert("config_is_html_filter_allowed", config_is_html_filter_allowed);
/*
@@ -465,7 +466,8 @@ void Templates::CreateFunctions()
ezc_functions.Insert("item_admin_meta", item_admin_meta);
ezc_functions.Insert("item_admin_meta_tab", item_admin_meta_tab);
ezc_functions.Insert("item_admin_meta_tab_value", item_admin_meta_tab_value);
ezc_functions.Insert("item_admin_meta_tab_has_next", item_admin_meta_tab_has_next);
ezc_functions.Insert("item_admin_meta_tab_has_next", item_admin_meta_tab_has_next);
ezc_functions.Insert("item_can_content_be_html_filtered", item_can_content_be_html_filtered);
ezc_functions.Insert("item_tab", item_tab);
ezc_functions.Insert("item_tab_index", item_tab_index);
@@ -678,6 +680,7 @@ void Templates::CreateFunctions()
ezc_functions.Insert("user_is_in_all_groups", user_is_in_all_groups);
ezc_functions.Insert("user_can_use_html", user_can_use_html);
ezc_functions.Insert("user_can_use_bbcode", user_can_use_bbcode);
ezc_functions.Insert("user_can_use_other", user_can_use_other);
ezc_functions.Insert("user_has_correct_time_zone",user_has_correct_time_zone);
ezc_functions.Insert("user_time_zone_name", user_time_zone_name);
ezc_functions.Insert("user_time_zone_id", user_time_zone_id);
@@ -1042,7 +1045,7 @@ using namespace TemplatesFunctions;
Ezc::Pattern * index = 0;
if( !cur->request->last_item->html_template.empty() )
if( (cur->request->function == &functions->fun_cat || cur->request->function == &functions->fun_run) && !cur->request->last_item->html_template.empty() )
{
index = SelectIndexPattern(cur->request->last_item->html_template);
}