diff --git a/html/error.html b/html/error.html index 906dfc7..920c320 100755 --- a/html/error.html +++ b/html/error.html @@ -1,5 +1,5 @@ -[is-no winix_err_is "0"] +[if-no winix_err_is "0"]

[if-one winix_is_err_in_locales] [winix_err_msg_from_locales] diff --git a/html/fun_cat.html b/html/fun_cat.html index a0ad277..3441de4 100755 --- a/html/fun_cat.html +++ b/html/fun_cat.html @@ -1,5 +1,5 @@ -[is mount_page_is "subject"][is mount_page_is "info"]

[else]

[end][item_subject]

[end] -[is mount_page_is "info"][item_info][end] +[if mount_page_is "subject"][if mount_page_is "info"]

[else]

[end][item_subject]

[end] +[if mount_page_is "info"][item_info][end] [if-one item_auth_is_image] [item_subject] diff --git a/html/fun_ckeditor.html b/html/fun_ckeditor.html index 00c2bdf..d2c8c75 100755 --- a/html/fun_ckeditor.html +++ b/html/fun_ckeditor.html @@ -16,7 +16,7 @@ [end] [if-one mount_type_is_thread] - [is mount_thread_is "subject"] + [if mount_thread_is "subject"]

{title}:

@@ -33,7 +33,7 @@ - [is winix_function_param_is "full"] + [if winix_function_param_is "full"] [else] diff --git a/html/fun_emacs.html b/html/fun_emacs.html index cf366d4..767e8fc 100755 --- a/html/fun_emacs.html +++ b/html/fun_emacs.html @@ -16,7 +16,7 @@ [end] [if-one mount_type_is_thread] - [is mount_thread_is "subject"] + [if mount_thread_is "subject"]

{title}:

diff --git a/html/fun_emacs_post.html b/html/fun_emacs_post.html index 92e144e..adb3f29 100755 --- a/html/fun_emacs_post.html +++ b/html/fun_emacs_post.html @@ -1,5 +1,5 @@ -[is winix_function_is "upload"] +[if winix_function_is "upload"]

{upload_content}

[else] [if-one mount_type_is_cms]

{form_emacs_content_cms}

[end] @@ -7,17 +7,17 @@ [if-one mount_type_is_ticket]

{form_emacs_content_ticket}

[end] [end] - +

{form_emacs_content_type}

