tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

changed: now we do not use std::string and char* in the Winix API

Browse Source 
everywhere we are using std::wstring and wchar_t*
         (std::string and char* is used only locally in some places
         especially when creating a path to OS file system etc.)
added:   to the special thread when winix closes:
         a write function for curl: FetchPageOnExitCurlCallback()
         without this function the curl library will print
         the page's content to the standart output
changed: TextStream<> class from core can make
         UTF8<->wide strings conversions
removed: from config: utf8 option
         now winix expects UTF8 from the user's input (html forms, url-es)
         and outputs strings in the UTF8 format




git-svn-id: svn://ttmath.org/publicrep/winix/trunk@965 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2014-10-09 20:44:56 +00:00
parent 4abf6642f7
commit 8196fb77d1
74 changed files with 1911 additions and 1612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
templates/Makefile.dep
View File

@@ -157,29 +157,30 @@ dir.o: ../../winix/core/timezones.h ../../winix/core/timezone.h
dir.o: ../../winix/core/sessionmanager.h ../../winix/core/sessioncontainer.h
dir.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
dir.o: ../../winix/core/htmlfilter.h ../../winix/core/misc.h
dir.o: ../../winix/functions/functions.h ../../winix/functions/functionbase.h
dir.o: ../../winix/core/request.h ../../winix/core/synchro.h
dir.o: ../../winix/functions/functionparser.h ../../winix/functions/account.h
dir.o: ../../winix/functions/adduser.h ../../winix/functions/cat.h
dir.o: ../../winix/functions/chmod.h ../../winix/functions/privchanger.h
dir.o: ../../winix/functions/chown.h ../../winix/functions/ckeditor.h
dir.o: ../../winix/functions/cp.h ../../winix/functions/default.h
dir.o: ../../winix/functions/download.h ../../winix/functions/emacs.h
dir.o: ../../winix/functions/env.h ../../winix/functions/imgcrop.h
dir.o: ../../winix/functions/last.h ../../winix/functions/login.h
dir.o: ../../winix/functions/logout.h ../../winix/functions/ln.h
dir.o: ../../winix/functions/ls.h ../../winix/functions/man.h
dir.o: ../../winix/functions/meta.h ../../winix/functions/mkdir.h
dir.o: ../../winix/functions/mv.h ../../winix/functions/nicedit.h
dir.o: ../../winix/functions/node.h ../../winix/functions/passwd.h
dir.o: ../../winix/functions/priv.h ../../winix/functions/pw.h
dir.o: ../../winix/functions/reload.h ../../winix/functions/rm.h
dir.o: ../../winix/functions/rmuser.h ../../winix/functions/sort.h
dir.o: ../../winix/functions/specialdefault.h ../../winix/functions/stat.h
dir.o: ../../winix/functions/subject.h ../../winix/functions/template.h
dir.o: ../../winix/functions/tinymce.h ../../winix/functions/uname.h
dir.o: ../../winix/functions/upload.h ../../winix/functions/uptime.h
dir.o: ../../winix/functions/who.h ../../winix/functions/vim.h miscspace.h
dir.o: ../../winix/core/winix_const.h ../../winix/functions/functions.h
dir.o: ../../winix/functions/functionbase.h ../../winix/core/request.h
dir.o: ../../winix/core/synchro.h ../../winix/functions/functionparser.h
dir.o: ../../winix/functions/account.h ../../winix/functions/adduser.h
dir.o: ../../winix/functions/cat.h ../../winix/functions/chmod.h
dir.o: ../../winix/functions/privchanger.h ../../winix/functions/chown.h
dir.o: ../../winix/functions/ckeditor.h ../../winix/functions/cp.h
dir.o: ../../winix/functions/default.h ../../winix/functions/download.h
dir.o: ../../winix/functions/emacs.h ../../winix/functions/env.h
dir.o: ../../winix/functions/imgcrop.h ../../winix/functions/last.h
dir.o: ../../winix/functions/login.h ../../winix/functions/logout.h
dir.o: ../../winix/functions/ln.h ../../winix/functions/ls.h
dir.o: ../../winix/functions/man.h ../../winix/functions/meta.h
dir.o: ../../winix/functions/mkdir.h ../../winix/functions/mv.h
dir.o: ../../winix/functions/nicedit.h ../../winix/functions/node.h
dir.o: ../../winix/functions/passwd.h ../../winix/functions/priv.h
dir.o: ../../winix/functions/pw.h ../../winix/functions/reload.h
dir.o: ../../winix/functions/rm.h ../../winix/functions/rmuser.h
dir.o: ../../winix/functions/sort.h ../../winix/functions/specialdefault.h
dir.o: ../../winix/functions/stat.h ../../winix/functions/subject.h
dir.o: ../../winix/functions/template.h ../../winix/functions/tinymce.h
dir.o: ../../winix/functions/uname.h ../../winix/functions/upload.h
dir.o: ../../winix/functions/uptime.h ../../winix/functions/who.h
dir.o: ../../winix/functions/vim.h miscspace.h
doc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
doc.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
doc.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
@@ -225,7 +226,7 @@ doc.o: ../../winix/core/timezones.h ../../winix/core/timezone.h
doc.o: ../../winix/core/sessionmanager.h ../../winix/core/sessioncontainer.h
doc.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
doc.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h
doc.o: ../../winix/core/misc.h
doc.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
env.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
env.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
env.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
@@ -271,29 +272,30 @@ env.o: ../../winix/core/timezones.h ../../winix/core/timezone.h
env.o: ../../winix/core/sessionmanager.h ../../winix/core/sessioncontainer.h
env.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
env.o: ../../winix/core/htmlfilter.h ../../winix/core/misc.h
env.o: ../../winix/functions/functions.h ../../winix/functions/functionbase.h
env.o: ../../winix/core/request.h ../../winix/core/synchro.h
env.o: ../../winix/functions/functionparser.h ../../winix/functions/account.h
env.o: ../../winix/functions/adduser.h ../../winix/functions/cat.h
env.o: ../../winix/functions/chmod.h ../../winix/functions/privchanger.h
env.o: ../../winix/functions/chown.h ../../winix/functions/ckeditor.h
env.o: ../../winix/functions/cp.h ../../winix/functions/default.h
env.o: ../../winix/functions/download.h ../../winix/functions/emacs.h
env.o: ../../winix/functions/env.h ../../winix/functions/imgcrop.h
env.o: ../../winix/functions/last.h ../../winix/functions/login.h
env.o: ../../winix/functions/logout.h ../../winix/functions/ln.h
env.o: ../../winix/functions/ls.h ../../winix/functions/man.h
env.o: ../../winix/functions/meta.h ../../winix/functions/mkdir.h
env.o: ../../winix/functions/mv.h ../../winix/functions/nicedit.h
env.o: ../../winix/functions/node.h ../../winix/functions/passwd.h
env.o: ../../winix/functions/priv.h ../../winix/functions/pw.h
env.o: ../../winix/functions/reload.h ../../winix/functions/rm.h
env.o: ../../winix/functions/rmuser.h ../../winix/functions/sort.h
env.o: ../../winix/functions/specialdefault.h ../../winix/functions/stat.h
env.o: ../../winix/functions/subject.h ../../winix/functions/template.h
env.o: ../../winix/functions/tinymce.h ../../winix/functions/uname.h
env.o: ../../winix/functions/upload.h ../../winix/functions/uptime.h
env.o: ../../winix/functions/who.h ../../winix/functions/vim.h
env.o: ../../winix/core/winix_const.h ../../winix/functions/functions.h
env.o: ../../winix/functions/functionbase.h ../../winix/core/request.h
env.o: ../../winix/core/synchro.h ../../winix/functions/functionparser.h
env.o: ../../winix/functions/account.h ../../winix/functions/adduser.h
env.o: ../../winix/functions/cat.h ../../winix/functions/chmod.h
env.o: ../../winix/functions/privchanger.h ../../winix/functions/chown.h
env.o: ../../winix/functions/ckeditor.h ../../winix/functions/cp.h
env.o: ../../winix/functions/default.h ../../winix/functions/download.h
env.o: ../../winix/functions/emacs.h ../../winix/functions/env.h
env.o: ../../winix/functions/imgcrop.h ../../winix/functions/last.h
env.o: ../../winix/functions/login.h ../../winix/functions/logout.h
env.o: ../../winix/functions/ln.h ../../winix/functions/ls.h
env.o: ../../winix/functions/man.h ../../winix/functions/meta.h
env.o: ../../winix/functions/mkdir.h ../../winix/functions/mv.h
env.o: ../../winix/functions/nicedit.h ../../winix/functions/node.h
env.o: ../../winix/functions/passwd.h ../../winix/functions/priv.h
env.o: ../../winix/functions/pw.h ../../winix/functions/reload.h
env.o: ../../winix/functions/rm.h ../../winix/functions/rmuser.h
env.o: ../../winix/functions/sort.h ../../winix/functions/specialdefault.h
env.o: ../../winix/functions/stat.h ../../winix/functions/subject.h
env.o: ../../winix/functions/template.h ../../winix/functions/tinymce.h
env.o: ../../winix/functions/uname.h ../../winix/functions/upload.h
env.o: ../../winix/functions/uptime.h ../../winix/functions/who.h
env.o: ../../winix/functions/vim.h
filters.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
filters.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
filters.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
@@ -343,6 +345,7 @@ filters.o: ../../winix/core/sessionmanager.h
filters.o: ../../winix/core/sessioncontainer.h
filters.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
filters.o: ../../winix/core/htmlfilter.h ../../winix/core/misc.h
filters.o: ../../winix/core/winix_const.h
htmltextstream.o: htmltextstream.h ../../winix/core/textstream.h misc.h
htmltextstream.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
htmltextstream.o: ../../pikotools/space/space.h
@@ -423,7 +426,7 @@ insert.o: ../../winix/core/sessionmanager.h
insert.o: ../../winix/core/sessioncontainer.h
insert.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
insert.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h
insert.o: ../../winix/core/misc.h
insert.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
ipban.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
ipban.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
ipban.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
@@ -471,7 +474,8 @@ ipban.o: ../../winix/core/sessionmanager.h
ipban.o: ../../winix/core/sessioncontainer.h
ipban.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
ipban.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h
ipban.o: ../../winix/core/misc.h ../../winix/functions/functions.h
ipban.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
ipban.o: ../../winix/functions/functions.h
ipban.o: ../../winix/functions/functionbase.h ../../winix/core/synchro.h
ipban.o: ../../winix/functions/functionparser.h
ipban.o: ../../winix/functions/account.h ../../winix/functions/adduser.h
@@ -540,7 +544,8 @@ item.o: ../../winix/core/timezones.h ../../winix/core/timezone.h
item.o: ../../winix/core/sessionmanager.h ../../winix/core/sessioncontainer.h
item.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
item.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h
item.o: ../../winix/core/misc.h ../../winix/core/bbcodeparser.h miscspace.h
item.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
item.o: ../../winix/core/bbcodeparser.h miscspace.h
last.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
last.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
last.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
@@ -586,7 +591,7 @@ last.o: ../../winix/core/timezones.h ../../winix/core/timezone.h
last.o: ../../winix/core/sessionmanager.h ../../winix/core/sessioncontainer.h
last.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
last.o: ../../winix/core/htmlfilter.h ../core/lastcontainer.h
last.o: ../core/request.h ../core/misc.h
last.o: ../core/request.h ../core/misc.h ../../winix/core/winix_const.h
locale.o: locale.h ../../pikotools/space/spaceparser.h
locale.o: ../../pikotools/space/space.h ../../pikotools/textstream/types.h
locale.o: ../../pikotools/textstream/textstream.h
@@ -600,6 +605,7 @@ locale.o: ../../winix/core/slog.h ../../winix/core/cur.h
locale.o: ../../winix/templates/locale.h ../../winix/core/misc.h
locale.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
locale.o: ../../winix/core/requesttypes.h ../../pikotools/utf8/utf8.h
locale.o: ../../winix/core/winix_const.h
localefilter.o: localefilter.h locale.h ../../pikotools/space/spaceparser.h
localefilter.o: ../../pikotools/space/space.h
localefilter.o: ../../pikotools/textstream/types.h
@@ -614,6 +620,7 @@ localefilter.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
localefilter.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
localefilter.o: ../../pikotools/utf8/utf8.h ../core/misc.h
localefilter.o: ../../winix/core/requesttypes.h
localefilter.o: ../../winix/core/winix_const.h
login.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
login.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
login.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
@@ -774,29 +781,30 @@ man.o: ../../winix/core/timezones.h ../../winix/core/timezone.h
man.o: ../../winix/core/sessionmanager.h ../../winix/core/sessioncontainer.h
man.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
man.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h
man.o: ../../winix/core/misc.h ../../winix/functions/functions.h
man.o: ../../winix/functions/functionbase.h ../../winix/core/synchro.h
man.o: ../../winix/functions/functionparser.h ../../winix/functions/account.h
man.o: ../../winix/functions/adduser.h ../../winix/functions/cat.h
man.o: ../../winix/functions/chmod.h ../../winix/functions/privchanger.h
man.o: ../../winix/functions/chown.h ../../winix/functions/ckeditor.h
man.o: ../../winix/functions/cp.h ../../winix/functions/default.h
man.o: ../../winix/functions/download.h ../../winix/functions/emacs.h
man.o: ../../winix/functions/env.h ../../winix/functions/imgcrop.h
man.o: ../../winix/functions/last.h ../../winix/functions/login.h
man.o: ../../winix/functions/logout.h ../../winix/functions/ln.h
man.o: ../../winix/functions/ls.h ../../winix/functions/man.h
man.o: ../../winix/functions/meta.h ../../winix/functions/mkdir.h
man.o: ../../winix/functions/mv.h ../../winix/functions/nicedit.h
man.o: ../../winix/functions/node.h ../../winix/functions/passwd.h
man.o: ../../winix/functions/priv.h ../../winix/functions/pw.h
man.o: ../../winix/functions/reload.h ../../winix/functions/rm.h
man.o: ../../winix/functions/rmuser.h ../../winix/functions/sort.h
man.o: ../../winix/functions/specialdefault.h ../../winix/functions/stat.h
man.o: ../../winix/functions/subject.h ../../winix/functions/template.h
man.o: ../../winix/functions/tinymce.h ../../winix/functions/uname.h
man.o: ../../winix/functions/upload.h ../../winix/functions/uptime.h
man.o: ../../winix/functions/who.h ../../winix/functions/vim.h
man.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
man.o: ../../winix/functions/functions.h ../../winix/functions/functionbase.h
man.o: ../../winix/core/synchro.h ../../winix/functions/functionparser.h
man.o: ../../winix/functions/account.h ../../winix/functions/adduser.h
man.o: ../../winix/functions/cat.h ../../winix/functions/chmod.h
man.o: ../../winix/functions/privchanger.h ../../winix/functions/chown.h
man.o: ../../winix/functions/ckeditor.h ../../winix/functions/cp.h
man.o: ../../winix/functions/default.h ../../winix/functions/download.h
man.o: ../../winix/functions/emacs.h ../../winix/functions/env.h
man.o: ../../winix/functions/imgcrop.h ../../winix/functions/last.h
man.o: ../../winix/functions/login.h ../../winix/functions/logout.h
man.o: ../../winix/functions/ln.h ../../winix/functions/ls.h
man.o: ../../winix/functions/man.h ../../winix/functions/meta.h
man.o: ../../winix/functions/mkdir.h ../../winix/functions/mv.h
man.o: ../../winix/functions/nicedit.h ../../winix/functions/node.h
man.o: ../../winix/functions/passwd.h ../../winix/functions/priv.h
man.o: ../../winix/functions/pw.h ../../winix/functions/reload.h
man.o: ../../winix/functions/rm.h ../../winix/functions/rmuser.h
man.o: ../../winix/functions/sort.h ../../winix/functions/specialdefault.h
man.o: ../../winix/functions/stat.h ../../winix/functions/subject.h
man.o: ../../winix/functions/template.h ../../winix/functions/tinymce.h
man.o: ../../winix/functions/uname.h ../../winix/functions/upload.h
man.o: ../../winix/functions/uptime.h ../../winix/functions/who.h
man.o: ../../winix/functions/vim.h
misc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
misc.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
misc.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
@@ -842,7 +850,7 @@ misc.o: ../../winix/core/timezones.h ../../winix/core/timezone.h
misc.o: ../../winix/core/sessionmanager.h ../../winix/core/sessioncontainer.h
misc.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
misc.o: ../../winix/core/htmlfilter.h ../../winix/core/misc.h
misc.o: ../../winix/core/request.h
misc.o: ../../winix/core/winix_const.h ../../winix/core/request.h
miscspace.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
miscspace.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
miscspace.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
@@ -939,7 +947,7 @@ mount.o: ../../winix/core/sessionmanager.h
mount.o: ../../winix/core/sessioncontainer.h
mount.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
mount.o: ../../winix/core/htmlfilter.h ../../winix/core/misc.h
mount.o: ../../winix/core/mounts.h
mount.o: ../../winix/core/winix_const.h ../../winix/core/mounts.h
passwd.o: ../../winix/core/request.h templates.h ../../ezc/src/ezc.h
passwd.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
passwd.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
@@ -1069,7 +1077,8 @@ priv.o: ../../winix/core/timezones.h ../../winix/core/timezone.h
priv.o: ../../winix/core/sessionmanager.h ../../winix/core/sessioncontainer.h
priv.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
priv.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h
priv.o: ../../winix/core/misc.h ../../winix/functions/functions.h
priv.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
priv.o: ../../winix/functions/functions.h
priv.o: ../../winix/functions/functionbase.h ../../winix/core/synchro.h
priv.o: ../../winix/functions/functionparser.h
priv.o: ../../winix/functions/account.h ../../winix/functions/adduser.h
@@ -1231,7 +1240,7 @@ stat.o: ../../winix/core/timezones.h ../../winix/core/timezone.h
stat.o: ../../winix/core/sessionmanager.h ../../winix/core/sessioncontainer.h
stat.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
stat.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h
stat.o: ../../winix/core/misc.h
stat.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
sys.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
sys.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
sys.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
@@ -1351,6 +1360,7 @@ template.o: ../../winix/core/sessionmanager.h
template.o: ../../winix/core/sessioncontainer.h
template.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
template.o: ../../winix/core/htmlfilter.h ../../winix/core/misc.h
template.o: ../../winix/core/winix_const.h
templates.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
templates.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
templates.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h
@@ -1400,8 +1410,8 @@ templates.o: ../../winix/core/sessionmanager.h
templates.o: ../../winix/core/sessioncontainer.h
templates.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
templates.o: ../../winix/core/htmlfilter.h ../../winix/core/misc.h
templates.o: ../../winix/core/plugin.h ../../winix/core/pluginmsg.h
templates.o: ../../winix/core/sessionmanager.h
templates.o: ../../winix/core/winix_const.h ../../winix/core/plugin.h
templates.o: ../../winix/core/pluginmsg.h ../../winix/core/sessionmanager.h
templates.o: ../../winix/functions/functions.h
templates.o: ../../winix/functions/functionbase.h ../../winix/core/request.h
templates.o: ../../winix/core/synchro.h
@@ -1584,7 +1594,7 @@ user.o: ../../winix/core/timezones.h ../../winix/core/timezone.h
user.o: ../../winix/core/sessionmanager.h ../../winix/core/sessioncontainer.h
user.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
user.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h
user.o: ../../winix/core/misc.h
user.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
who.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
who.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
who.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
@@ -1630,7 +1640,7 @@ who.o: ../../winix/core/timezones.h ../../winix/core/timezone.h
who.o: ../../winix/core/sessionmanager.h ../../winix/core/sessioncontainer.h
who.o: ../../winix/core/ipbancontainer.h ../../winix/core/system.h
who.o: ../../winix/core/htmlfilter.h ../../winix/core/request.h
who.o: ../../winix/core/misc.h
who.o: ../../winix/core/misc.h ../../winix/core/winix_const.h
winix.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/generator.h
winix.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h
winix.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
@@ -1703,4 +1713,4 @@ winix.o: ../../winix/functions/template.h ../../winix/functions/tinymce.h
winix.o: ../../winix/functions/uname.h ../../winix/functions/upload.h
winix.o: ../../winix/functions/uptime.h ../../winix/functions/who.h
winix.o: ../../winix/functions/vim.h ../../winix/templates/templates.h
winix.o: ../../winix/core/misc.h
winix.o: ../../winix/core/misc.h ../../winix/core/winix_const.h

