added: winix uses now [filter] statement from ezc
added: notifications to threads (were temporarily disabled) changed: templates in notifications git-svn-id: svn://ttmath.org/publicrep/winix/trunk@712 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
@@ -29,7 +29,9 @@ CKEditorGetParser ckeditor_getparser;
|
||||
|
||||
// used by GenerateRunRaw()
|
||||
std::vector<std::wstring> empty_pars;
|
||||
const std::wstring empty_string;
|
||||
const std::wstring empty_string;
|
||||
const HtmlTextStream empty_stream;
|
||||
|
||||
|
||||
Db * db;
|
||||
Cur * cur;
|
||||
@@ -39,6 +41,10 @@ Functions * functions;
|
||||
SessionManager * session_manager;
|
||||
|
||||
|
||||
// generator used by content() function
|
||||
static EzcGen content_gen;
|
||||
|
||||
|
||||
|
||||
Ezc::Pattern * content_for_function()
|
||||
{
|
||||
@@ -109,15 +115,9 @@ Ezc::Pattern * p = 0;
|
||||
|
||||
|
||||
if( p )
|
||||
{
|
||||
EzcGen gen;
|
||||
//gen.Generate(i.out, *p, ezc_functions);
|
||||
gen.Generate(i.out, *p);
|
||||
}
|
||||
content_gen.Generate(i.out, *p);
|
||||
else
|
||||
{
|
||||
i.out << "<!-- there are not any patterns -->";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -182,6 +182,15 @@ void Templates::CreateFunctions()
|
||||
ezc_functions.Insert("dir_last_has_html_template", dir_last_has_html_template);
|
||||
|
||||
|
||||
/*
|
||||
filters
|
||||
*/
|
||||
ezc_functions.Insert("fil_urlencode", fil_urlencode);
|
||||
ezc_functions.Insert("fil_qencode", fil_qencode);
|
||||
ezc_functions.Insert("fil_capitalize", fil_capitalize);
|
||||
ezc_functions.Insert("fil_tosmall", fil_tosmall);
|
||||
|
||||
|
||||
/*
|
||||
doc
|
||||
*/
|
||||
@@ -614,8 +623,6 @@ using namespace TemplatesFunctions;
|
||||
if( !index )
|
||||
index = &patterns[locale.GetLang()][pat_index];
|
||||
|
||||
EzcGen generator;
|
||||
//generator.Generate(cur->request->page, *index, ezc_functions);
|
||||
generator.Generate(cur->request->page, *index);
|
||||
}
|
||||
|
||||
@@ -628,7 +635,7 @@ using namespace TemplatesFunctions;
|
||||
if( !empty_pars.empty() )
|
||||
empty_pars.clear();
|
||||
|
||||
Info info(cur->request->page, empty_pars, empty_string);
|
||||
Info info(cur->request->page, empty_pars, empty_string, empty_stream);
|
||||
|
||||
info.iter = 0;
|
||||
info.res = false;
|
||||
|
||||
Reference in New Issue
Block a user