diff --git a/core/htmlfilter.cpp b/core/htmlfilter.cpp
index d54b0a8..4d0589e 100755
--- a/core/htmlfilter.cpp
+++ b/core/htmlfilter.cpp
@@ -1202,6 +1202,7 @@ void HTMLFilter::CheckExceptions()
IsLastTag(L"img") ||
IsLastTag(L"link") ||
IsLastTag(L"param") ||
+ IsLastTag(L"col") ||
IsLastTag(L"area") )
{
LastItem().type = Item::simple;
diff --git a/plugins/export/exportthread.cpp b/plugins/export/exportthread.cpp
index 22d9440..c699e36 100755
--- a/plugins/export/exportthread.cpp
+++ b/plugins/export/exportthread.cpp
@@ -527,26 +527,27 @@ void ExportThread::ChangeSiteNames(std::string & buf)
// objects not locked
void ExportThread::ChangeAdresses(std::string & buf)
{
- // changing: (http or https)
+ // http:// in sources here means either http:// or https://
+
+ // changing:
// http://domain.tld/sitename/[...]/file.jpg/-/thumb -> http://otherdomain.tld/download/[...]/file.jpg
// http://domain.tld/sitename/[...]/file.jpg/download/thumb -> http://otherdomain.tld/download/[...]/file.jpg
ChangeAdressesThumb(buf);
- // changing: (http or https)
+ // changing:
// http://domain.tld/static/sitename/ -> http://otherdomain.tld/static/
ChangeBaseAdress(buf, "/static", "", "/static/");
- // changing: (http or https)
+ // changing:
// http://domain.tld/common/sitename/ -> http://otherdomain.tld/common/
//ChangeAdresss(buf, "/common", "", "/common/");
- // changing: (http or https)
+ // changing:
// http://domain.tld/sitename/ -> http://otherdomain.tld/
ChangeBaseAdress(buf, "", "", "/");
// changing:
// http://domain.tld/sitename" -> http://otherdomain.tld"
- // !! dodac no last slash na zrodle
ChangeBaseAdress(buf, "", "\"", "\"", true);
// changing:
diff --git a/templates/templates.cpp b/templates/templates.cpp
index 2da2723..9bad50c 100755
--- a/templates/templates.cpp
+++ b/templates/templates.cpp
@@ -480,34 +480,36 @@ void Templates::CreateFunctions()
/*
winix
*/
- ezc_functions.Insert("winix_cur_time", winix_cur_time);
- ezc_functions.Insert("winix_how_many_sessions", winix_how_many_sessions);
- ezc_functions.Insert("winix_users_logged", winix_users_logged);
- ezc_functions.Insert("winix_function", winix_function);
- ezc_functions.Insert("winix_function_is", winix_function_is);
- ezc_functions.Insert("winix_function_param_is", winix_function_param_is);
- ezc_functions.Insert("winix_function_param_is_not",winix_function_param_is_not);
- ezc_functions.Insert("winix_function_param_value",winix_function_param_value);
- ezc_functions.Insert("winix_has_plugin", winix_has_plugin);
- ezc_functions.Insert("winix_loadavg_now", winix_loadavg_now);
- ezc_functions.Insert("winix_loadavg_1", winix_loadavg_1);
- ezc_functions.Insert("winix_loadavg_5", winix_loadavg_5);
- ezc_functions.Insert("winix_loadavg_15", winix_loadavg_15);
- ezc_functions.Insert("winix_req_per_sec_now", winix_req_per_sec_now);
- ezc_functions.Insert("winix_req_per_sec_1", winix_req_per_sec_1);
- ezc_functions.Insert("winix_req_per_sec_5", winix_req_per_sec_5);
- ezc_functions.Insert("winix_req_per_sec_15", winix_req_per_sec_15);
- ezc_functions.Insert("winix_err_is", winix_err_is);
- ezc_functions.Insert("winix_err_code", winix_err_code);
- ezc_functions.Insert("winix_is_err_in_locales", winix_is_err_in_locales);
- ezc_functions.Insert("winix_err_msg_from_locales",winix_err_msg_from_locales);
- ezc_functions.Insert("winix_show_content_in_full_window", winix_show_content_in_full_window);
- ezc_functions.Insert("false", winix_false);
- ezc_functions.Insert("true", winix_true);
- ezc_functions.Insert("winix_has_postvar", winix_has_postvar);
- ezc_functions.Insert("winix_postvar", winix_postvar);
- ezc_functions.Insert("str", str);
- ezc_functions.Insert("strnc", strnc);
+ ezc_functions.Insert("winix_cur_time", winix_cur_time);
+ ezc_functions.Insert("winix_how_many_sessions", winix_how_many_sessions);
+ ezc_functions.Insert("winix_users_logged", winix_users_logged);
+ ezc_functions.Insert("winix_function", winix_function);
+ ezc_functions.Insert("winix_function_is", winix_function_is);
+ ezc_functions.Insert("winix_function_param_is", winix_function_param_is);
+ ezc_functions.Insert("winix_function_param_is_not", winix_function_param_is_not);
+ ezc_functions.Insert("winix_function_param_value", winix_function_param_value);
+ ezc_functions.Insert("winix_function_param_value_is", winix_function_param_value_is);
+ ezc_functions.Insert("winix_function_param_value_is_not", winix_function_param_value_is_not);
+ ezc_functions.Insert("winix_has_plugin", winix_has_plugin);
+ ezc_functions.Insert("winix_loadavg_now", winix_loadavg_now);
+ ezc_functions.Insert("winix_loadavg_1", winix_loadavg_1);
+ ezc_functions.Insert("winix_loadavg_5", winix_loadavg_5);
+ ezc_functions.Insert("winix_loadavg_15", winix_loadavg_15);
+ ezc_functions.Insert("winix_req_per_sec_now", winix_req_per_sec_now);
+ ezc_functions.Insert("winix_req_per_sec_1", winix_req_per_sec_1);
+ ezc_functions.Insert("winix_req_per_sec_5", winix_req_per_sec_5);
+ ezc_functions.Insert("winix_req_per_sec_15", winix_req_per_sec_15);
+ ezc_functions.Insert("winix_err_is", winix_err_is);
+ ezc_functions.Insert("winix_err_code", winix_err_code);
+ ezc_functions.Insert("winix_is_err_in_locales", winix_is_err_in_locales);
+ ezc_functions.Insert("winix_err_msg_from_locales", winix_err_msg_from_locales);
+ ezc_functions.Insert("winix_show_content_in_full_window", winix_show_content_in_full_window);
+ ezc_functions.Insert("false", winix_false);
+ ezc_functions.Insert("true", winix_true);
+ ezc_functions.Insert("winix_has_postvar", winix_has_postvar);
+ ezc_functions.Insert("winix_postvar", winix_postvar);
+ ezc_functions.Insert("str", str);
+ ezc_functions.Insert("strnc", strnc);
/*
diff --git a/templates/templates.h b/templates/templates.h
index 7165151..7c5fb3f 100755
--- a/templates/templates.h
+++ b/templates/templates.h
@@ -411,6 +411,8 @@ namespace TemplatesFunctions
void winix_function_param_is(Info & i);
void winix_function_param_is_not(Info & i);
void winix_function_param_value(Info & i);
+ void winix_function_param_value_is(Info & i);
+ void winix_function_param_value_is_not(Info & i);
void winix_has_plugin(Info & i);
void winix_loadavg_now(Info & i);
void winix_loadavg_1(Info & i);
diff --git a/templates/winix.cpp b/templates/winix.cpp
index e38bb31..fd77ff6 100755
--- a/templates/winix.cpp
+++ b/templates/winix.cpp
@@ -77,6 +77,22 @@ void winix_function_param_value(Info & i)
}
+// first parameter is param_name
+// second parameter is param_value
+void winix_function_param_value_is(Info & i)
+{
+ if( i.params.size() == 2 )
+ i.res = (cur->request->ParamValue(i.params[0]) == i.params[1]);
+}
+
+
+void winix_function_param_value_is_not(Info & i)
+{
+ if( i.params.size() == 2 )
+ i.res = (cur->request->ParamValue(i.params[0]) != i.params[1]);
+}
+
+
void winix_has_plugin(Info & i)
{
size_t exist = 0;