we can create links (hard links, symbolic links) now
added winix functions: ln winix function 'default' can be used without redirecting now added new tickets types: TypeProgress, TypeString, TypeMultistring, TypeImages, TypeFiles now tickets are combined with files added winix functions: showtickets fixed mountpoints: when the default root mount was created its parameter table was empty and it caused accessing to a non-existing objects fixed logger: modifiers (log1, log2, log3) were incorrectly treated added modifier: log4 (debug info) now we are moving threads to a new plugin 'thread' created directory: plugins/thread (not finished yet) git-svn-id: svn://ttmath.org/publicrep/winix/trunk@704 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
@@ -145,6 +145,7 @@ void Templates::CreateFunctions()
|
||||
*/
|
||||
ezc_functions.Insert("dir", dir);
|
||||
ezc_functions.Insert("dir_without_slash", dir_without_slash);
|
||||
ezc_functions.Insert("dir_is_root", dir_is_root);
|
||||
ezc_functions.Insert("dir_parent", dir_parent);
|
||||
ezc_functions.Insert("dir_parent_without_slash", dir_parent_without_slash);
|
||||
ezc_functions.Insert("dir_can_read_exec", dir_can_read_exec);
|
||||
@@ -164,8 +165,8 @@ void Templates::CreateFunctions()
|
||||
ezc_functions.Insert("dir_tab_url", dir_tab_url);
|
||||
ezc_functions.Insert("dir_tab_link", dir_tab_link);
|
||||
|
||||
ezc_functions.Insert("dir_last_default_item_dir", dir_last_default_item_dir);
|
||||
ezc_functions.Insert("dir_last_default_item_url", dir_last_default_item_url);
|
||||
ezc_functions.Insert("dir_last_link_to", dir_last_link_to);
|
||||
ezc_functions.Insert("dir_last_is_link_redirect", dir_last_is_link_redirect);
|
||||
ezc_functions.Insert("dir_last_subject", dir_last_subject);
|
||||
ezc_functions.Insert("dir_last_user", dir_last_user);
|
||||
ezc_functions.Insert("dir_last_url", dir_last_url);
|
||||
@@ -210,6 +211,7 @@ void Templates::CreateFunctions()
|
||||
ezc_functions.Insert("item_link", item_link);
|
||||
ezc_functions.Insert("item_filetype_is_none", item_filetype_is_none);
|
||||
ezc_functions.Insert("item_filetype_is_image", item_filetype_is_image);
|
||||
ezc_functions.Insert("item_has_static_file", item_has_static_file);
|
||||
ezc_functions.Insert("item_has_thumb", item_has_thumb);
|
||||
|
||||
ezc_functions.Insert("item_can_read", item_can_read);
|
||||
@@ -227,7 +229,12 @@ void Templates::CreateFunctions()
|
||||
ezc_functions.Insert("item_guest_name", item_guest_name);
|
||||
ezc_functions.Insert("item_html_template", item_html_template);
|
||||
ezc_functions.Insert("item_has_html_template", item_has_html_template);
|
||||
|
||||
ezc_functions.Insert("item_type_is_dir", item_type_is_dir);
|
||||
ezc_functions.Insert("item_type_is_file", item_type_is_file);
|
||||
ezc_functions.Insert("item_type_is_symlink", item_type_is_symlink);
|
||||
ezc_functions.Insert("item_is_link_to", item_is_link_to);
|
||||
ezc_functions.Insert("item_link_to", item_link_to);
|
||||
ezc_functions.Insert("item_is_link_redirect", item_is_link_redirect);
|
||||
|
||||
ezc_functions.Insert("item_tab", item_tab);
|
||||
ezc_functions.Insert("item_tab_id", item_tab_id);
|
||||
@@ -253,6 +260,14 @@ void Templates::CreateFunctions()
|
||||
ezc_functions.Insert("item_tab_dates_equal", item_tab_dates_equal);
|
||||
ezc_functions.Insert("item_tab_run", item_tab_run);
|
||||
ezc_functions.Insert("item_tab_can_use_emacs", item_tab_can_use_emacs);
|
||||
ezc_functions.Insert("item_tab_has_static_file", item_tab_has_static_file);
|
||||
ezc_functions.Insert("item_tab_has_thumb", item_tab_has_thumb);
|
||||
ezc_functions.Insert("item_tab_type_is_dir", item_tab_type_is_dir);
|
||||
ezc_functions.Insert("item_tab_type_is_file", item_tab_type_is_file);
|
||||
ezc_functions.Insert("item_tab_type_is_symlink", item_tab_type_is_symlink);
|
||||
ezc_functions.Insert("item_tab_is_link_to", item_tab_is_link_to);
|
||||
ezc_functions.Insert("item_tab_link_to", item_tab_link_to);
|
||||
ezc_functions.Insert("item_tab_is_link_redirect", item_tab_is_link_redirect);
|
||||
|
||||
|
||||
/*
|
||||
@@ -539,6 +554,12 @@ using namespace TemplatesFunctions;
|
||||
const Mount & mount = i->second;
|
||||
int html_id = TemplatesFunctions::system->mounts.MountParHtmlTemplate();
|
||||
|
||||
if( size_t(html_id) >= mount.param.size() )
|
||||
{
|
||||
log << log1 << "Templates: something wrong in mount points, there is no"
|
||||
<< " html template parameter" << logend;
|
||||
}
|
||||
else
|
||||
if( mount.param[html_id].defined )
|
||||
{
|
||||
size_t len = mount.param[html_id].arg.size();
|
||||
|
||||
Reference in New Issue
Block a user