added: htmltextstream escapes more characters now:

added characters:
          "  -> &#quot;
          '  -> ' (' but IE8 has a problem with ')
          10 -> 

          13 -> 
added: two ezc filters:
       fil_html_quote
          "  -> &#quot;
          '  -> ' (' but IE8 has a problem with ')
       fil_html_newline
          10 -> 

          13 -> 
changed: fun_subject.html uses <div class="winix_input_a"> now





git-svn-id: svn://ttmath.org/publicrep/winix/trunk@959 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa 2014-09-22 23:54:24 +00:00
parent bfa5d8cc05
commit f064ff6b3d
8 changed files with 68 additions and 7 deletions

View File

@ -4,18 +4,18 @@
<form id="additem" method="post" action="[doc_base_url][dir][if-one item_is][item_url]/[end]subject">
<fieldset>
<legend>{subject_form_legend}</legend>
<p class="withnext" style="text-indent: 0;">{title}</p>
<input class="edit" type="text" name="subject" value="[if-one item_is][item_subject][else][dir_last_subject][end]">
<div class="winix_input_a">
<label>{title}</label>
<input type="text" name="subject" value="[if-one item_is][item_subject][else][dir_last_subject][end]">
</div>
[if winix_function_param_is "postredirect"]
<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
[end]
<input class="submit" type="submit" value="{change}">
</fieldset>
</form>

View File

@ -446,7 +446,7 @@ stat_template_from_mount_point = from the mount point
subject_header = Edit subject
subject_form_legend = Edit subject form
uname_header = Uname

View File

@ -465,7 +465,7 @@ stat_template_from_mount_point = z punktu montowania
subject_header = Zmień tytuł
subject_form_legend = Formularz zmiany tytułu
uname_header = Nazwa systemu
uname_available_plugins = Dostępne pluginy

View File

@ -154,6 +154,47 @@ void fil_new_line_to_br(Info & i)
/*
* " -> &#quot;
* ' -> &#39; (&apos; but IE8 has a problem with &apos;)
*/
void fil_html_quote(Info & i)
{
const std::wstring & str = i.in.Str();
for(size_t a=0 ; a<str.size() ; ++a)
{
if( str[a] == '\"' )
i.out << R("&quot;");
else
if( str[a] == '\'' )
i.out << R("&#39;");
else
i.out << R(str[a]);
}
}
/*
* 10 -> &#10;
* 13 -> &#13;
*/
void fil_html_newline(Info & i)
{
const std::wstring & str = i.in.Str();
for(size_t a=0 ; a<str.size() ; ++a)
{
if( str[a] == 10 )
i.out << R("&#10;");
else
if( str[a] == 13 )
i.out << R("&#13;");
else
i.out << R(str[a]);
}
}
} // namespace

View File

@ -248,6 +248,18 @@ HtmlTextStream & HtmlTextStream::ETextPutChar(wchar_t c)
if( c == '&' )
buffer += L"&amp;";
else
if( c == '\"' )
buffer += L"&quot;";
else
if( c == '\'' )
buffer += L"&#39;"; // (it is "&apos;" but IE8 has a problem with &apos;)
else
if( c == 10 )
buffer += L"&#10;";
else
if( c == 13 )
buffer += L"&#13;";
else
if( c != 0 )
buffer += c;

View File

@ -43,6 +43,10 @@ namespace Winix
< -> &lt;
> -> &gt;
& -> &nbsp;
" -> &quot;
' -> &#39; (it is "&apos;" but IE8 has a problem with &apos;)
10 -> &#10;
13 -> &#13;
*/
class HtmlTextStream : public TextStream<std::wstring>
{

View File

@ -279,6 +279,8 @@ void Templates::CreateFunctions()
ezc_functions.Insert("fil_first_wordup", fil_first_wordup);
ezc_functions.Insert("fil_csv_escape", fil_csv_escape);
ezc_functions.Insert("fil_new_line_to_br", fil_new_line_to_br);
ezc_functions.Insert("fil_html_quote", fil_html_quote);
ezc_functions.Insert("fil_html_newline", fil_html_newline);
/*

View File

@ -191,6 +191,8 @@ namespace TemplatesFunctions
void fil_first_wordup(Info & i);
void fil_csv_escape(Info & i);
void fil_new_line_to_br(Info & i);
void fil_html_quote(Info & i);
void fil_html_newline(Info & i);
/*