added: uptime winix function prints how many sessions there are
changed: functions for text/numbers conversions int Toi(const std::string & str, int base = 10); int Toi(const std::wstring & str, int base = 10); int Toi(const char * str, int base = 10); int Toi(const wchar_t * str, int base = 10); long Tol(const std::string & str, int base = 10); long Tol(const std::wstring & str, int base = 10); long Tol(const char * str, int base = 10); long Tol(const wchar_t * str, int base = 10); template<class CharType> bool Toa(unsigned long value, CharType * buffer, size_t buf_len, int base = 10); template<class CharType> bool Toa(long value, CharType * buffer, size_t buf_len, int base = 10); template<class CharType> bool Toa(unsigned int value, CharType * buffer, size_t buf_len, int base = 10); template<class CharType> bool Toa(int value, CharType * buffer, size_t buf_len, int base = 10); const wchar_t * Toa(unsigned int value, int base = 10); const wchar_t * Toa(unsigned long value, int base = 10); const wchar_t * Toa(int value, int base = 10); const wchar_t * Toa(long value, int base = 10); void Toa(int value, std::string & res, int base = 10, bool clear = true); void Toa(long value, std::string & res, int base = 10, bool clear = true); void Toa(int value, std::wstring & res, int base = 10, bool clear = true); void Toa(long value, std::wstring & res, int base = 10, bool clear = true); added: HtmlTextStream class (files htmltextstream.cpp htmltextstream.h in templates) this is a special stream for automatically escaping html tags git-svn-id: svn://ttmath.org/publicrep/winix/trunk@682 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
namespace TemplatesFunctions
|
||||
{
|
||||
|
||||
|
||||
/*
|
||||
bool HtmlTryChar(TextStream<std::wstring> & out, wchar_t c)
|
||||
{
|
||||
if( c == '<' )
|
||||
@@ -63,9 +63,9 @@ std::wstring HtmlEscape(const std::wstring & in)
|
||||
|
||||
return out.Str();
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
void HtmlEscapeFormTxt(TextStream<std::wstring> & out, const std::wstring & in)
|
||||
void HtmlEscapeFormTxt(HtmlTextStream & out, const std::wstring & in)
|
||||
{
|
||||
std::wstring::const_iterator i;
|
||||
int was_enter = 0; // how many enteres there were before
|
||||
@@ -73,7 +73,7 @@ int was_enter = 0; // how many enteres there were before
|
||||
if( in.empty() )
|
||||
return;
|
||||
|
||||
out << L"<p>"; // !! pozbyc sie wstawianie tego html tutaj (wrzucic w jakis sposob do szablonow)
|
||||
out << R("<p>"); // !! pozbyc sie wstawianie tego html tutaj (wrzucic w jakis sposob do szablonow)
|
||||
|
||||
// skipping first new line characters
|
||||
for(i = in.begin() ; i != in.end() && (*i==13 || *i==10) ; ++i);
|
||||
@@ -90,22 +90,21 @@ int was_enter = 0; // how many enteres there were before
|
||||
else
|
||||
{
|
||||
if( was_enter == 1 )
|
||||
out << L"<br>\n";
|
||||
out << R("<br>\n");
|
||||
else
|
||||
if( was_enter > 1 )
|
||||
out << L"</p>\n<p>";
|
||||
out << R("</p>\n<p>");
|
||||
|
||||
was_enter = 0;
|
||||
}
|
||||
|
||||
if( !HtmlTryChar(out, *i) )
|
||||
out << *i;
|
||||
out << *i;
|
||||
}
|
||||
|
||||
out << L"</p>\n";
|
||||
out << R("</p>\n");
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
std::wstring HtmlEscapeFormTxt(const std::wstring & in)
|
||||
{
|
||||
TextStream<std::wstring> out;
|
||||
@@ -114,7 +113,7 @@ std::wstring HtmlEscapeFormTxt(const std::wstring & in)
|
||||
|
||||
return out.Str();
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
|
||||
void print_date_nice(Info & i, const tm & rtm)
|
||||
@@ -136,14 +135,14 @@ void print_user_name(Info & i, const User * puser, const std::wstring & guest_na
|
||||
{
|
||||
if( puser )
|
||||
{
|
||||
HtmlEscape(i.out, puser->name);
|
||||
i.out << puser->name;
|
||||
}
|
||||
else
|
||||
{
|
||||
i.out << "~";
|
||||
|
||||
if( !guest_name.empty() )
|
||||
HtmlEscape(i.out, guest_name);
|
||||
i.out << guest_name;
|
||||
else
|
||||
i.out << "guest"; // !! dodac do konfiga
|
||||
}
|
||||
|
Reference in New Issue
Block a user