45
templates/htmltextstream.cpp
View File

@@ -77,7 +77,7 @@ return *this;
HtmlTextStream & HtmlTextStream::PutText(const char * str, size_t len)
{
TextStream<std::wstring>::operator<<(str);
TextStream<std::wstring>::Write(str, len);
return *this;
}
@@ -85,13 +85,17 @@ return *this;
HtmlTextStream & HtmlTextStream::PutText(const std::string * str)
{
return PutText(str->c_str());
TextStream<std::wstring>::operator<<(str);
return *this;
}
HtmlTextStream & HtmlTextStream::PutText(const std::string & str)
{
return PutText(str.c_str());
TextStream<std::wstring>::operator<<(str);
return *this;
}
@@ -106,13 +110,17 @@ return *this;
HtmlTextStream & HtmlTextStream::PutText(const std::wstring * str)
{
return PutText(str->c_str());
TextStream<std::wstring>::operator<<(str);
return *this;
}
HtmlTextStream & HtmlTextStream::PutText(const std::wstring & str)
{
return PutText(str.c_str());
TextStream<std::wstring>::operator<<(str);
return *this;
}
@@ -294,8 +302,12 @@ return *this;
HtmlTextStream & HtmlTextStream::EPutText(const char * str)
{
for( ; *str ; ++str )
ETextPutChar(*str);
PT::UTF8ToWide(str, tmp_string);
for(size_t i=0 ; i<tmp_string.size() ; ++i)
ETextPutChar(tmp_string[i]);
tmp_string.clear();
return *this;
}
@@ -304,8 +316,12 @@ return *this;
HtmlTextStream & HtmlTextStream::EPutText(const char * str, size_t len)
{
for(size_t i=0 ; i<len ; ++i)
ETextPutChar(str[i]);
PT::UTF8ToWide(str, len, tmp_string);
for(size_t i=0 ; i<tmp_string.size() ; ++i)
ETextPutChar(tmp_string[i]);
tmp_string.clear();
return *this;
}
@@ -313,13 +329,20 @@ return *this;
HtmlTextStream & HtmlTextStream::EPutText(const std::string * str)
{
return EPutText(str->c_str(), str->size());
return EPutText(*str);
}
HtmlTextStream & HtmlTextStream::EPutText(const std::string & str)
{
return EPutText(str.c_str(), str.size());
PT::UTF8ToWide(str, tmp_string);
for(size_t i=0 ; i<tmp_string.size() ; ++i)
ETextPutChar(tmp_string[i]);
tmp_string.clear();
return *this;
}

