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

templates/filters.cpp

@@ -154,6 +154,47 @@ void fil_new_line_to_br(Info & i)
 
 
 
+/*
+ *  "  -> &#quot;
+ *  '  -> ' (' but IE8 has a problem with ')
+ */
+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

templates/htmltextstream.cpp

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

templates/htmltextstream.h

@@ -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>
 {

templates/templates.cpp

@@ -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);
 
 
 	/*

templates/templates.h

@@ -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);
 
 
 	/*