diff --git a/html/fun_ls.html b/html/fun_ls.html index 42cb9da..ee8a3d2 100755 --- a/html/fun_ls.html +++ b/html/fun_ls.html @@ -1,6 +1,6 @@ -[is winix_function_param_is "ckeditor_browse"] +[if winix_function_param_is "ckeditor_browse"] @@ -21,7 +21,7 @@ [if-no item_is] - [is winix_function_param_is "l"] + [if winix_function_param_is "l"] [# loading dir childs table with a parent directory] [dir_childs_tab "with_parent"] @@ -37,9 +37,9 @@ [dir_childs_tab_group] [if-one dir_childs_is_parent] - ../ + ../ [else] - [dir_childs_tab_url]/ + [dir_childs_tab_url]/ [end] @@ -68,9 +68,9 @@ [for dir_childs_tab]
  • [if-one dir_childs_is_parent] - ../ + ../ [else] - [dir_childs_tab_url]/ + [dir_childs_tab_url]/ [end]
    • [end] diff --git a/html/fun_priv.html b/html/fun_priv.html index 35e32e4..1492290 100755 --- a/html/fun_priv.html +++ b/html/fun_priv.html @@ -6,7 +6,7 @@ [include "error.html"] -[is-no winix_function_param_is "r"] +[if-no winix_function_param_is "r"]
    diff --git a/html/fun_run.html b/html/fun_run.html index f6f8ee3..fa6f9af 100755 --- a/html/fun_run.html +++ b/html/fun_run.html @@ -1,6 +1,6 @@
    - [is mount_page_is "subject"] - [is mount_page_is "info"] + [if mount_page_is "subject"] + [if mount_page_is "info"]

    [else]

    @@ -11,7 +11,7 @@ [end] - [is mount_page_is "info"] + [if mount_page_is "info"] [item_info] [end] diff --git a/html/fun_thread.html b/html/fun_thread.html index eb6b677..f65d5f1 100755 --- a/html/fun_thread.html +++ b/html/fun_thread.html @@ -1,5 +1,5 @@ -[is mount_page_is "subject"][dir_last_subject]

    [end] -[is mount_page_is "info"][dir_last_info][end] +[if mount_page_is "subject"][dir_last_subject][end] +[if mount_page_is "info"][dir_last_info][end] [if-one thread_can_create]
      @@ -33,8 +33,8 @@ [for item_tab]
      [if-one item_tab_can_use_emacs]\[{edit}\][end] - [is mount_thread_is "subject"][item_tab_subject][end] - [is mount_thread_is "info"][item_tab_info][end] + [if mount_thread_is "subject"][item_tab_subject][end] + [if mount_thread_is "info"][item_tab_info][end] [item_tab_print_content]
      [end] diff --git a/html/fun_ticket.html b/html/fun_ticket.html index ff7565d..0d5a5a4 100755 --- a/html/fun_ticket.html +++ b/html/fun_ticket.html @@ -1,5 +1,5 @@ -[is mount_page_is "subject"][dir_last_subject][end] -[is mount_page_is "info"][dir_last_info][end] +[if mount_page_is "subject"][dir_last_subject][end] +[if mount_page_is "info"][dir_last_info][end] [if-one ticket_can_create] @@ -55,8 +55,8 @@ [for item_tab]
      - [is mount_thread_is "subject"][item_tab_subject][end] - [is mount_thread_is "info"][item_tab_info][end] + [if mount_thread_is "subject"][item_tab_subject][end] + [if mount_thread_is "info"][item_tab_info][end] [item_tab_print_content]
      [end] diff --git a/html/fun_tinymce.html b/html/fun_tinymce.html index e7ad98a..f7af424 100755 --- a/html/fun_tinymce.html +++ b/html/fun_tinymce.html @@ -16,7 +16,7 @@ [end] [if-one mount_type_is_thread] - [is mount_thread_is "subject"] + [if mount_thread_is "subject"]

      {title}:

      diff --git a/html/fun_upload.html b/html/fun_upload.html index fdec8aa..d03a4c6 100755 --- a/html/fun_upload.html +++ b/html/fun_upload.html @@ -1,4 +1,4 @@ -[is winix_function_param_is "ckeditor_upload"] +[if winix_function_param_is "ckeditor_upload"] [else] @@ -10,7 +10,7 @@
      {upload_form_legend} - [is winix_function_param_is "multi"] + [if winix_function_param_is "multi"]

      {upload_form_file_multi}

      diff --git a/html/index.html b/html/index.html index 6fb0685..d96799d 100755 --- a/html/index.html +++ b/html/index.html @@ -5,7 +5,7 @@ [include "index_head.html"] -[is-no winix_function_param_is "fullscreen"] +[if-no winix_function_param_is "fullscreen"]
      diff --git a/html/index_head.html b/html/index_head.html index c8f4698..29214b0 100755 --- a/html/index_head.html +++ b/html/index_head.html @@ -7,12 +7,12 @@ - [is winix_function_is "ckeditor"] + [if winix_function_is "ckeditor"] [end] [# in the future tinymce will be placed in doc_base_url_common] - [is winix_function_is "tinymce"] + [if winix_function_is "tinymce"] [end] diff --git a/html/item_options.html b/html/item_options.html index 1315dae..13d4ef5 100755 --- a/html/item_options.html +++ b/html/item_options.html @@ -1,4 +1,4 @@ -[is-no winix_function_param_is "fullscreen"] +[if-no winix_function_param_is "fullscreen"] [if-one dir_can_write item_can_write]
      diff --git a/html/item_tab_info.html b/html/item_tab_info.html index f5f49a4..516e504 100755 --- a/html/item_tab_info.html +++ b/html/item_tab_info.html @@ -1 +1 @@ -

      {added_by}: [item_tab_user], [item_tab_date_creation_nice][if-no item_tab_dates_equal], {last_modified}[if-one item_tab_users_different] {by}: [item_tab_modification_user], [else]: [end][item_tab_date_modification_nice][end]

      +

      {added_by}: [item_tab_user], [item_tab_date_creation_nice][if-no item_tab_dates_equal], {last_modified}[if-one item_tab_users_different] {by}: [item_tab_modification_user], [else]: [end][item_tab_date_modification_nice][end]

      diff --git a/templates/indexpatterns.cpp b/templates/indexpatterns.cpp index 41d1bbf..f0ca0f0 100755 --- a/templates/indexpatterns.cpp +++ b/templates/indexpatterns.cpp @@ -74,7 +74,7 @@ void IndexPatterns::ReadPattern(Tab::iterator & iter, Locale & locale, LocaleFil for(i=0 ; ifirst); diff --git a/templates/misc.cpp b/templates/misc.cpp index 9670819..45e3a2c 100755 --- a/templates/misc.cpp +++ b/templates/misc.cpp @@ -69,7 +69,7 @@ void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & local { if( pat < patterns[i].size() ) { - patterns[i][pat].delete_all_white = delete_white; + patterns[i][pat].DeleteWhiteTextItems(delete_white); patterns[i][pat].Directory(data.templates_dir, data.templates_dir_default); patterns[i][pat].ParseFile(file); diff --git a/templates/patterncacher.cpp b/templates/patterncacher.cpp index 24675b3..5688045 100755 --- a/templates/patterncacher.cpp +++ b/templates/patterncacher.cpp @@ -56,7 +56,7 @@ void PatternCacher::CheckTableSize() void PatternCacher::CreatePattern(const Item & item, Ezc::Pattern & pattern) { - pattern.allow_include = false; + pattern.AllowInclude(false); pattern.ParseString(item.content); } diff --git a/templates/templates.cpp b/templates/templates.cpp index 37c7c47..b25b4ba 100755 --- a/templates/templates.cpp +++ b/templates/templates.cpp @@ -28,8 +28,9 @@ Locale locale; LocaleFilter locale_filter; CKEditorGetParser ckeditor_getparser; - -const std::string empty; // used by GenerateRunRaw() +// used by GenerateRunRaw() +std::vector empty_pars; +const std::string empty_string; @@ -620,8 +621,12 @@ using namespace TemplatesFunctions; void Templates::GenerateRunRaw() { using namespace TemplatesFunctions; + + if( !empty_pars.empty() ) + empty_pars.clear(); + + Ezc::Info info(request.page, empty_pars, empty_string); - Ezc::Info info(request.page, empty); info.iter = 0; info.res = false;