1
templates/htmltextstream.h
View File

@@ -193,6 +193,7 @@ public:
private:
TextStream<std::wstring> tmp_stream;
std::wstring tmp_string;
};

8
templates/locale.cpp
View File

@@ -46,7 +46,6 @@ Locale::Locale()
{
default_lang = 0;
current_lang = 0;
input_as_utf8 = false;
}
@@ -114,7 +113,6 @@ bool read = false;
file_name += file;
loc_parser.SplitSingle(true);
loc_parser.UTF8(input_as_utf8);
loc_parser.SetSpace(temp_space);
PT::SpaceParser::Status status = loc_parser.Parse(file_name);
@@ -189,7 +187,6 @@ bool read = false;
file_name += "substitute";
loc_parser.SplitSingle(true);
loc_parser.UTF8(input_as_utf8);
loc_parser.SetSpace(temp_space);
if( loc_parser.Parse(file_name) == PT::SpaceParser::ok )
@@ -663,11 +660,6 @@ return empty_list;
void Locale::UTF8(bool utf)
{
input_as_utf8 = utf;
}
/*

5
templates/locale.h
View File

@@ -150,10 +150,6 @@ public:
bool try_default_too = true) const;
// it sets whether we should parse locale files as utf-8 files
// default: false
void UTF8(bool utf);
// url substitution characters
wchar_t UrlSubst(wchar_t c);
void UrlSubst(std::wstring & str);
@@ -230,7 +226,6 @@ private:
const std::wstring empty; // used when returning a non existing key from loc_tab (or in LangToFileName)
const std::vector<std::wstring> empty_list; // the same as above
std::string adir1, adir2;
bool input_as_utf8;
};

7
templates/patterns.cpp
View File

@@ -42,7 +42,6 @@ namespace Winix
Patterns::Patterns()
{
utf8 = false;
del_white_items = false;
ezc_fun = 0;
locale = 0;
@@ -51,11 +50,6 @@ Patterns::Patterns()
void Patterns::SetUTF8(bool _utf8)
{
utf8 = _utf8;
}
void Patterns::SetDeleteWhiteItems(bool del_white)
{
@@ -128,7 +122,6 @@ void Patterns::ReadPatterns(Template & templ)
for(size_t i=0 ; i<len ; ++i)
{
templ.patterns[i].UTF8(utf8);
templ.patterns[i].DeleteWhiteTextItems(del_white_items);
templ.patterns[i].Directory(templates_dir, templates_dir_def);
templ.patterns[i].ParseFile(templ.file_name);

2
templates/patterns.h
View File

@@ -50,7 +50,6 @@ public:
Patterns();
void SetUTF8(bool _utf8);
void SetDeleteWhiteItems(bool del_white);
void SetDirectories(const std::wstring & tmpl_dir, const std::wstring & tmpl_dir_def);
@@ -123,7 +122,6 @@ public:
private:
bool utf8;
bool del_white_items;
std::wstring templates_dir, templates_dir_def;
Locale * locale;

2
templates/templates.cpp
View File

@@ -697,7 +697,6 @@ void Templates::ReadLocale()
{
using namespace TemplatesFunctions;
locale.UTF8(config->utf8);
locale.SetLocaleFiles(config->locale_files);
locale.SetLocaleMaxId(config->locale_max_id);
locale.SetDefLang(config->locale_default_id);
@@ -875,7 +874,6 @@ void Templates::Init()
{
using namespace TemplatesFunctions;
patterns.SetUTF8(config->utf8);
patterns.SetDirectories(config->templates_dir, config->templates_dir_default);
pattern_cacher.SetWhenDelete(config->pattern_cacher_when_delete, config->pattern_cacher_how_many_delete);