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

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:
Tomasz Sowa 2010-11-25 01:34:46 +00:00
parent 518281e101
commit 933c8841ff
53 changed files with 1925 additions and 1098 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

205
core/Makefile.dep
View File

@ -7,29 +7,29 @@ app.o: ../db/dbtextstream.h ../core/textstream.h misc.h ../core/error.h log.h
app.o: textstream.h ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
app.o: ../core/user.h ../core/group.h ../core/thread.h ../core/dircontainer.h
app.o: ../core/ugcontainer.h request.h requesttypes.h session.h error.h
app.o: user.h plugindata.h rebus.h mounts.h mount.h mountparser.h users.h
app.o: ugcontainer.h lastcontainer.h groups.h group.h loadavg.h
app.o: sessionmanager.h sessioncontainer.h notify.h
app.o: user.h plugindata.h rebus.h ../templates/htmltextstream.h mounts.h
app.o: mount.h mountparser.h users.h ugcontainer.h lastcontainer.h groups.h
app.o: group.h loadavg.h sessionmanager.h sessioncontainer.h notify.h
app.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
app.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h
app.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h
app.o: ../../ezc/src/funinfo.h ../core/mount.h ../core/config.h
app.o: ../templates/misc.h ../templates/localefilter.h ../templates/locale.h
app.o: ../core/confparser.h ../functions/functions.h
app.o: ../functions/functionbase.h ../core/request.h ../core/system.h
app.o: ../core/notify.h ../functions/functionparser.h ../functions/adduser.h
app.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
app.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
app.o: ../functions/createthread.h ../functions/default.h
app.o: ../functions/download.h ../functions/emacs.h ../functions/last.h
app.o: ../functions/login.h ../functions/logout.h ../functions/ls.h
app.o: ../functions/mkdir.h ../functions/mv.h ../functions/node.h
app.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h
app.o: ../functions/run.h ../functions/stat.h ../functions/subject.h
app.o: ../functions/funthread.h ../functions/template.h
app.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
app.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h
app.o: ../core/htmlfilter.h ../templates/templates.h
app.o: ../core/confparser.h ../templates/htmltextstream.h
app.o: ../functions/functions.h ../functions/functionbase.h ../core/request.h
app.o: ../core/system.h ../core/notify.h ../functions/functionparser.h
app.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
app.o: ../functions/privchanger.h ../functions/chown.h
app.o: ../functions/ckeditor.h ../functions/cp.h ../functions/createthread.h
app.o: ../functions/default.h ../functions/download.h ../functions/emacs.h
app.o: ../functions/last.h ../functions/login.h ../functions/logout.h
app.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h
app.o: ../functions/node.h ../functions/priv.h ../functions/reload.h
app.o: ../functions/rm.h ../functions/run.h ../functions/stat.h
app.o: ../functions/subject.h ../functions/funthread.h
app.o: ../functions/template.h ../functions/tinymce.h ../functions/uname.h
app.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h
app.o: ../functions/vim.h ../core/htmlfilter.h ../templates/templates.h
app.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h
app.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h
app.o: ../core/sessionmanager.h compress.h getparser.h httpsimpleparser.h
@ -39,10 +39,11 @@ bbcodeparser.o: bbcodeparser.h htmlfilter.h
compress.o: compress.h log.h textstream.h
config.o: config.h confparser.h htmlfilter.h log.h textstream.h plugin.h
config.o: pluginmsg.h plugindata.h request.h requesttypes.h session.h item.h
config.o: error.h user.h rebus.h system.h dirs.h dircontainer.h ../db/db.h
config.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
config.o: ../core/textstream.h misc.h ../core/error.h ../db/dbitemquery.h
config.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
config.o: error.h user.h rebus.h ../templates/htmltextstream.h
config.o: ../core/textstream.h misc.h system.h dirs.h dircontainer.h
config.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
config.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
config.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
config.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
config.o: mounts.h mount.h mountparser.h users.h ugcontainer.h
config.o: lastcontainer.h groups.h group.h loadavg.h sessionmanager.h
@ -68,7 +69,8 @@ config.o: ../../ezc/src/funinfo.h ../templates/patterncacher.h
config.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
config.o: ../core/log.h ../templates/indexpatterns.h
config.o: ../templates/localefilter.h ../templates/locale.h
config.o: ../core/confparser.h ../core/sessionmanager.h
config.o: ../core/confparser.h ../templates/htmltextstream.h
config.o: ../core/sessionmanager.h
confparser.o: confparser.h misc.h item.h ../../ezc/src/utf8.h
dircontainer.o: dircontainer.h item.h log.h textstream.h
dirs.o: dirs.h item.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
@ -77,14 +79,15 @@ dirs.o: log.h textstream.h ../db/dbitemquery.h ../core/item.h
dirs.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h ../core/thread.h
dirs.o: ../core/dircontainer.h ../core/ugcontainer.h request.h requesttypes.h
dirs.o: session.h error.h user.h plugindata.h rebus.h config.h confparser.h
dirs.o: htmlfilter.h notify.h ../templatesnotify/templatesnotify.h
dirs.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
dirs.o: htmlfilter.h ../templates/htmltextstream.h notify.h
dirs.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
dirs.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
dirs.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h
dirs.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h ../core/mount.h
dirs.o: ../core/config.h ../templates/misc.h ../templates/localefilter.h
dirs.o: ../templates/locale.h ../core/confparser.h system.h mounts.h mount.h
dirs.o: mountparser.h users.h ugcontainer.h lastcontainer.h groups.h group.h
dirs.o: loadavg.h
dirs.o: ../templates/locale.h ../core/confparser.h
dirs.o: ../templates/htmltextstream.h system.h mounts.h mount.h mountparser.h
dirs.o: users.h ugcontainer.h lastcontainer.h groups.h group.h loadavg.h
groups.o: groups.h group.h ugcontainer.h ../db/db.h ../db/dbbase.h
groups.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h
groups.o: item.h ../core/error.h log.h textstream.h ../db/dbitemquery.h
@ -108,8 +111,9 @@ misc.o: ../core/confparser.h ../core/config.h ../db/db.h ../db/dbbase.h
misc.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
misc.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h
misc.o: ../core/user.h ../core/group.h ../core/thread.h
misc.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
misc.o: ../core/system.h ../core/sessionmanager.h
misc.o: ../core/dircontainer.h ../core/ugcontainer.h
misc.o: ../templates/htmltextstream.h ../core/request.h ../core/system.h
misc.o: ../core/sessionmanager.h
mount.o: mount.h misc.h item.h
mountparser.o: mountparser.h mount.h item.h error.h dirs.h dircontainer.h
mountparser.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
@ -118,7 +122,7 @@ mountparser.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
mountparser.o: ../core/user.h ../core/group.h ../core/thread.h
mountparser.o: ../core/dircontainer.h ../core/ugcontainer.h request.h
mountparser.o: requesttypes.h session.h user.h plugindata.h rebus.h config.h
mountparser.o: confparser.h htmlfilter.h
mountparser.o: confparser.h htmlfilter.h ../templates/htmltextstream.h
mounts.o: mounts.h mount.h error.h dirs.h item.h dircontainer.h ../db/db.h
mounts.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
mounts.o: ../core/textstream.h misc.h ../core/error.h log.h textstream.h
@ -126,15 +130,15 @@ mounts.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
mounts.o: ../core/user.h ../core/group.h ../core/thread.h
mounts.o: ../core/dircontainer.h ../core/ugcontainer.h request.h
mounts.o: requesttypes.h session.h user.h plugindata.h rebus.h config.h
mounts.o: confparser.h htmlfilter.h mountparser.h plugin.h pluginmsg.h
mounts.o: system.h users.h ugcontainer.h lastcontainer.h groups.h group.h
mounts.o: loadavg.h sessionmanager.h sessioncontainer.h
mounts.o: ../functions/functions.h ../functions/functionbase.h
mounts.o: ../core/request.h ../core/config.h ../core/system.h
mounts.o: ../core/notify.h ../../ezc/src/utf8.h ../functions/functionparser.h
mounts.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
mounts.o: ../functions/privchanger.h ../functions/chown.h
mounts.o: ../functions/ckeditor.h ../functions/cp.h
mounts.o: confparser.h htmlfilter.h ../templates/htmltextstream.h
mounts.o: mountparser.h plugin.h pluginmsg.h system.h users.h ugcontainer.h
mounts.o: lastcontainer.h groups.h group.h loadavg.h sessionmanager.h
mounts.o: sessioncontainer.h ../functions/functions.h
mounts.o: ../functions/functionbase.h ../core/request.h ../core/config.h
mounts.o: ../core/system.h ../core/notify.h ../../ezc/src/utf8.h
mounts.o: ../functions/functionparser.h ../functions/adduser.h
mounts.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
mounts.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
mounts.o: ../functions/createthread.h ../functions/default.h
mounts.o: ../functions/download.h ../functions/emacs.h ../functions/last.h
mounts.o: ../functions/login.h ../functions/logout.h ../functions/ls.h
@ -151,27 +155,31 @@ mounts.o: ../../ezc/src/funinfo.h ../templates/patterncacher.h
mounts.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
mounts.o: ../core/log.h ../templates/indexpatterns.h
mounts.o: ../templates/localefilter.h ../templates/locale.h
mounts.o: ../core/confparser.h ../core/sessionmanager.h
mounts.o: ../core/confparser.h ../templates/htmltextstream.h
mounts.o: ../core/sessionmanager.h
notify.o: log.h textstream.h notify.h ../templatesnotify/templatesnotify.h
notify.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
notify.o: ../../ezc/src/pattern.h item.h ../../ezc/src/stringconv.h
notify.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h ../core/mount.h
notify.o: ../core/config.h ../core/textstream.h misc.h ../templates/misc.h
notify.o: ../templates/localefilter.h ../templates/locale.h
notify.o: ../core/confparser.h ../core/user.h request.h requesttypes.h
notify.o: session.h error.h user.h plugindata.h rebus.h config.h confparser.h
notify.o: htmlfilter.h system.h dirs.h dircontainer.h ../db/db.h
notify.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
notify.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
notify.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
notify.o: ../core/ugcontainer.h mounts.h mount.h mountparser.h users.h
notify.o: ugcontainer.h lastcontainer.h groups.h group.h loadavg.h
notify.o: ../core/confparser.h ../templates/htmltextstream.h ../core/user.h
notify.o: request.h requesttypes.h session.h error.h user.h plugindata.h
notify.o: rebus.h config.h confparser.h htmlfilter.h
notify.o: ../templates/htmltextstream.h system.h dirs.h dircontainer.h
notify.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
notify.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
notify.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
notify.o: ../core/dircontainer.h ../core/ugcontainer.h mounts.h mount.h
notify.o: mountparser.h users.h ugcontainer.h lastcontainer.h groups.h
notify.o: group.h loadavg.h
plugin.o: plugin.h pluginmsg.h log.h textstream.h plugindata.h config.h
plugin.o: confparser.h htmlfilter.h request.h requesttypes.h session.h item.h
plugin.o: error.h user.h rebus.h system.h dirs.h dircontainer.h ../db/db.h
plugin.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
plugin.o: ../core/textstream.h misc.h ../core/error.h ../db/dbitemquery.h
plugin.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
plugin.o: error.h user.h rebus.h ../templates/htmltextstream.h
plugin.o: ../core/textstream.h misc.h system.h dirs.h dircontainer.h
plugin.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
plugin.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
plugin.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
plugin.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
plugin.o: mounts.h mount.h mountparser.h users.h ugcontainer.h
plugin.o: lastcontainer.h groups.h group.h loadavg.h sessionmanager.h
@ -197,17 +205,19 @@ plugin.o: ../../ezc/src/funinfo.h ../templates/patterncacher.h
plugin.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
plugin.o: ../core/log.h ../templates/indexpatterns.h
plugin.o: ../templates/localefilter.h ../templates/locale.h
plugin.o: ../core/confparser.h ../core/sessionmanager.h
plugin.o: ../core/confparser.h ../templates/htmltextstream.h
plugin.o: ../core/sessionmanager.h
plugindata.o: plugindata.h plugin.h pluginmsg.h log.h textstream.h config.h
plugindata.o: confparser.h htmlfilter.h request.h requesttypes.h session.h
plugindata.o: item.h error.h user.h rebus.h system.h dirs.h dircontainer.h
plugindata.o: item.h error.h user.h rebus.h ../templates/htmltextstream.h
plugindata.o: ../core/textstream.h misc.h system.h dirs.h dircontainer.h
plugindata.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
plugindata.o: ../core/textstream.h misc.h ../core/error.h ../db/dbitemquery.h
plugindata.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h
plugindata.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
plugindata.o: ../core/ugcontainer.h mounts.h mount.h mountparser.h users.h
plugindata.o: ugcontainer.h lastcontainer.h groups.h group.h loadavg.h
plugindata.o: sessionmanager.h sessioncontainer.h ../functions/functions.h
plugindata.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
plugindata.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
plugindata.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
plugindata.o: mounts.h mount.h mountparser.h users.h ugcontainer.h
plugindata.o: lastcontainer.h groups.h group.h loadavg.h sessionmanager.h
plugindata.o: sessioncontainer.h ../functions/functions.h
plugindata.o: ../functions/functionbase.h ../core/request.h ../core/config.h
plugindata.o: ../core/system.h ../core/notify.h ../../ezc/src/utf8.h
plugindata.o: ../functions/functionparser.h ../functions/adduser.h
@ -232,26 +242,26 @@ plugindata.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h
plugindata.o: ../core/httpsimpleparser.h ../core/log.h
plugindata.o: ../templates/indexpatterns.h ../templates/localefilter.h
plugindata.o: ../templates/locale.h ../core/confparser.h
plugindata.o: ../core/sessionmanager.h
plugindata.o: ../templates/htmltextstream.h ../core/sessionmanager.h
postmultiparser.o: postmultiparser.h error.h requesttypes.h config.h
postmultiparser.o: confparser.h htmlfilter.h log.h textstream.h
postmultiparser.o: ../../ezc/src/utf8.h misc.h item.h
rebus.o: log.h textstream.h rebus.h misc.h item.h request.h requesttypes.h
rebus.o: session.h error.h user.h plugindata.h config.h confparser.h
rebus.o: htmlfilter.h
rebus.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h
request.o: request.h requesttypes.h session.h item.h error.h user.h
request.o: plugindata.h rebus.h config.h confparser.h htmlfilter.h
request.o: textstream.h log.h plugin.h pluginmsg.h system.h dirs.h
request.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
request.o: ../db/dbtextstream.h ../core/textstream.h misc.h ../core/error.h
request.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
request.o: ../core/user.h ../core/group.h ../core/thread.h
request.o: ../core/dircontainer.h ../core/ugcontainer.h mounts.h mount.h
request.o: mountparser.h users.h ugcontainer.h lastcontainer.h groups.h
request.o: group.h loadavg.h sessionmanager.h sessioncontainer.h
request.o: ../functions/functions.h ../functions/functionbase.h
request.o: ../core/request.h ../core/config.h ../core/system.h
request.o: ../core/notify.h ../../ezc/src/utf8.h
request.o: textstream.h ../templates/htmltextstream.h ../core/textstream.h
request.o: misc.h log.h plugin.h pluginmsg.h system.h dirs.h dircontainer.h
request.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
request.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
request.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
request.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
request.o: mounts.h mount.h mountparser.h users.h ugcontainer.h
request.o: lastcontainer.h groups.h group.h loadavg.h sessionmanager.h
request.o: sessioncontainer.h ../functions/functions.h
request.o: ../functions/functionbase.h ../core/request.h ../core/config.h
request.o: ../core/system.h ../core/notify.h ../../ezc/src/utf8.h
request.o: ../functions/functionparser.h ../functions/adduser.h
request.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
request.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
@ -271,18 +281,21 @@ request.o: ../../ezc/src/funinfo.h ../templates/patterncacher.h
request.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
request.o: ../core/log.h ../templates/indexpatterns.h
request.o: ../templates/localefilter.h ../templates/locale.h
request.o: ../core/confparser.h ../core/sessionmanager.h
request.o: ../core/confparser.h ../templates/htmltextstream.h
request.o: ../core/sessionmanager.h
session.o: session.h item.h error.h user.h plugindata.h rebus.h misc.h
sessioncontainer.o: sessioncontainer.h session.h item.h error.h user.h
sessioncontainer.o: plugindata.h rebus.h lastcontainer.h request.h
sessioncontainer.o: requesttypes.h config.h confparser.h htmlfilter.h
sessioncontainer.o: textstream.h log.h misc.h
sessioncontainer.o: textstream.h ../templates/htmltextstream.h
sessioncontainer.o: ../core/textstream.h misc.h log.h
sessionmanager.o: sessionmanager.h sessioncontainer.h session.h item.h
sessionmanager.o: error.h user.h plugindata.h rebus.h lastcontainer.h
sessionmanager.o: request.h requesttypes.h config.h confparser.h htmlfilter.h
sessionmanager.o: textstream.h system.h dirs.h dircontainer.h ../db/db.h
sessionmanager.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
sessionmanager.o: ../core/textstream.h misc.h ../core/error.h log.h
sessionmanager.o: textstream.h ../templates/htmltextstream.h
sessionmanager.o: ../core/textstream.h misc.h system.h dirs.h dircontainer.h
sessionmanager.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h
sessionmanager.o: ../db/dbtextstream.h ../core/error.h log.h
sessionmanager.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
sessionmanager.o: ../core/user.h ../core/group.h ../core/thread.h
sessionmanager.o: ../core/dircontainer.h ../core/ugcontainer.h mounts.h
@ -314,15 +327,17 @@ sessionmanager.o: ../templates/patterncacher.h
sessionmanager.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
sessionmanager.o: ../core/log.h ../templates/indexpatterns.h
sessionmanager.o: ../templates/localefilter.h ../templates/locale.h
sessionmanager.o: ../core/confparser.h ../core/sessionmanager.h
sessionmanager.o: ../core/confparser.h ../templates/htmltextstream.h
sessionmanager.o: ../core/sessionmanager.h
sessionparser.o: sessionparser.h session.h item.h error.h user.h plugindata.h
sessionparser.o: rebus.h sessioncontainer.h lastcontainer.h request.h
sessionparser.o: requesttypes.h config.h confparser.h htmlfilter.h
sessionparser.o: textstream.h users.h ugcontainer.h ../db/db.h ../db/dbbase.h
sessionparser.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
sessionparser.o: misc.h ../core/error.h log.h ../db/dbitemquery.h
sessionparser.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h
sessionparser.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
sessionparser.o: textstream.h ../templates/htmltextstream.h
sessionparser.o: ../core/textstream.h misc.h users.h ugcontainer.h ../db/db.h
sessionparser.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
sessionparser.o: ../core/error.h log.h ../db/dbitemquery.h ../core/item.h
sessionparser.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
sessionparser.o: ../core/thread.h ../core/dircontainer.h
sessionparser.o: ../core/ugcontainer.h
system.o: system.h dirs.h item.h dircontainer.h ../db/db.h ../db/dbbase.h
system.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h
@ -330,14 +345,16 @@ system.o: ../core/error.h log.h textstream.h ../db/dbitemquery.h
system.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
system.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
system.o: request.h requesttypes.h session.h error.h user.h plugindata.h
system.o: rebus.h config.h confparser.h htmlfilter.h mounts.h mount.h
system.o: mountparser.h users.h ugcontainer.h lastcontainer.h groups.h
system.o: group.h loadavg.h notify.h ../templatesnotify/templatesnotify.h
system.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
system.o: rebus.h config.h confparser.h htmlfilter.h
system.o: ../templates/htmltextstream.h mounts.h mount.h mountparser.h
system.o: users.h ugcontainer.h lastcontainer.h groups.h group.h loadavg.h
system.o: notify.h ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
system.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
system.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h
system.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h ../core/mount.h
system.o: ../core/config.h ../templates/misc.h ../templates/localefilter.h
system.o: ../templates/locale.h ../core/confparser.h ../templates/templates.h
system.o: ../templates/locale.h ../core/confparser.h
system.o: ../templates/htmltextstream.h ../templates/templates.h
system.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h
system.o: ../core/httpsimpleparser.h ../core/log.h
system.o: ../templates/indexpatterns.h ../core/request.h ../core/system.h
@ -345,9 +362,9 @@ system.o: ../core/sessionmanager.h
textstream.o: textstream.h misc.h item.h
users.o: users.h user.h ugcontainer.h lastcontainer.h request.h
users.o: requesttypes.h session.h item.h error.h plugindata.h rebus.h
users.o: config.h confparser.h htmlfilter.h textstream.h ../db/db.h
users.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
users.o: ../core/textstream.h misc.h ../core/error.h log.h
users.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
users.o: config.h confparser.h htmlfilter.h textstream.h
users.o: ../templates/htmltextstream.h ../core/textstream.h misc.h ../db/db.h
users.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
users.o: log.h ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
users.o: ../core/user.h ../core/group.h ../core/thread.h
users.o: ../core/dircontainer.h ../core/ugcontainer.h

2
core/dircontainer.cpp
View File

@ -65,7 +65,7 @@ DirContainer::Iterator DirContainer::End()
DirContainer::SizeType DirContainer::Size()
{
return table.size();
return table.size(); // !! warning: it has O(n)
}
bool DirContainer::Empty()

2
core/lastcontainer.cpp
View File

@ -78,7 +78,7 @@ LastTab::iterator i = FindNotLoggedOut(user_id, session_id);
return;
}
if( last_tab.size() >= LAST_TABLE_SIZE )
if( last_tab.size() >= LAST_TABLE_SIZE ) // last_tab has O(n) complexity
last_tab.erase(last_tab.begin());
LastItem li;

317
core/misc.cpp
View File

@ -14,96 +14,155 @@
#include "templates/templates.h"
int Atoi(const std::string & str, int base)
int Toi(const std::string & str, int base)
{
return Atoi(str.c_str(), base);
return Toi(str.c_str(), base);
}
int Atoi(const std::wstring & str, int base)
int Toi(const std::wstring & str, int base)
{
return Atoi(str.c_str(), base);
return Toi(str.c_str(), base);
}
int Atoi(const char * str, int base)
int Toi(const char * str, int base)
{
return static_cast<int>(strtol(str, 0, base));
}
int Atoi(const wchar_t * str, int base)
int Toi(const wchar_t * str, int base)
{
return static_cast<int>(wcstol(str, 0, base));
}
long Atol(const std::string & str, int base)
long Tol(const std::string & str, int base)
{
return Atol(str.c_str(), base);
return Tol(str.c_str(), base);
}
long Atol(const std::wstring & str, int base)
long Tol(const std::wstring & str, int base)
{
return Atol(str.c_str(), base);
return Tol(str.c_str(), base);
}
long Atol(const char * str, int base)
long Tol(const char * str, int base)
{
return strtol(str, 0, base);
}
long Atol(const wchar_t * str, int base)
long Tol(const wchar_t * str, int base)
{
return wcstol(str, 0, base);
}
const wchar_t * Itoa(int value, int base)
const wchar_t * Toa(unsigned int value, int base)
{
return Ltoa(value, base);
return Toa(static_cast<unsigned long>(value), base);
}
const wchar_t * Ltoa(long value, int base)
const wchar_t * Toa(unsigned long value, int base)
{
static wchar_t digits[] = L"0123456789ABCDEF";
static wchar_t buffer_[50];
wchar_t * buffer = buffer_;
size_t i1, i2;
long rest;
static wchar_t buffer[50];
size_t len = sizeof(buffer) / sizeof(wchar_t);
i1 = i2 = 0;
Toa(value, buffer, len, base);
if( base < 2 )
base = 2;
if( base > 16 )
base = 16;
if( value < 0 )
{
buffer[0] = '-';
buffer += 1;
value = -value;
return buffer;
}
do
{
rest = value % base;
value = value / base;
buffer[i2++] = digits[rest];
}
while(value != 0);
buffer[i2--] = 0;
for( ; i1 < i2 ; ++i1, --i2)
const wchar_t * Toa(int value, int base)
{
wchar_t temp = buffer[i1];
buffer[i1] = buffer[i2];
buffer[i2] = temp;
return Toa(static_cast<long>(value), base);
}
return buffer_;
const wchar_t * Toa(long value, int base)
{
static wchar_t buffer[50];
size_t len = sizeof(buffer) / sizeof(wchar_t);
Toa(value, buffer, len, base);
return buffer;
}
void Toa(int value, std::string & res, int base, bool clear)
{
static char buffer[50];
size_t len = sizeof(buffer) / sizeof(char);
if( clear )
res.clear();
Toa(value, buffer, len, base);
res += buffer;
}
void Toa(long value, std::string & res, int base, bool clear)
{
static char buffer[50];
size_t len = sizeof(buffer) / sizeof(char);
if( clear )
res.clear();
Toa(value, buffer, len, base);
res += buffer;
}
void Toa(int value, std::wstring & res, int base, bool clear)
{
static wchar_t buffer[50];
size_t len = sizeof(buffer) / sizeof(wchar_t);
if( clear )
res.clear();
Toa(value, buffer, len, base);
res += buffer;
}
void Toa(long value, std::wstring & res, int base, bool clear)
{
static wchar_t buffer[50];
size_t len = sizeof(buffer) / sizeof(wchar_t);
if( clear )
res.clear();
Toa(value, buffer, len, base);
res += buffer;
}
void AssignString(const char * src, size_t len, std::wstring & dst, bool clear)
{
if( clear )
dst.clear();
if( dst.capacity() < dst.size() + len )
dst.reserve(dst.size() + len + 128);
for(size_t i=0 ; i<len ; ++i )
dst += static_cast<unsigned char>(src[i]);
}
@ -112,29 +171,31 @@ void AssignString(const char * src, std::wstring & dst, bool clear)
{
size_t len;
if( clear )
dst.clear();
for(len=0 ; src[len] ; ++len){}
if( dst.capacity() < dst.size() + len )
dst.reserve(dst.size() + len + 128);
for( ; *src ; ++src )
dst += static_cast<unsigned char>(*src);
AssignString(src, len, dst, clear);
}
void AssignString(const std::string & src, std::wstring & dst, bool clear)
{
AssignString(src.c_str(), src.size(), dst, clear);
}
void AssignString(const wchar_t * src, size_t len, std::string & dst, bool clear)
{
if( clear )
dst.clear();
if( dst.capacity() < dst.size() + src.size() )
dst.reserve(dst.size() + src.size() + 128);
if( dst.capacity() < dst.size() + len )
dst.reserve(dst.size() + len + 128);
for(size_t i=0 ; i<src.size() ; ++i )
dst += static_cast<unsigned char>(src[i]);
for(size_t i=0 ; i<len ; ++i)
dst += static_cast<char>(src[i]);
}
@ -142,29 +203,37 @@ void AssignString(const wchar_t * src, std::string & dst, bool clear)
{
size_t len;
if( clear )
dst.clear();
for(len=0 ; src[len] ; ++len){}
if( dst.capacity() < dst.size() + len )
dst.reserve(dst.size() + len + 128);
for( ; *src ; ++src )
dst += static_cast<char>(*src);
AssignString(src, len, dst, clear);
}
void AssignString(const std::wstring & src, std::string & dst, bool clear)
{
AssignString(src.c_str(), src.size(), dst, clear);
}
void AssignString(const char * src, size_t len, std::string & dst, bool clear)
{
if( clear )
dst.clear();
if( dst.capacity() < dst.size() + src.size() )
dst.reserve(dst.size() + src.size() + 128);
// we suppose that append is smart enough and we don't have to use reserve()
dst.append(src, len);
}
for(size_t i=0 ; i<src.size() ; ++i )
dst += static_cast<char>(src[i]);
void AssignString(const char * src, std::string & dst, bool clear)
{
size_t len;
for(len=0 ; src[len] ; ++len){}
AssignString(src, len, dst, clear);
}
@ -175,53 +244,47 @@ void AssignString(const std::string & src, std::string & dst, bool clear)
if( clear )
dst.clear();
dst += src;
dst.append(src);
}
void AssignString(const wchar_t * src, size_t len, std::wstring & dst, bool clear)
{
if( clear )
dst.clear();
// we suppose that append is smart enough and we don't have to use reserve()
dst.append(src, len);
}
void AssignString(const wchar_t * src, std::wstring & dst, bool clear)
{
size_t len;
for(len=0 ; src[len] ; ++len){}
AssignString(src, len, dst, clear);
}
void AssignString(const std::wstring & src, std::wstring & dst, bool clear)
{
if( clear )
dst.clear();
dst += src;
}
// !! skasowac, jest juz Itoa
void ToString(std::string & s, int value)
{
static char buffer[50];
sprintf(buffer, "%d", value);
s = buffer;
dst.append(src);
}
void ToString(std::string & s, long value)
{
static char buffer[50];
sprintf(buffer, "%ld", value);
s = buffer;
}
void ToString(std::wstring & s, int value)
{
static wchar_t buffer[50];
swprintf(buffer, sizeof(buffer)/sizeof(wchar_t), L"%d", value);
s = buffer;
}
void ToString(std::wstring & s, long value)
{
static wchar_t buffer[50];
swprintf(buffer, sizeof(buffer)/sizeof(wchar_t), L"%ld", value);
s = buffer;
}
@ -264,7 +327,6 @@ std::wstring::iterator i;
{
if( !CorrectUrlChar(*i) )
{
//wchar_t c = ChangeLocalChar(*i);
wchar_t c = TemplatesFunctions::locale.Subst(*i);
if( CorrectUrlChar(c) )
@ -309,51 +371,6 @@ void CorrectUrlOnlyAllowedChar(std::wstring & url)
/*
int polish_letters_simple[] =
{ 'a', 'A',
'c', 'C',
's', 'S',
'e', 'E',
'l', 'L',
'o', 'O',
'z', 'Z',
'z', 'Z',
'n', 'N', 0 }; // 0 - terminating
int polish_letters_iso88592[] =
{ 0xb1, 0xa1,
0xe6, 0xc6,
0xb6, 0xa6,
0xea, 0xca,
0xb3, 0xa3,
0xf3, 0xd3,
0xbf, 0xaf,
0xbc, 0xac,
0xf1, 0xd1, 0 };
int ChangeLocalChar(unsigned char c)
{
// if( language == polish_iso88592 )
for(int i = 0 ; polish_letters_iso88592[i] ; ++i)
{
if( polish_letters_simple[i] == 0 )
{
log << log1 << "localization tables don't have the same size" << logend;
return c;
}
if( polish_letters_iso88592[i] == c )
return polish_letters_simple[i];
}
return c;
}
*/
@ -502,14 +519,6 @@ return buffer;
}
const wchar_t * ToStr(int value)
{
static wchar_t buffer[100];
swprintf(buffer, sizeof(buffer)/sizeof(wchar_t), L"%d", value);
return buffer;
}
bool IsWhite(wchar_t s)

148
core/misc.h
View File

@ -18,45 +18,148 @@
#include "item.h"
int Atoi(const std::string & str, int base = 10);
int Atoi(const std::wstring & str, int base = 10);
int Atoi(const char * str, int base = 10);
int Atoi(const wchar_t * str, int base = 10);
long Atol(const std::string & str, int base = 10);
long Atol(const std::wstring & str, int base = 10);
long Atol(const char * str, int base = 10);
long Atol(const wchar_t * str, int base = 10);
/*
conversions between text and numbers
*/
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);
// if the buffer is too small it will be terminated at the beginning (empty string)
// and the function returns false
template<class CharType>
bool Toa(unsigned long value, CharType * buffer, size_t buf_len, int base = 10)
{
size_t i1, i2;
long rest;
if( buf_len == 0 )
return false;
i1 = i2 = 0;
if( base < 2 ) base = 2;
if( base > 16 ) base = 16;
do
{
rest = value % base;
value = value / base;
buffer[i2++] = (rest < 10) ? char(rest) + '0' : char(rest) - 10 + 'A';
}
while(value != 0 && i2 < buf_len);
if( i2 >= buf_len )
{
buffer[0] = 0; // ops, the buffer was too small
return false;
}
buffer[i2--] = 0;
for( ; i1 < i2 ; ++i1, --i2)
{
CharType temp = buffer[i1];
buffer[i1] = buffer[i2];
buffer[i2] = temp;
}
return true;
}
// if the buffer is too small it will be terminated at the beginning (empty string)
// and the function returns false
template<class CharType>
bool Toa(long value, CharType * buffer, size_t buf_len, int base = 10)
{
if( buf_len == 0 )
return false;
CharType * buf = buffer;
if( value < 0 )
{
buffer[0] = '-';
buf += 1;
buf_len -= 1;
value = -value;
}
bool res = Toa(static_cast<unsigned long>(value), buf, buf_len, base);
if( !res )
buffer[0] = 0;
return res;
}
template<class CharType>
bool Toa(unsigned int value, CharType * buffer, size_t buf_len, int base = 10)
{
return Toa(static_cast<unsigned long>(value), buffer, buf_len, base);
}
template<class CharType>
bool Toa(int value, CharType * buffer, size_t buf_len, int base = 10)
{
return Toa(static_cast<long>(value), buffer, buf_len, base);
}
// warning: it uses its own static buffer
// one buffer for both these functions
const wchar_t * Itoa(int value, int base = 10);
const wchar_t * Ltoa(long value, 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);
/*
conversions between ascii text and wide characters
(destination is always std::string or std::wstring)
characters are copied as they are without any locales checking
*/
void AssignString(const char * src, size_t len, std::wstring & dst, bool clear = true);
void AssignString(const char * src, std::wstring & dst, bool clear = true);
void AssignString(const std::string & src, std::wstring & dst, bool clear = true);
void AssignString(const wchar_t * src, size_t len, std::string & dst, bool clear = true);
void AssignString(const wchar_t * src, std::string & dst, bool clear = true);
void AssignString(const std::wstring & src, std::string & dst, bool clear = true);
void AssignString(const char * src, size_t len, std::string & dst, bool clear = true);
void AssignString(const char * src, std::string & dst, bool clear = true);
void AssignString(const std::string & src, std::string & dst, bool clear = true);
void AssignString(const wchar_t * src, size_t len, std::wstring & dst, bool clear = true);
void AssignString(const wchar_t * src, std::wstring & dst, bool clear = true);
void AssignString(const std::wstring & src, std::wstring & dst, bool clear = true);
void ToString(std::string & s, int value);
void ToString(std::string & s, long value);
void ToString(std::wstring & s, int value);
void ToString(std::wstring & s, long value);
//int ChangeLocalChar(unsigned char c);
bool CorrectUrlChar(wchar_t c);
void CorrectUrlDots(std::wstring & url);
@ -150,16 +253,7 @@ void ToSmall(std::wstring & s);
const char * SkipWhite(const char * s);
const wchar_t * SkipWhite(const wchar_t * s);
const wchar_t * ToStr(int value); // !! zamienic na ToString() tak jak pozosta³e metody (na poczatku)
/*
bool IsSubString(const char * short_str, const char * long_str);
bool IsSubString(const std::string & short_str, const std::string & long_str);
bool IsSubStringNoCase(const char * short_str, const char * long_str);
bool IsSubStringNoCase(const std::string & short_str, const std::string & long_str);
bool EqualNoCase(const char * str1, const char * str2);
bool EqualNoCase(const std::string & str1, const std::string & str2);
*/
template<class StringType1, class StringType2>
bool IsSubString(const StringType1 * short_str, const StringType2 * long_str)

2
core/mount.cpp
View File

@ -81,7 +81,7 @@ bool Mount::IsArg(int code, int arg)
for(i=param[code].arg.begin() ; i!=param[code].arg.end() ; ++i)
{
if( Atoi(*i) == arg )
if( Toi(*i) == arg )
return true;
}

3
core/request.h
View File

@ -19,6 +19,7 @@
#include "error.h"
#include "config.h"
#include "textstream.h"
#include "templates/htmltextstream.h"
class FunctionBase;
@ -45,7 +46,7 @@ struct Request
// headers, page and debug
//std::ostringstream headers, page, debug;
TextStream<std::string> headers;
TextStream<std::wstring> page, debug;
HtmlTextStream page, debug;
// raw parameters
GetTab get_tab;

10
core/sessioncontainer.cpp
View File

@ -16,6 +16,7 @@
SessionContainer::SessionContainer()
{
request = 0;
table_size = 0;
}
@ -48,7 +49,7 @@ Table::iterator inext, i = table.begin();
// erasing all indexes
index_id.clear();
index_time.clear();
table_size = 0;
request->session = 0;
}
@ -61,7 +62,8 @@ void SessionContainer::SetLastContainer(LastContainer * plast_container)
SessionContainer::TableSize SessionContainer::Size()
{
return table.size();
// don't use table.size() as it has O(n) complexity on FreeBSD
return table_size;
}
@ -93,6 +95,7 @@ bool SessionContainer::PushBack(const Session & session)
Iterator last = table.insert(table.end(), session);
index_id.insert( std::make_pair(session.id, last) );
index_time.insert( std::make_pair(session.last_time, last) );
table_size += 1;
log << log3 << "SC: added session, id: " << session.id << logend;
@ -141,8 +144,9 @@ Session * old_session = request->session;
request->session = &(*iold->second);
table.erase(iold->second);
request->session = 0;
index_time.erase(iold);
table_size -= 1;
request->session = 0;
log << log3 << "SC: deleted index_time for session id: " << id << logend;
log << log3 << "SC: deleted session, id: " << id << logend;

3
core/sessioncontainer.h
View File

@ -47,6 +47,9 @@ private:
Request * request;
void DelFromIdIndex(Iterator iter);
// in FreeBSD implementation (GCC) list::size() has linear complexity
// so we use our own table_size with O(1)
size_t table_size;
public:

8
core/sessionmanager.cpp
View File

@ -50,6 +50,12 @@ void SessionManager::SetLastContainer(LastContainer * plast_container)
}
size_t SessionManager::Size()
{
return session_tab.Size();
}
bool SessionManager::IsSession(long id)
{
if( session_tab.FindById(id) == session_tab.End() )
@ -144,7 +150,7 @@ int attempts = 100;
bool SessionManager::SetSessionFromCookie(const std::string & cookie)
{
long id = atol(cookie.c_str());
long id = Tol(cookie.c_str());
SessionContainer::Iterator s = session_tab.FindById(id);
if( s == session_tab.End() )

2
core/sessionmanager.h
View File

@ -55,6 +55,8 @@ public:
SessionContainer::Iterator SessionBegin();
SessionContainer::Iterator SessionEnd();
size_t Size();
};

75
core/textstream.h
View File

@ -14,6 +14,13 @@
#include "misc.h"
/*
a special class representing a stream buffer
similar to std::ostringstream
StringType can be either std::string or std::wstring
this class doesn't use UTF-8 in any kind
*/
template<class StringType>
class TextStream
{
@ -25,6 +32,8 @@ public:
void Clear();
bool Empty() const;
size_t Size() const;
void Reserve(size_t len);
const StringType & Str() const;
const CharType * CStr() const;
@ -45,8 +54,10 @@ public:
TextStream & operator<<(double);
TextStream & operator<<(const void *);// printing a pointer
TextStream & Write(const CharType * buf, size_t len);
TextStream & write(const CharType * buf, size_t len); // for compatibility with standard library (Ezc uses it)
TextStream & Write(const char * buf, size_t len);
TextStream & Write(const wchar_t * buf, size_t len);
TextStream & write(const char * buf, size_t len); // for compatibility with standard library (Ezc uses it)
TextStream & write(const wchar_t * buf, size_t len);
protected:
@ -74,6 +85,13 @@ size_t TextStream<StringType>::Size() const
return buffer.size();
}
template<class StringType>
void TextStream<StringType>::Reserve(size_t len)
{
buffer.reserve(len);
}
template<class StringType>
const StringType & TextStream<StringType>::Str() const
{
@ -166,9 +184,10 @@ return *this;
template<class StringType>
TextStream<StringType> & TextStream<StringType>::operator<<(int v)
{
char buf[50];
wchar_t buf[50];
size_t len = sizeof(buf) / sizeof(wchar_t);
sprintf(buf, "%d", v);
Toa(v, buf, len);
AssignString(buf, buffer, false);
return *this;
@ -178,9 +197,10 @@ return *this;
template<class StringType>
TextStream<StringType> & TextStream<StringType>::operator<<(long v)
{
char buf[50];
wchar_t buf[50];
size_t len = sizeof(buf) / sizeof(wchar_t);
sprintf(buf, "%ld", v);
Toa(v, buf, len);
AssignString(buf, buffer, false);
return *this;
@ -190,9 +210,10 @@ return *this;
template<class StringType>
TextStream<StringType> & TextStream<StringType>::operator<<(unsigned int v)
{
char buf[50];
wchar_t buf[50];
size_t len = sizeof(buf) / sizeof(wchar_t);
sprintf(buf, "%u", v);
Toa(v, buf, len);
AssignString(buf, buffer, false);
return *this;
@ -202,9 +223,10 @@ return *this;
template<class StringType>
TextStream<StringType> & TextStream<StringType>::operator<<(unsigned long v)
{
char buf[50];
wchar_t buf[50];
size_t len = sizeof(buf) / sizeof(wchar_t);
sprintf(buf, "%lu", v);
Toa(v, buf, len);
AssignString(buf, buffer, false);
return *this;
@ -226,9 +248,13 @@ return *this;
template<class StringType>
TextStream<StringType> & TextStream<StringType>::operator<<(const void * v)
{
char buf[50];
wchar_t buf[50];
size_t len = sizeof(buf) / sizeof(wchar_t);
sprintf(buf, "%p", v);
buf[0] = '0';
buf[1] = 'x';
Toa(reinterpret_cast<unsigned long>(v), buf+2, len-2, 16);
AssignString(buf, buffer, false);
return *this;
@ -236,24 +262,35 @@ return *this;
template<class StringType>
TextStream<StringType> & TextStream<StringType>::Write(const TextStream<StringType>::CharType * buf, size_t len)
TextStream<StringType> & TextStream<StringType>::Write(const char * buf, size_t len)
{
if( buffer.capacity() < buffer.size() + len )
buffer.reserve(buffer.size() + len + 256); // !! add some constant
for(size_t i=0 ; i<len ; ++i)
buffer += buf[i];
AssignString(buf, len, buffer, false);
return *this;
}
template<class StringType>
TextStream<StringType> & TextStream<StringType>::write(const TextStream<StringType>::CharType * buf, size_t len)
TextStream<StringType> & TextStream<StringType>::write(const char * buf, size_t len)
{
return Write(buf, len);
}
template<class StringType>
TextStream<StringType> & TextStream<StringType>::Write(const wchar_t * buf, size_t len)
{
AssignString(buf, len, buffer, false);
return *this;
}
template<class StringType>
TextStream<StringType> & TextStream<StringType>::write(const wchar_t * buf, size_t len)
{
return Write(buf, len);
}
#endif

4
db/db.cpp
View File

@ -273,7 +273,7 @@ Error Db::AddItemIntoItem(Item & item)
item.id = AssertCurrval("core.item_id_seq");
if( !url_without_id )
ToString(item.url, item.id);
Toa(item.id, item.url);
}
catch(const Error & e)
{
@ -384,7 +384,7 @@ Error Db::EditItemInItem(Item & item, bool with_url)
AssertResult(r, PGRES_COMMAND_OK);
if( with_url && !url_without_id )
ToString(item.url, item.id);
Toa(item.id, item.url);
}
catch(const Error & e)
{

12
db/dbbase.cpp
View File

@ -282,12 +282,12 @@ tm t;
return t;
}
t.tm_year = atoi(str + 0) - 1900; /* year - 1900 */
t.tm_mon = atoi(str + 5) - 1; /* month of year (0 - 11) */
t.tm_mday = atoi(str + 8); /* day of month (1 - 31) */
t.tm_hour = atoi(str + 11); /* hours (0 - 23) */
t.tm_min = atoi(str + 14); /* minutes (0 - 59) */
t.tm_sec = atoi(str + 17); /* seconds (0 - 60) */
t.tm_year = Toi(str + 0) - 1900; /* year - 1900 */
t.tm_mon = Toi(str + 5) - 1; /* month of year (0 - 11) */
t.tm_mday = Toi(str + 8); /* day of month (1 - 31) */
t.tm_hour = Toi(str + 11); /* hours (0 - 23) */
t.tm_min = Toi(str + 14); /* minutes (0 - 59) */
t.tm_sec = Toi(str + 17); /* seconds (0 - 60) */
// t.tm_wday = 0; /* day of week (Sunday = 0) */
// t.tm_yday = 0; /* day of year (0 - 365) */

14
db/dbtextstream.cpp
View File

@ -88,16 +88,26 @@ DbTextStream & DbTextStream::operator<<(const RawText<const wchar_t*> & raw)
}
DbTextStream & DbTextStream::operator<<(RawText<const std::string*> raw)
{
return PutText(raw.par);
}
DbTextStream & DbTextStream::operator<<(RawText<const std::wstring*> raw)
{
return PutText(raw.par);
}
DbTextStream & DbTextStream::operator<<(RawText<std::string> raw)
{
return PutText(raw.par.c_str());
return PutText(raw.par);
}
DbTextStream & DbTextStream::operator<<(RawText<std::wstring> raw)
{
return PutText(raw.par.c_str());
return PutText(raw.par);
}

6
db/dbtextstream.h
View File

@ -17,7 +17,7 @@
/*
DbTextStream is used as a buffer for creating a database's query
By default all operators<< espace its string artuments. If you don't want
By default all operators<< escape its string artuments. If you don't want
to escape an argument you should use a helper function R() (raw argument)
note: you have to define the function yourself, we do not provide it
because such a short name would make a mess in namespaces
@ -98,8 +98,10 @@ public:
template<size_t str_size>
DbTextStream & operator<<(const RawText<wchar_t [str_size]> & raw) { return PutText(raw.par); }
DbTextStream & operator<<(const RawText<const char*> & raw); // !! ? bez const tutaj? bo jest const w szablonie
DbTextStream & operator<<(const RawText<const char*> & raw);
DbTextStream & operator<<(const RawText<const wchar_t*> & raw);
DbTextStream & operator<<(RawText<const std::string*> raw);
DbTextStream & operator<<(RawText<const std::wstring*> raw);
DbTextStream & operator<<(RawText<std::string> raw);
DbTextStream & operator<<(RawText<std::wstring> raw);
DbTextStream & operator<<(RawText<char> raw);

730
functions/Makefile.dep
View File

File diff suppressed because it is too large Load Diff

2
functions/functions.cpp
View File

@ -413,7 +413,7 @@ void Functions::ReadItemUrlSubject(Item & item, Item::Type item_type)
{
item.subject = request->dir_tab.back()->subject;
item.subject += L"_msg_";
item.subject += ToStr(db->Size(request->dir_tab.back()->id, Item::file));
Toa(db->Size(request->dir_tab.back()->id, Item::file), item.subject, 10, false);
}
if( new_url )

2
functions/node.cpp
View File

@ -28,7 +28,7 @@ void Node::MakeGet()
return;
}
long id = Atol(request->param_tab[0].name);
long id = Tol(request->param_tab[0].name);
system->RedirectTo(id);
}

2
functions/template.cpp
View File

@ -55,7 +55,7 @@ void Template::PutLog(Item & item)
void Template::CreateTemplateFileName(const std::wstring & index_str)
{
int index = Atoi(index_str);
int index = Toi(index_str);
if( index < 0 )
{

4
html/fun_uptime.html
View File

@ -9,8 +9,8 @@
[uptime_hours]
[end]
<br>
{uptime_users}: [winix_users_logged]<br>
{uptime_how_many_sessions}: [winix_how_many_sessions]<br>
{uptime_users_logged}: [winix_users_logged]<br>
{load_avg}: [winix_loadavg_now], [winix_loadavg_1], [winix_loadavg_5], [winix_loadavg_15]<br>
{req_per_sec}: [winix_req_per_sec_now], [winix_req_per_sec_1], [winix_req_per_sec_5], [winix_req_per_sec_15]
</p>

3
locale/en
View File

@ -186,7 +186,8 @@ login_header = Login
uptime_header = Uptime
uptime_current_time = current time
uptime_up = system running for
uptime_users = users
uptime_how_many_sessions = all sessions
uptime_users_logged = logged users
uptime_days = days

3
locale/pl
View File

@ -189,7 +189,8 @@ login_header = Logowanie
uptime_header = Czas pracy systemu
uptime_current_time = aktualna godzina
uptime_up = system uruchomiony przez
uptime_users = zalogowanych użytkowników
uptime_how_many_sessions = wszystkich sesji
uptime_users_logged = zalogowanych użytkowników
uptime_days = dni

17
main/Makefile.dep
View File

@ -9,17 +9,18 @@ main.o: ../core/log.h ../db/dbitemquery.h ../core/item.h
main.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h ../core/thread.h
main.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
main.o: ../core/requesttypes.h ../core/session.h ../core/error.h
main.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mounts.h
main.o: ../core/mount.h ../core/mountparser.h ../core/users.h
main.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
main.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
main.o: ../core/sessioncontainer.h ../core/notify.h
main.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
main.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
main.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
main.o: ../templates/htmltextstream.h ../core/mounts.h ../core/mount.h
main.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
main.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
main.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
main.o: ../core/notify.h ../templatesnotify/templatesnotify.h
main.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
main.o: ../../ezc/src/pattern.h ../../ezc/src/stringconv.h
main.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h ../core/mount.h
main.o: ../core/config.h ../templates/misc.h ../templates/localefilter.h
main.o: ../templates/locale.h ../core/confparser.h ../functions/functions.h
main.o: ../templates/locale.h ../core/confparser.h
main.o: ../templates/htmltextstream.h ../functions/functions.h
main.o: ../functions/functionbase.h ../core/request.h ../core/system.h
main.o: ../core/notify.h ../functions/functionparser.h ../functions/adduser.h
main.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h

74
plugins/stats/Makefile.dep
View File

@ -6,15 +6,16 @@ init.o: ../../core/item.h ../../core/request.h ../../core/requesttypes.h
init.o: ../../core/session.h ../../core/error.h ../../core/log.h
init.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h
init.o: ../../core/config.h ../../core/confparser.h ../../core/htmlfilter.h
init.o: ../../templates/htmltextstream.h ../../core/textstream.h
init.o: ../../core/config.h ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
init.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/error.h
init.o: ../../db/dbitemquery.h ../../core/item.h ../../db/dbitemcolumns.h
init.o: ../../core/user.h ../../core/group.h ../../core/thread.h
init.o: ../../core/dircontainer.h ../../core/ugcontainer.h bot.h stats.h
init.o: templates.h ../../core/plugin.h ../../core/pluginmsg.h
init.o: ../../core/request.h ../../core/system.h ../../core/dirs.h
init.o: ../../core/dircontainer.h ../../core/mounts.h ../../core/mount.h
init.o: ../../core/mountparser.h ../../core/users.h ../../core/ugcontainer.h
init.o: ../../db/dbtextstream.h ../../core/error.h ../../db/dbitemquery.h
init.o: ../../core/item.h ../../db/dbitemcolumns.h ../../core/user.h
init.o: ../../core/group.h ../../core/thread.h ../../core/dircontainer.h
init.o: ../../core/ugcontainer.h bot.h stats.h templates.h
init.o: ../../core/plugin.h ../../core/pluginmsg.h ../../core/request.h
init.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h
init.o: ../../core/mounts.h ../../core/mount.h ../../core/mountparser.h
init.o: ../../core/users.h ../../core/ugcontainer.h
init.o: ../../core/lastcontainer.h ../../core/groups.h ../../core/group.h
init.o: ../../core/loadavg.h ../../core/sessionmanager.h
init.o: ../../core/sessioncontainer.h ../../functions/functions.h
@ -25,26 +26,26 @@ init.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
init.o: ../../../ezc/src/stringconv.h ../../../ezc/src/functions.h
init.o: ../../../ezc/src/funinfo.h ../../core/mount.h ../../templates/misc.h
init.o: ../../templates/localefilter.h ../../templates/locale.h
init.o: ../../core/confparser.h ../../functions/functionparser.h
init.o: ../../functions/adduser.h ../../functions/cat.h
init.o: ../../functions/chmod.h ../../functions/privchanger.h
init.o: ../../functions/chown.h ../../functions/ckeditor.h
init.o: ../../functions/cp.h ../../functions/createthread.h
init.o: ../../functions/default.h ../../functions/download.h
init.o: ../../functions/emacs.h ../../functions/last.h
init.o: ../../functions/login.h ../../functions/logout.h ../../functions/ls.h
init.o: ../../functions/mkdir.h ../../functions/mv.h ../../functions/node.h
init.o: ../../functions/priv.h ../../functions/reload.h ../../functions/rm.h
init.o: ../../functions/run.h ../../functions/stat.h
init.o: ../../functions/subject.h ../../functions/funthread.h
init.o: ../../functions/template.h ../../functions/tinymce.h
init.o: ../../functions/uname.h ../../functions/upload.h
init.o: ../../functions/uptime.h ../../functions/who.h ../../functions/vim.h
init.o: ../../core/htmlfilter.h ../../templates/templates.h
init.o: ../../templates/patterncacher.h ../../templates/ckeditorgetparser.h
init.o: ../../core/httpsimpleparser.h ../../core/log.h
init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h
init.o: statssession.h ../../core/plugindata.h
init.o: ../../core/confparser.h ../../templates/htmltextstream.h
init.o: ../../functions/functionparser.h ../../functions/adduser.h
init.o: ../../functions/cat.h ../../functions/chmod.h
init.o: ../../functions/privchanger.h ../../functions/chown.h
init.o: ../../functions/ckeditor.h ../../functions/cp.h
init.o: ../../functions/createthread.h ../../functions/default.h
init.o: ../../functions/download.h ../../functions/emacs.h
init.o: ../../functions/last.h ../../functions/login.h
init.o: ../../functions/logout.h ../../functions/ls.h ../../functions/mkdir.h
init.o: ../../functions/mv.h ../../functions/node.h ../../functions/priv.h
init.o: ../../functions/reload.h ../../functions/rm.h ../../functions/run.h
init.o: ../../functions/stat.h ../../functions/subject.h
init.o: ../../functions/funthread.h ../../functions/template.h
init.o: ../../functions/tinymce.h ../../functions/uname.h
init.o: ../../functions/upload.h ../../functions/uptime.h
init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h
init.o: ../../templates/templates.h ../../templates/patterncacher.h
init.o: ../../templates/ckeditorgetparser.h ../../core/httpsimpleparser.h
init.o: ../../core/log.h ../../templates/indexpatterns.h
init.o: ../../core/sessionmanager.h statssession.h ../../core/plugindata.h
stats.o: stats.h ../../core/config.h ../../core/log.h ../../core/textstream.h
stats.o: ../../core/misc.h ../../core/item.h ../../../ezc/src/utf8.h
templates.o: templates.h ../../core/plugin.h ../../core/pluginmsg.h
@ -66,14 +67,15 @@ templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
templates.o: ../../core/session.h ../../functions/functions.h
templates.o: ../../functions/functionbase.h ../../core/request.h
templates.o: ../../core/requesttypes.h ../../core/textstream.h
templates.o: ../../core/misc.h ../../core/config.h ../../core/system.h
templates.o: ../../core/notify.h ../../templatesnotify/templatesnotify.h
templates.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h
templates.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
templates.o: ../../../ezc/src/stringconv.h ../../../ezc/src/functions.h
templates.o: ../../../ezc/src/funinfo.h ../../core/mount.h
templates.o: ../../templates/misc.h ../../templates/localefilter.h
templates.o: ../../templates/locale.h ../../core/confparser.h
templates.o: ../../core/misc.h ../../templates/htmltextstream.h
templates.o: ../../core/config.h ../../core/system.h ../../core/notify.h
templates.o: ../../templatesnotify/templatesnotify.h ../../../ezc/src/ezc.h
templates.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
templates.o: ../../../ezc/src/pattern.h ../../../ezc/src/stringconv.h
templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
templates.o: ../../core/mount.h ../../templates/misc.h
templates.o: ../../templates/localefilter.h ../../templates/locale.h
templates.o: ../../core/confparser.h ../../templates/htmltextstream.h
templates.o: ../../functions/functionparser.h ../../functions/adduser.h
templates.o: ../../functions/cat.h ../../functions/chmod.h
templates.o: ../../functions/privchanger.h ../../functions/chown.h

5
plugins/stats/templates.cpp
View File

@ -11,6 +11,7 @@
#include "ezc.h"
#include "core/misc.h"
#include "stats.h"
#include "templates/misc.h"
namespace Stats
@ -84,8 +85,8 @@ void stats_item_bing(Info & i)
void CreateFunctions(PluginInfo & info)
{
typedef Ezc::Functions<TextStream<std::wstring> > Fun;
Fun * fun = reinterpret_cast<Fun*>(info.p1);
using TemplatesFunctions::EzcFun;
EzcFun * fun = reinterpret_cast<EzcFun*>(info.p1);
fun->Insert("stats_from", stats_from);

152
plugins/ticket/Makefile.dep
View File

@ -13,7 +13,8 @@ createticket.o: ../../core/requesttypes.h ../../core/session.h
createticket.o: ../../core/error.h ../../core/user.h ../../core/plugindata.h
createticket.o: ../../core/rebus.h ../../core/config.h
createticket.o: ../../core/confparser.h ../../core/htmlfilter.h
createticket.o: ../../core/config.h ../../core/system.h ../../core/dirs.h
createticket.o: ../../templates/htmltextstream.h ../../core/config.h
createticket.o: ../../core/system.h ../../core/dirs.h
createticket.o: ../../core/dircontainer.h ../../core/request.h
createticket.o: ../../core/mounts.h ../../core/mount.h
createticket.o: ../../core/mountparser.h ../../core/users.h
@ -26,7 +27,8 @@ createticket.o: ../../../ezc/src/stringconv.h ../../../ezc/src/functions.h
createticket.o: ../../../ezc/src/funinfo.h ../../core/mount.h
createticket.o: ../../templates/misc.h ../../templates/localefilter.h
createticket.o: ../../templates/locale.h ../../core/confparser.h
createticket.o: ../../core/system.h ticketinfo.h ticketparser.h ticketconf.h
createticket.o: ../../templates/htmltextstream.h ../../core/system.h
createticket.o: ticketinfo.h ticketparser.h ticketconf.h
createticket.o: ../../functions/functions.h ../../functions/functionbase.h
createticket.o: ../../functions/functionparser.h ../../functions/adduser.h
createticket.o: ../../functions/cat.h ../../functions/chmod.h
@ -63,32 +65,34 @@ editticket.o: ../../core/lastcontainer.h ../../core/groups.h
editticket.o: ../../core/group.h ../../core/rebus.h ../../core/loadavg.h
editticket.o: ../../functions/functionbase.h ../../core/request.h
editticket.o: ../../core/requesttypes.h ../../core/session.h
editticket.o: ../../core/plugindata.h ../../core/config.h ../../core/notify.h
editticket.o: ../../core/plugindata.h ../../templates/htmltextstream.h
editticket.o: ../../core/config.h ../../core/notify.h
editticket.o: ../../templatesnotify/templatesnotify.h ../../../ezc/src/ezc.h
editticket.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
editticket.o: ../../../ezc/src/pattern.h ../../../ezc/src/stringconv.h
editticket.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
editticket.o: ../../core/mount.h ../../templates/misc.h
editticket.o: ../../templates/localefilter.h ../../templates/locale.h
editticket.o: ../../core/confparser.h ../../core/system.h
editticket.o: ../../functions/functions.h ../../functions/functionbase.h
editticket.o: ../../functions/functionparser.h ../../functions/adduser.h
editticket.o: ../../functions/cat.h ../../functions/chmod.h
editticket.o: ../../functions/privchanger.h ../../functions/chown.h
editticket.o: ../../functions/ckeditor.h ../../functions/cp.h
editticket.o: ../../functions/createthread.h ../../functions/default.h
editticket.o: ../../functions/download.h ../../functions/emacs.h
editticket.o: ../../functions/last.h ../../functions/login.h
editticket.o: ../../functions/logout.h ../../functions/ls.h
editticket.o: ../../functions/mkdir.h ../../functions/mv.h
editticket.o: ../../functions/node.h ../../functions/priv.h
editticket.o: ../../functions/reload.h ../../functions/rm.h
editticket.o: ../../functions/run.h ../../functions/stat.h
editticket.o: ../../functions/subject.h ../../functions/funthread.h
editticket.o: ../../functions/template.h ../../functions/tinymce.h
editticket.o: ../../functions/uname.h ../../functions/upload.h
editticket.o: ../../functions/uptime.h ../../functions/who.h
editticket.o: ../../functions/vim.h ../../core/htmlfilter.h
editticket.o: ../../core/confparser.h ../../templates/htmltextstream.h
editticket.o: ../../core/system.h ../../functions/functions.h
editticket.o: ../../functions/functionbase.h ../../functions/functionparser.h
editticket.o: ../../functions/adduser.h ../../functions/cat.h
editticket.o: ../../functions/chmod.h ../../functions/privchanger.h
editticket.o: ../../functions/chown.h ../../functions/ckeditor.h
editticket.o: ../../functions/cp.h ../../functions/createthread.h
editticket.o: ../../functions/default.h ../../functions/download.h
editticket.o: ../../functions/emacs.h ../../functions/last.h
editticket.o: ../../functions/login.h ../../functions/logout.h
editticket.o: ../../functions/ls.h ../../functions/mkdir.h
editticket.o: ../../functions/mv.h ../../functions/node.h
editticket.o: ../../functions/priv.h ../../functions/reload.h
editticket.o: ../../functions/rm.h ../../functions/run.h
editticket.o: ../../functions/stat.h ../../functions/subject.h
editticket.o: ../../functions/funthread.h ../../functions/template.h
editticket.o: ../../functions/tinymce.h ../../functions/uname.h
editticket.o: ../../functions/upload.h ../../functions/uptime.h
editticket.o: ../../functions/who.h ../../functions/vim.h
editticket.o: ../../core/htmlfilter.h
funticket.o: funticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
funticket.o: ../../db/dbtextstream.h ../../core/textstream.h
funticket.o: ../../core/misc.h ../../core/item.h ../../core/error.h
@ -107,14 +111,16 @@ funticket.o: ../../core/lastcontainer.h ../../core/groups.h
funticket.o: ../../core/group.h ../../core/rebus.h ../../core/loadavg.h
funticket.o: ../../functions/functionbase.h ../../core/request.h
funticket.o: ../../core/requesttypes.h ../../core/session.h
funticket.o: ../../core/plugindata.h ../../core/config.h ../../core/notify.h
funticket.o: ../../core/plugindata.h ../../templates/htmltextstream.h
funticket.o: ../../core/config.h ../../core/notify.h
funticket.o: ../../templatesnotify/templatesnotify.h ../../../ezc/src/ezc.h
funticket.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
funticket.o: ../../../ezc/src/pattern.h ../../../ezc/src/stringconv.h
funticket.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
funticket.o: ../../core/mount.h ../../templates/misc.h
funticket.o: ../../templates/localefilter.h ../../templates/locale.h
funticket.o: ../../core/confparser.h ../../core/system.h ../../core/misc.h
funticket.o: ../../core/confparser.h ../../templates/htmltextstream.h
funticket.o: ../../core/system.h ../../core/misc.h
init.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
init.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
init.o: ../../core/item.h ../../core/error.h ../../core/log.h
@ -131,36 +137,38 @@ init.o: ../../core/lastcontainer.h ../../core/groups.h ../../core/group.h
init.o: ../../core/rebus.h ../../core/loadavg.h
init.o: ../../functions/functionbase.h ../../core/request.h
init.o: ../../core/requesttypes.h ../../core/session.h
init.o: ../../core/plugindata.h ../../core/config.h ../../core/notify.h
init.o: ../../core/plugindata.h ../../templates/htmltextstream.h
init.o: ../../core/config.h ../../core/notify.h
init.o: ../../templatesnotify/templatesnotify.h ../../../ezc/src/ezc.h
init.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
init.o: ../../../ezc/src/pattern.h ../../../ezc/src/stringconv.h
init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
init.o: ../../core/mount.h ../../templates/misc.h
init.o: ../../templates/localefilter.h ../../templates/locale.h
init.o: ../../core/confparser.h ../../core/system.h editticket.h
init.o: createticket.h ../../core/log.h ../../core/plugin.h
init.o: ../../core/pluginmsg.h ../../core/sessionmanager.h
init.o: ../../core/sessioncontainer.h ../../functions/functions.h
init.o: ../../functions/functionbase.h ../../functions/functionparser.h
init.o: ../../functions/adduser.h ../../functions/cat.h
init.o: ../../functions/chmod.h ../../functions/privchanger.h
init.o: ../../functions/chown.h ../../functions/ckeditor.h
init.o: ../../functions/cp.h ../../functions/createthread.h
init.o: ../../functions/default.h ../../functions/download.h
init.o: ../../functions/emacs.h ../../functions/last.h
init.o: ../../functions/login.h ../../functions/logout.h ../../functions/ls.h
init.o: ../../functions/mkdir.h ../../functions/mv.h ../../functions/node.h
init.o: ../../functions/priv.h ../../functions/reload.h ../../functions/rm.h
init.o: ../../functions/run.h ../../functions/stat.h
init.o: ../../functions/subject.h ../../functions/funthread.h
init.o: ../../functions/template.h ../../functions/tinymce.h
init.o: ../../functions/uname.h ../../functions/upload.h
init.o: ../../functions/uptime.h ../../functions/who.h ../../functions/vim.h
init.o: ../../core/htmlfilter.h ../../templates/templates.h
init.o: ../../templates/patterncacher.h ../../templates/ckeditorgetparser.h
init.o: ../../core/httpsimpleparser.h ../../core/log.h
init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h
init.o: ../../core/confparser.h ../../templates/htmltextstream.h
init.o: ../../core/system.h editticket.h createticket.h ../../core/log.h
init.o: ../../core/plugin.h ../../core/pluginmsg.h
init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
init.o: ../../functions/functions.h ../../functions/functionbase.h
init.o: ../../functions/functionparser.h ../../functions/adduser.h
init.o: ../../functions/cat.h ../../functions/chmod.h
init.o: ../../functions/privchanger.h ../../functions/chown.h
init.o: ../../functions/ckeditor.h ../../functions/cp.h
init.o: ../../functions/createthread.h ../../functions/default.h
init.o: ../../functions/download.h ../../functions/emacs.h
init.o: ../../functions/last.h ../../functions/login.h
init.o: ../../functions/logout.h ../../functions/ls.h ../../functions/mkdir.h
init.o: ../../functions/mv.h ../../functions/node.h ../../functions/priv.h
init.o: ../../functions/reload.h ../../functions/rm.h ../../functions/run.h
init.o: ../../functions/stat.h ../../functions/subject.h
init.o: ../../functions/funthread.h ../../functions/template.h
init.o: ../../functions/tinymce.h ../../functions/uname.h
init.o: ../../functions/upload.h ../../functions/uptime.h
init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h
init.o: ../../templates/templates.h ../../templates/patterncacher.h
init.o: ../../templates/ckeditorgetparser.h ../../core/httpsimpleparser.h
init.o: ../../core/log.h ../../templates/indexpatterns.h
init.o: ../../core/sessionmanager.h
tdb.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
tdb.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
tdb.o: ../../core/item.h ../../core/error.h ../../core/log.h
@ -186,32 +194,34 @@ templates.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
templates.o: ../../core/textstream.h ../../core/misc.h ../../core/error.h
templates.o: editticket.h ../../functions/functionbase.h ../../core/request.h
templates.o: ../../core/requesttypes.h ../../core/session.h
templates.o: ../../core/plugindata.h ../../core/config.h ../../core/notify.h
templates.o: ../../core/plugindata.h ../../templates/htmltextstream.h
templates.o: ../../core/config.h ../../core/notify.h
templates.o: ../../templatesnotify/templatesnotify.h ../../core/mount.h
templates.o: ../../templates/misc.h ../../templates/localefilter.h
templates.o: ../../templates/locale.h ../../core/confparser.h
templates.o: ../../core/system.h createticket.h ../../core/misc.h
templates.o: ../../core/plugin.h ../../core/pluginmsg.h
templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
templates.o: ../../functions/functions.h ../../functions/functionbase.h
templates.o: ../../functions/functionparser.h ../../functions/adduser.h
templates.o: ../../functions/cat.h ../../functions/chmod.h
templates.o: ../../functions/privchanger.h ../../functions/chown.h
templates.o: ../../functions/ckeditor.h ../../functions/cp.h
templates.o: ../../functions/createthread.h ../../functions/default.h
templates.o: ../../functions/download.h ../../functions/emacs.h
templates.o: ../../functions/last.h ../../functions/login.h
templates.o: ../../functions/logout.h ../../functions/ls.h
templates.o: ../../functions/mkdir.h ../../functions/mv.h
templates.o: ../../functions/node.h ../../functions/priv.h
templates.o: ../../functions/reload.h ../../functions/rm.h
templates.o: ../../functions/run.h ../../functions/stat.h
templates.o: ../../functions/subject.h ../../functions/funthread.h
templates.o: ../../functions/template.h ../../functions/tinymce.h
templates.o: ../../functions/uname.h ../../functions/upload.h
templates.o: ../../functions/uptime.h ../../functions/who.h
templates.o: ../../functions/vim.h ../../core/htmlfilter.h
templates.o: ../../templates/templates.h ../../templates/patterncacher.h
templates.o: ../../templates/htmltextstream.h ../../core/system.h
templates.o: createticket.h ../../core/misc.h ../../core/plugin.h
templates.o: ../../core/pluginmsg.h ../../core/sessionmanager.h
templates.o: ../../core/sessioncontainer.h ../../functions/functions.h
templates.o: ../../functions/functionbase.h ../../functions/functionparser.h
templates.o: ../../functions/adduser.h ../../functions/cat.h
templates.o: ../../functions/chmod.h ../../functions/privchanger.h
templates.o: ../../functions/chown.h ../../functions/ckeditor.h
templates.o: ../../functions/cp.h ../../functions/createthread.h
templates.o: ../../functions/default.h ../../functions/download.h
templates.o: ../../functions/emacs.h ../../functions/last.h
templates.o: ../../functions/login.h ../../functions/logout.h
templates.o: ../../functions/ls.h ../../functions/mkdir.h
templates.o: ../../functions/mv.h ../../functions/node.h
templates.o: ../../functions/priv.h ../../functions/reload.h
templates.o: ../../functions/rm.h ../../functions/run.h
templates.o: ../../functions/stat.h ../../functions/subject.h
templates.o: ../../functions/funthread.h ../../functions/template.h
templates.o: ../../functions/tinymce.h ../../functions/uname.h
templates.o: ../../functions/upload.h ../../functions/uptime.h
templates.o: ../../functions/who.h ../../functions/vim.h
templates.o: ../../core/htmlfilter.h ../../templates/templates.h
templates.o: ../../templates/patterncacher.h
templates.o: ../../templates/ckeditorgetparser.h
templates.o: ../../core/httpsimpleparser.h ../../core/log.h
templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h

18
plugins/ticket/templates.cpp
View File

@ -76,7 +76,7 @@ void ticket_print_value(Info & i, size_t conf_index, int value)
if( conf_item.type == TicketConf::TicketItem::TypeSelect )
{
if( value < (int)conf_item.select.size() )
HtmlEscape(i.out, conf_item.select[value].name);
i.out << conf_item.select[value].name;
}
}
}
@ -92,13 +92,13 @@ void ticket_is(Info & i)
void ticket_item_subject(Info & i)
{
HtmlEscape(i.out, ticket_info.item.subject);
i.out << ticket_info.item.subject;
}
void ticket_item_content(Info & i)
{
HtmlEscape(i.out, ticket_info.item.content);
i.out << ticket_info.item.content;
}
@ -167,7 +167,7 @@ void tickets_tab_url(Info & i)
Item * dir = tickets_tab_find_index_dir();
if( dir )
HtmlEscape(i.out, dir->url);
i.out << dir->url;
}
@ -185,7 +185,7 @@ void tickets_tab_subject(Info & i)
Item * dir = tickets_tab_find_index_dir();
if( dir )
HtmlEscape(i.out, dir->subject);
i.out << dir->subject;
}
@ -261,7 +261,7 @@ void ticket_tab(Info & i)
void ticket_tab_param(Info & i)
{
if( conf_index < ticket_info.cur_conf->tab.size() )
HtmlEscape(i.out, ticket_info.cur_conf->tab[conf_index].name);
i.out << ticket_info.cur_conf->tab[conf_index].name;
}
@ -333,7 +333,7 @@ void ticket_tab_select_tab_name(Info & i)
if( conf_index < ticket_info.cur_conf->tab.size() &&
select_index < ticket_info.cur_conf->tab[conf_index].select.size() )
{
HtmlEscape(i.out, ticket_info.cur_conf->tab[conf_index].select[select_index].name);
i.out << ticket_info.cur_conf->tab[conf_index].select[select_index].name;
}
}
@ -359,8 +359,8 @@ void AddEzcFunctions(PluginInfo & info)
using namespace ns_tickets_tab;
using namespace ns_ticket_tab;
typedef Ezc::Functions<TextStream<std::wstring> > Fun;
Fun * fun = reinterpret_cast<Fun*>(info.p1);
using TemplatesFunctions::EzcFun;
EzcFun * fun = reinterpret_cast<EzcFun*>(info.p1);
fun->Insert("ticket_is", ticket_is);
fun->Insert("ticket_item_subject", ticket_item_subject);

4
plugins/ticket/ticketinfo.cpp
View File

@ -285,8 +285,8 @@ Ticket::TicketParam param;
{
if( IsSubString(parstr, i->first.c_str()) )
{
param.param = Atoi(i->first.c_str() + parlen);
param.value = Atoi(i->second);
param.param = Toi(i->first.c_str() + parlen);
param.value = Toi(i->second);
if( CheckMinMaxValue(param) )
ticket.par_tab.push_back(param);

6
plugins/ticket/ticketparser.cpp
View File

@ -99,7 +99,7 @@ void TicketParser::CheckId(int & id, bool & def)
if( id_str == L"def" )
def = true;
else
id = Atoi(id_str);
id = Toi(id_str);
if( *pchar == ',' )
pchar += 1;
@ -165,10 +165,10 @@ void TicketParser::ReadItemInteger()
ReadText(int_max);
if( !int_min.empty() )
item.integer_min = Atoi(int_min);
item.integer_min = Toi(int_min);
if( !int_max.empty() )
item.integer_max = Atoi(int_max);
item.integer_max = Toi(int_max);
}

367
templates/Makefile.dep
View File

@ -4,8 +4,8 @@ adduser.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
adduser.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
adduser.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
adduser.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
adduser.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
adduser.o: ../core/textstream.h patterncacher.h ../core/item.h
adduser.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
adduser.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
adduser.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
adduser.o: ../core/textstream.h indexpatterns.h ../core/config.h
adduser.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h
@ -15,18 +15,18 @@ adduser.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
adduser.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
adduser.o: ../core/session.h ../core/error.h ../core/user.h
adduser.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
adduser.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
adduser.o: ../core/request.h ../core/mounts.h ../core/mount.h
adduser.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
adduser.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
adduser.o: ../core/loadavg.h ../core/sessionmanager.h
adduser.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h
adduser.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
adduser.o: ../core/mount.h ../core/mountparser.h ../core/users.h
adduser.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
adduser.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
adduser.o: ../core/sessioncontainer.h ../core/system.h
dir.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
dir.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
dir.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h
dir.o: ../../ezc/src/funinfo.h misc.h localefilter.h locale.h
dir.o: ../core/confparser.h ../core/user.h ../core/textstream.h
dir.o: patterncacher.h ../core/item.h ckeditorgetparser.h
dir.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
dir.o: ../core/user.h patterncacher.h ../core/item.h ckeditorgetparser.h
dir.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h
dir.o: indexpatterns.h ../core/config.h ../core/confparser.h
dir.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
@ -35,13 +35,13 @@ dir.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
dir.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
dir.o: ../core/requesttypes.h ../core/session.h ../core/error.h
dir.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
dir.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
dir.o: ../core/request.h ../core/mounts.h ../core/mount.h
dir.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
dir.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
dir.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
dir.o: ../core/system.h ../core/misc.h ../functions/functions.h
dir.o: ../functions/functionbase.h ../core/notify.h
dir.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h
dir.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
dir.o: ../core/mount.h ../core/mountparser.h ../core/users.h
dir.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
dir.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
dir.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
dir.o: ../functions/functions.h ../functions/functionbase.h ../core/notify.h
dir.o: ../templatesnotify/templatesnotify.h ../core/mount.h
dir.o: ../templates/misc.h ../functions/functionparser.h
dir.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
@ -60,8 +60,8 @@ doc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
doc.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
doc.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h
doc.o: ../../ezc/src/funinfo.h misc.h localefilter.h locale.h
doc.o: ../core/confparser.h ../core/user.h ../core/textstream.h
doc.o: patterncacher.h ../core/item.h ckeditorgetparser.h
doc.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
doc.o: ../core/user.h patterncacher.h ../core/item.h ckeditorgetparser.h
doc.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h
doc.o: indexpatterns.h ../core/config.h ../core/confparser.h
doc.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
@ -70,12 +70,19 @@ doc.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
doc.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
doc.o: ../core/requesttypes.h ../core/session.h ../core/error.h
doc.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
doc.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
doc.o: ../core/request.h ../core/mounts.h ../core/mount.h
doc.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
doc.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
doc.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
doc.o: ../core/system.h ../core/request.h ../core/misc.h
doc.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h
doc.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
doc.o: ../core/mount.h ../core/mountparser.h ../core/users.h
doc.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
doc.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
doc.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
doc.o: ../core/misc.h
htmltextstream.o: htmltextstream.h ../core/textstream.h misc.h localefilter.h
htmltextstream.o: locale.h ../core/confparser.h ../../ezc/src/ezc.h
htmltextstream.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
htmltextstream.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
htmltextstream.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h
htmltextstream.o: ../../ezc/src/funinfo.h ../core/user.h
indexpatterns.o: indexpatterns.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
indexpatterns.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
indexpatterns.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
@ -87,8 +94,8 @@ item.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
item.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
item.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
item.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
item.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
item.o: ../core/textstream.h patterncacher.h ../core/item.h
item.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
item.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
item.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
item.o: ../core/textstream.h indexpatterns.h ../core/config.h
item.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
@ -97,19 +104,19 @@ item.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
item.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
item.o: ../core/request.h ../core/requesttypes.h ../core/session.h
item.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
item.o: ../core/config.h ../core/system.h ../core/dirs.h
item.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
item.o: ../core/mount.h ../core/mountparser.h ../core/users.h
item.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
item.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
item.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
item.o: ../core/bbcodeparser.h
item.o: ../core/config.h ../templates/htmltextstream.h ../core/system.h
item.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
item.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
item.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
item.o: ../core/groups.h ../core/group.h ../core/loadavg.h
item.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
item.o: ../core/misc.h ../core/bbcodeparser.h
last.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
last.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
last.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
last.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
last.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
last.o: ../core/textstream.h patterncacher.h ../core/item.h
last.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
last.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
last.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
last.o: ../core/textstream.h indexpatterns.h ../core/config.h
last.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
@ -118,13 +125,13 @@ last.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
last.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
last.o: ../core/request.h ../core/requesttypes.h ../core/session.h
last.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
last.o: ../core/config.h ../core/system.h ../core/dirs.h
last.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
last.o: ../core/mount.h ../core/mountparser.h ../core/users.h
last.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
last.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
last.o: ../core/sessioncontainer.h ../core/system.h ../core/lastcontainer.h
last.o: ../core/request.h ../core/misc.h
last.o: ../core/config.h ../templates/htmltextstream.h ../core/system.h
last.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
last.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
last.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
last.o: ../core/groups.h ../core/group.h ../core/loadavg.h
last.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
last.o: ../core/lastcontainer.h ../core/request.h ../core/misc.h
locale.o: locale.h ../core/confparser.h ../core/log.h ../core/textstream.h
localefilter.o: localefilter.h locale.h ../core/confparser.h
localefilter.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h
@ -136,8 +143,8 @@ ls.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
ls.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
ls.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h
ls.o: ../../ezc/src/funinfo.h misc.h localefilter.h locale.h
ls.o: ../core/confparser.h ../core/user.h ../core/textstream.h
ls.o: patterncacher.h ../core/item.h ckeditorgetparser.h
ls.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
ls.o: ../core/user.h patterncacher.h ../core/item.h ckeditorgetparser.h
ls.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h
ls.o: indexpatterns.h ../core/config.h ../core/confparser.h
ls.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
@ -145,9 +152,10 @@ ls.o: ../db/dbtextstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h
ls.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
ls.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
ls.o: ../core/requesttypes.h ../core/session.h ../core/error.h ../core/user.h
ls.o: ../core/plugindata.h ../core/rebus.h ../core/config.h ../core/system.h
ls.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
ls.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h ../core/users.h
ls.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
ls.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h
ls.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
ls.o: ../core/mount.h ../core/mountparser.h ../core/users.h
ls.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
ls.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
ls.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
@ -155,8 +163,8 @@ misc.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
misc.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
misc.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
misc.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
misc.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
misc.o: ../core/textstream.h patterncacher.h ../core/item.h
misc.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
misc.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
misc.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
misc.o: ../core/textstream.h indexpatterns.h ../core/config.h
misc.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
@ -165,18 +173,19 @@ misc.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
misc.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
misc.o: ../core/request.h ../core/requesttypes.h ../core/session.h
misc.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
misc.o: ../core/config.h ../core/system.h ../core/dirs.h
misc.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
misc.o: ../core/mount.h ../core/mountparser.h ../core/users.h
misc.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
misc.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
misc.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
misc.o: ../core/config.h ../templates/htmltextstream.h ../core/system.h
misc.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
misc.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
misc.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
misc.o: ../core/groups.h ../core/group.h ../core/loadavg.h
misc.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
misc.o: ../core/misc.h
mount.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
mount.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
mount.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
mount.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
mount.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
mount.o: ../core/textstream.h patterncacher.h ../core/item.h
mount.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
mount.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
mount.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
mount.o: ../core/textstream.h indexpatterns.h ../core/config.h
mount.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
@ -185,12 +194,13 @@ mount.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
mount.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
mount.o: ../core/request.h ../core/requesttypes.h ../core/session.h
mount.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
mount.o: ../core/config.h ../core/system.h ../core/dirs.h
mount.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
mount.o: ../core/mount.h ../core/mountparser.h ../core/users.h
mount.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
mount.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
mount.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
mount.o: ../core/config.h ../templates/htmltextstream.h ../core/system.h
mount.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
mount.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
mount.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
mount.o: ../core/groups.h ../core/group.h ../core/loadavg.h
mount.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
mount.o: ../core/misc.h
patterncacher.o: patterncacher.h ../core/item.h ../../ezc/src/ezc.h
patterncacher.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
patterncacher.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
@ -200,8 +210,8 @@ priv.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
priv.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
priv.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
priv.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
priv.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
priv.o: ../core/textstream.h patterncacher.h ../core/item.h
priv.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
priv.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
priv.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
priv.o: ../core/textstream.h indexpatterns.h ../core/config.h
priv.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
@ -210,14 +220,14 @@ priv.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
priv.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
priv.o: ../core/request.h ../core/requesttypes.h ../core/session.h
priv.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
priv.o: ../core/config.h ../core/system.h ../core/dirs.h
priv.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
priv.o: ../core/mount.h ../core/mountparser.h ../core/users.h
priv.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
priv.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
priv.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
priv.o: ../functions/functions.h ../functions/functionbase.h ../core/notify.h
priv.o: ../templatesnotify/templatesnotify.h ../core/mount.h
priv.o: ../core/config.h ../templates/htmltextstream.h ../core/system.h
priv.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
priv.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
priv.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
priv.o: ../core/groups.h ../core/group.h ../core/loadavg.h
priv.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
priv.o: ../core/misc.h ../functions/functions.h ../functions/functionbase.h
priv.o: ../core/notify.h ../templatesnotify/templatesnotify.h ../core/mount.h
priv.o: ../templates/misc.h ../functions/functionparser.h
priv.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
priv.o: ../functions/privchanger.h ../functions/chown.h
@ -236,8 +246,8 @@ rebus.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
rebus.o: ../../ezc/src/pattern.h ../../ezc/src/item.h
rebus.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h
rebus.o: ../../ezc/src/funinfo.h misc.h localefilter.h locale.h
rebus.o: ../core/confparser.h ../core/user.h ../core/textstream.h
rebus.o: patterncacher.h ../core/item.h ckeditorgetparser.h
rebus.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
rebus.o: ../core/user.h patterncacher.h ../core/item.h ckeditorgetparser.h
rebus.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h
rebus.o: indexpatterns.h ../core/config.h ../core/confparser.h
rebus.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
@ -246,18 +256,18 @@ rebus.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
rebus.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
rebus.o: ../core/request.h ../core/requesttypes.h ../core/session.h
rebus.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
rebus.o: ../core/config.h ../core/system.h ../core/dirs.h
rebus.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
rebus.o: ../core/mount.h ../core/mountparser.h ../core/users.h
rebus.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
rebus.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
rebus.o: ../core/sessioncontainer.h ../core/system.h
rebus.o: ../core/config.h ../templates/htmltextstream.h ../core/system.h
rebus.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
rebus.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
rebus.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
rebus.o: ../core/groups.h ../core/group.h ../core/loadavg.h
rebus.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
stat.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
stat.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
stat.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
stat.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
stat.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
stat.o: ../core/textstream.h patterncacher.h ../core/item.h
stat.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
stat.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
stat.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
stat.o: ../core/textstream.h indexpatterns.h ../core/config.h
stat.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
@ -266,18 +276,19 @@ stat.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
stat.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
stat.o: ../core/request.h ../core/requesttypes.h ../core/session.h
stat.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
stat.o: ../core/config.h ../core/system.h ../core/dirs.h
stat.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
stat.o: ../core/mount.h ../core/mountparser.h ../core/users.h
stat.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
stat.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
stat.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
stat.o: ../core/config.h ../templates/htmltextstream.h ../core/system.h
stat.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
stat.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
stat.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
stat.o: ../core/groups.h ../core/group.h ../core/loadavg.h
stat.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
stat.o: ../core/misc.h
sys.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
sys.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
sys.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h
sys.o: ../../ezc/src/funinfo.h misc.h localefilter.h locale.h
sys.o: ../core/confparser.h ../core/user.h ../core/textstream.h
sys.o: patterncacher.h ../core/item.h ckeditorgetparser.h
sys.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
sys.o: ../core/user.h patterncacher.h ../core/item.h ckeditorgetparser.h
sys.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h
sys.o: indexpatterns.h ../core/config.h ../core/confparser.h
sys.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
@ -286,55 +297,58 @@ sys.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
sys.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
sys.o: ../core/requesttypes.h ../core/session.h ../core/error.h
sys.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
sys.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
sys.o: ../core/request.h ../core/mounts.h ../core/mount.h
sys.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
sys.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
sys.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
sys.o: ../core/system.h ../core/request.h ../core/version.h
sys.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h
sys.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
sys.o: ../core/mount.h ../core/mountparser.h ../core/users.h
sys.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
sys.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
sys.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
sys.o: ../core/version.h
template.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
template.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
template.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
template.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
template.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
template.o: ../core/textstream.h patterncacher.h ../core/item.h
template.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
template.o: ../core/textstream.h indexpatterns.h ../core/config.h
template.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h
template.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
template.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
template.o: ../core/textstream.h ../core/user.h patterncacher.h
template.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
template.o: ../core/log.h ../core/textstream.h indexpatterns.h
template.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
template.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
template.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
template.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
template.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
template.o: ../core/requesttypes.h ../core/session.h ../core/error.h
template.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
template.o: ../core/config.h ../core/system.h ../core/dirs.h
template.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
template.o: ../core/mount.h ../core/mountparser.h ../core/users.h
template.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
template.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
template.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
template.o: ../core/config.h ../templates/htmltextstream.h ../core/system.h
template.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
template.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
template.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
template.o: ../core/groups.h ../core/group.h ../core/loadavg.h
template.o: ../core/sessionmanager.h ../core/sessioncontainer.h
template.o: ../core/system.h ../core/misc.h
templates.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
templates.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
templates.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
templates.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
templates.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
templates.o: ../core/textstream.h patterncacher.h ../core/item.h
templates.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
templates.o: ../core/textstream.h indexpatterns.h ../core/config.h
templates.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h
templates.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
templates.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
templates.o: ../core/textstream.h ../core/user.h patterncacher.h
templates.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
templates.o: ../core/log.h ../core/textstream.h indexpatterns.h
templates.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
templates.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
templates.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
templates.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
templates.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
templates.o: ../core/requesttypes.h ../core/session.h ../core/error.h
templates.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
templates.o: ../core/config.h ../core/system.h ../core/dirs.h
templates.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
templates.o: ../core/mount.h ../core/mountparser.h ../core/users.h
templates.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
templates.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
templates.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
templates.o: ../core/plugin.h ../core/pluginmsg.h ../core/sessionmanager.h
templates.o: ../core/config.h ../templates/htmltextstream.h ../core/system.h
templates.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
templates.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
templates.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
templates.o: ../core/groups.h ../core/group.h ../core/loadavg.h
templates.o: ../core/sessionmanager.h ../core/sessioncontainer.h
templates.o: ../core/system.h ../core/misc.h ../core/plugin.h
templates.o: ../core/pluginmsg.h ../core/sessionmanager.h
templates.o: ../functions/functions.h ../functions/functionbase.h
templates.o: ../core/notify.h ../templatesnotify/templatesnotify.h
templates.o: ../core/mount.h ../templates/misc.h
@ -356,8 +370,8 @@ thread.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
thread.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
thread.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
thread.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
thread.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
thread.o: ../core/textstream.h patterncacher.h ../core/item.h
thread.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
thread.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
thread.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
thread.o: ../core/textstream.h indexpatterns.h ../core/config.h
thread.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
@ -366,15 +380,16 @@ thread.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
thread.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
thread.o: ../core/request.h ../core/requesttypes.h ../core/session.h
thread.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
thread.o: ../core/config.h ../core/system.h ../core/dirs.h
thread.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
thread.o: ../core/mount.h ../core/mountparser.h ../core/users.h
thread.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
thread.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
thread.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
thread.o: ../functions/functions.h ../functions/functionbase.h
thread.o: ../core/notify.h ../templatesnotify/templatesnotify.h
thread.o: ../core/mount.h ../templates/misc.h ../functions/functionparser.h
thread.o: ../core/config.h ../templates/htmltextstream.h ../core/system.h
thread.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
thread.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
thread.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
thread.o: ../core/groups.h ../core/group.h ../core/loadavg.h
thread.o: ../core/sessionmanager.h ../core/sessioncontainer.h
thread.o: ../core/system.h ../core/misc.h ../functions/functions.h
thread.o: ../functions/functionbase.h ../core/notify.h
thread.o: ../templatesnotify/templatesnotify.h ../core/mount.h
thread.o: ../templates/misc.h ../functions/functionparser.h
thread.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
thread.o: ../functions/privchanger.h ../functions/chown.h
thread.o: ../functions/ckeditor.h ../functions/cp.h
@ -392,8 +407,8 @@ upload.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
upload.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
upload.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
upload.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
upload.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
upload.o: ../core/textstream.h patterncacher.h ../core/item.h
upload.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
upload.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
upload.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
upload.o: ../core/textstream.h indexpatterns.h ../core/config.h
upload.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
@ -402,18 +417,19 @@ upload.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
upload.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
upload.o: ../core/request.h ../core/requesttypes.h ../core/session.h
upload.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
upload.o: ../core/config.h ../core/system.h ../core/dirs.h
upload.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
upload.o: ../core/mount.h ../core/mountparser.h ../core/users.h
upload.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
upload.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
upload.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
upload.o: ../core/config.h ../templates/htmltextstream.h ../core/system.h
upload.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
upload.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
upload.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
upload.o: ../core/groups.h ../core/group.h ../core/loadavg.h
upload.o: ../core/sessionmanager.h ../core/sessioncontainer.h
upload.o: ../core/system.h ../core/request.h
uptime.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
uptime.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
uptime.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
uptime.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
uptime.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
uptime.o: ../core/textstream.h patterncacher.h ../core/item.h
uptime.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
uptime.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
uptime.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
uptime.o: ../core/textstream.h indexpatterns.h ../core/config.h
uptime.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
@ -422,18 +438,19 @@ uptime.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
uptime.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
uptime.o: ../core/request.h ../core/requesttypes.h ../core/session.h
uptime.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
uptime.o: ../core/config.h ../core/system.h ../core/dirs.h
uptime.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
uptime.o: ../core/mount.h ../core/mountparser.h ../core/users.h
uptime.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
uptime.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
uptime.o: ../core/sessioncontainer.h ../core/system.h
uptime.o: ../core/config.h ../templates/htmltextstream.h ../core/system.h
uptime.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
uptime.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
uptime.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
uptime.o: ../core/groups.h ../core/group.h ../core/loadavg.h
uptime.o: ../core/sessionmanager.h ../core/sessioncontainer.h
uptime.o: ../core/system.h
user.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
user.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
user.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
user.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
user.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
user.o: ../core/textstream.h patterncacher.h ../core/item.h
user.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
user.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
user.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
user.o: ../core/textstream.h indexpatterns.h ../core/config.h
user.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
@ -442,19 +459,19 @@ user.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
user.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
user.o: ../core/request.h ../core/requesttypes.h ../core/session.h
user.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
user.o: ../core/config.h ../core/system.h ../core/dirs.h
user.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
user.o: ../core/mount.h ../core/mountparser.h ../core/users.h
user.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
user.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
user.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
user.o: ../core/misc.h
user.o: ../core/config.h ../templates/htmltextstream.h ../core/system.h
user.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
user.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
user.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
user.o: ../core/groups.h ../core/group.h ../core/loadavg.h
user.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
user.o: ../core/request.h ../core/misc.h
who.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
who.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h
who.o: ../../ezc/src/stringconv.h ../../ezc/src/functions.h
who.o: ../../ezc/src/funinfo.h misc.h localefilter.h locale.h
who.o: ../core/confparser.h ../core/user.h ../core/textstream.h
who.o: patterncacher.h ../core/item.h ckeditorgetparser.h
who.o: ../core/confparser.h htmltextstream.h ../core/textstream.h
who.o: ../core/user.h patterncacher.h ../core/item.h ckeditorgetparser.h
who.o: ../core/httpsimpleparser.h ../core/log.h ../core/textstream.h
who.o: indexpatterns.h ../core/config.h ../core/confparser.h
who.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
@ -463,18 +480,18 @@ who.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
who.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
who.o: ../core/requesttypes.h ../core/session.h ../core/error.h
who.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
who.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
who.o: ../core/request.h ../core/mounts.h ../core/mount.h
who.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
who.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
who.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
who.o: ../core/system.h ../core/misc.h
who.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h
who.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
who.o: ../core/mount.h ../core/mountparser.h ../core/users.h
who.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
who.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
who.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
winix.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
winix.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
winix.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
winix.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h misc.h
winix.o: localefilter.h locale.h ../core/confparser.h ../core/user.h
winix.o: ../core/textstream.h patterncacher.h ../core/item.h
winix.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h
winix.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h
winix.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
winix.o: ../core/textstream.h indexpatterns.h ../core/config.h
winix.o: ../core/confparser.h ../core/htmlfilter.h ../db/db.h ../db/dbbase.h
@ -483,13 +500,13 @@ winix.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h
winix.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
winix.o: ../core/request.h ../core/requesttypes.h ../core/session.h
winix.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
winix.o: ../core/config.h ../core/system.h ../core/dirs.h
winix.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
winix.o: ../core/mount.h ../core/mountparser.h ../core/users.h
winix.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
winix.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
winix.o: ../core/sessioncontainer.h ../core/system.h ../core/plugin.h
winix.o: ../core/pluginmsg.h ../core/sessionmanager.h
winix.o: ../core/config.h ../templates/htmltextstream.h ../core/system.h
winix.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
winix.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
winix.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
winix.o: ../core/groups.h ../core/group.h ../core/loadavg.h
winix.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h
winix.o: ../core/plugin.h ../core/pluginmsg.h ../core/sessionmanager.h
winix.o: ../functions/functions.h ../functions/functionbase.h
winix.o: ../core/notify.h ../templatesnotify/templatesnotify.h
winix.o: ../core/mount.h ../templates/misc.h ../functions/functionparser.h

2
templates/Makefile.o.dep
View File

@ -1 +1 @@
o = adduser.o dir.o doc.o indexpatterns.o item.o last.o locale.o localefilter.o ls.o misc.o mount.o patterncacher.o priv.o rebus.o stat.o sys.o template.o templates.o thread.o upload.o uptime.o user.o who.o winix.o
o = adduser.o dir.o doc.o htmltextstream.o indexpatterns.o item.o last.o locale.o localefilter.o ls.o misc.o mount.o patterncacher.o priv.o rebus.o stat.o sys.o template.o templates.o thread.o upload.o uptime.o user.o who.o winix.o

2
templates/ckeditorgetparser.h
View File

@ -39,7 +39,7 @@ protected:
{
if( name == "CKEditorFuncNum" )
{
fun_num = atol(value.c_str());
fun_num = Tol(value);
log << log3 << "CKEGetParser: callback function number: " << fun_num << logend;
}
}

40
templates/dir.cpp
View File

@ -20,10 +20,7 @@ namespace TemplatesFunctions
void dir(Info & i)
{
for(size_t a=0 ; a<request->dir_tab.size() ; ++a)
{
HtmlEscape(i.out, request->dir_tab[a]->url);
i.out << '/';
}
i.out << request->dir_tab[a]->url << '/';
}
@ -31,7 +28,7 @@ void dir_without_slash(Info & i)
{
for(size_t a=0 ; a<request->dir_tab.size() ; ++a)
{
HtmlEscape(i.out, request->dir_tab[a]->url);
i.out << request->dir_tab[a]->url;
if( a < request->dir_tab.size()-1 )
i.out << '/';
@ -46,8 +43,7 @@ void dir_parent(Info & i)
for(size_t a=0 ; a<request->dir_tab.size()-1 ; ++a)
{
HtmlEscape(i.out, request->dir_tab[a]->url);
i.out << '/';
i.out << request->dir_tab[a]->url << '/';
}
}
@ -59,7 +55,7 @@ void dir_parent_without_slash(Info & i)
for(size_t a=0 ; a<request->dir_tab.size()-1 ; ++a)
{
HtmlEscape(i.out, request->dir_tab[a]->url);
i.out << request->dir_tab[a]->url;
if( request->dir_tab.size()>=2 && a<request->dir_tab.size()-2 )
i.out << '/';
@ -174,7 +170,7 @@ void dir_childs_is_parent(Info & i)
void dir_childs_tab_url(Info & i)
{
if( dir_childs_index < dir_childs_table.size() )
HtmlEscape(i.out, dir_childs_table[dir_childs_index]->url);
i.out << dir_childs_table[dir_childs_index]->url;
}
@ -182,7 +178,7 @@ void dir_childs_tab_url(Info & i)
void dir_childs_tab_privileges(Info & i)
{
if( dir_childs_index < dir_childs_table.size() )
i.out << "0" << Itoa(dir_childs_table[dir_childs_index]->privileges, 8);
i.out << "0" << Toa(dir_childs_table[dir_childs_index]->privileges, 8);
}
@ -194,13 +190,13 @@ void dir_childs_tab_user(Info & i)
User * puser = system->users.GetUser(user_id);
if( puser )
HtmlEscape(i.out, puser->name);
i.out << puser->name;
else
{
i.out << "~";
if( !dir_childs_table[dir_childs_index]->guest_name.empty() )
HtmlEscape(i.out, dir_childs_table[dir_childs_index]->guest_name);
i.out << dir_childs_table[dir_childs_index]->guest_name;
else
i.out << "guest"; // !! dodac do konfiga
}
@ -217,7 +213,7 @@ void dir_childs_tab_group(Info & i)
Group * pgroup = system->groups.GetGroup(group_id);
if( pgroup )
HtmlEscape(i.out, pgroup->name);
i.out << pgroup->name;
else
i.out << group_id;
}
@ -241,7 +237,7 @@ void dir_tab(Info & i)
void dir_tab_url(Info & i)
{
if( dir_index < request->dir_tab.size() )
HtmlEscape(i.out, request->dir_tab[dir_index]->url);
i.out << request->dir_tab[dir_index]->url;
}
@ -251,7 +247,7 @@ void dir_tab_link(Info & i)
for(size_t a = 0 ; a <= dir_index && a < request->dir_tab.size() ; ++a)
{
HtmlEscape(i.out, request->dir_tab[a]->url);
i.out << request->dir_tab[a]->url;
i.out << '/';
}
}
@ -298,7 +294,7 @@ void dir_last_default_item_dir(Info & i)
if( dir_last_default_item.parent_id != -1 )
if( system->dirs.MakePath(dir_last_default_item.parent_id, path) )
HtmlEscape(i.out, path);
i.out << path;
}
@ -306,13 +302,13 @@ void dir_last_default_item_url(Info & i)
{
dir_last_default_item_init();
HtmlEscape(i.out, dir_last_default_item.url);
i.out << dir_last_default_item.url;
}
void dir_last_subject(Info & i)
{
HtmlEscape(i.out, request->dir_tab.back()->subject);
i.out << request->dir_tab.back()->subject;
}
@ -321,13 +317,13 @@ void dir_last_user(Info & i)
User * puser = system->users.GetUser(request->dir_tab.back()->user_id);
if( puser )
HtmlEscape(i.out, puser->name);
i.out << puser->name;
else
{
i.out << "~";
if( !request->dir_tab.back()->guest_name.empty() )
HtmlEscape(i.out, request->dir_tab.back()->guest_name);
i.out << request->dir_tab.back()->guest_name;
else
i.out << "guest"; // !! dodac do konfiga
}
@ -336,7 +332,7 @@ void dir_last_user(Info & i)
void dir_last_url(Info & i)
{
HtmlEscape(i.out, request->dir_tab.back()->url);
i.out << request->dir_tab.back()->url;
}
@ -402,7 +398,7 @@ void dir_last_modification_user(Info & i)
void dir_last_html_template(Info & i)
{
HtmlEscape(i.out, request->dir_tab.back()->html_template);
i.out << request->dir_tab.back()->html_template;
}

4
templates/doc.cpp
View File

@ -29,7 +29,7 @@ void doc_title(Info & i)
// from 1 means skipping the root directory
for(a = 1 ; a<request->dir_tab.size() ; ++a)
{
HtmlEscape(i.out, request->dir_tab[a]->subject);
i.out << request->dir_tab[a]->subject;
was_dir = true;
if( a < request->dir_tab.size()-1 )
@ -41,7 +41,7 @@ void doc_title(Info & i)
if( was_dir )
i.out << config->title_separator;
HtmlEscape(i.out, request->item.subject);
i.out << request->item.subject;
}
}

412
templates/htmltextstream.cpp Executable file
View File

@ -0,0 +1,412 @@
/*
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2010, Tomasz Sowa
* All rights reserved.
*
*/
#include "htmltextstream.h"
/*
without escaping
*/
HtmlTextStream & HtmlTextStream::PutText(const char * str)
{
TextStream<std::wstring>::operator<<(str);
return *this;
}
HtmlTextStream & HtmlTextStream::PutText(const char * str, size_t len)
{
TextStream<std::wstring>::operator<<(str);
return *this;
}
HtmlTextStream & HtmlTextStream::PutText(const std::string * str)
{
return PutText(str->c_str());
}
HtmlTextStream & HtmlTextStream::PutText(const std::string & str)
{
return PutText(str.c_str());
}
HtmlTextStream & HtmlTextStream::PutText(const wchar_t * str)
{
TextStream<std::wstring>::operator<<(str);
return *this;
}
HtmlTextStream & HtmlTextStream::PutText(const std::wstring * str)
{
return PutText(str->c_str());
}
HtmlTextStream & HtmlTextStream::PutText(const std::wstring & str)
{
return PutText(str.c_str());
}
HtmlTextStream & HtmlTextStream::operator<<(const RawText<const char*> & raw)
{
return PutText(raw.par);
}
HtmlTextStream & HtmlTextStream::operator<<(const RawText<const wchar_t*> & raw)
{
return PutText(raw.par);
}
HtmlTextStream & HtmlTextStream::operator<<(RawText<const std::string*> raw)
{
return PutText(raw.par);
}
HtmlTextStream & HtmlTextStream::operator<<(RawText<const std::wstring*> raw)
{
return PutText(raw.par);
}
HtmlTextStream & HtmlTextStream::operator<<(RawText<std::string> raw)
{
return PutText(raw.par);
}
HtmlTextStream & HtmlTextStream::operator<<(RawText<std::wstring> raw)
{
return PutText(raw.par);
}
HtmlTextStream & HtmlTextStream::operator<<(RawText<char> raw)
{
TextStream<std::wstring>::operator<<(raw.par);
return *this;
}
HtmlTextStream & HtmlTextStream::operator<<(RawText<wchar_t> raw)
{
TextStream<std::wstring>::operator<<(raw.par);
return *this;
}
HtmlTextStream & HtmlTextStream::operator<<(RawText<int> raw)
{
TextStream<std::wstring>::operator<<(raw.par);
return *this;
}
HtmlTextStream & HtmlTextStream::operator<<(RawText<long> raw)
{
TextStream<std::wstring>::operator<<(raw.par);
return *this;
}
HtmlTextStream & HtmlTextStream::operator<<(RawText<unsigned int> raw)
{
TextStream<std::wstring>::operator<<(raw.par);
return *this;
}
HtmlTextStream & HtmlTextStream::operator<<(RawText<unsigned long> raw)
{
TextStream<std::wstring>::operator<<(raw.par);
return *this;
}
HtmlTextStream & HtmlTextStream::operator<<(RawText<double> raw)
{
TextStream<std::wstring>::operator<<(raw.par);
return *this;
}
HtmlTextStream & HtmlTextStream::operator<<(RawText<void*> raw)
{
TextStream<std::wstring>::operator<<(raw.par);
return *this;
}
HtmlTextStream & HtmlTextStream::Write(const char * buf, size_t len)
{
TextStream<std::wstring>::Write(buf, len);
return *this;
}
HtmlTextStream & HtmlTextStream::Write(const wchar_t * buf, size_t len)
{
TextStream<std::wstring>::Write(buf, len);
return *this;
}
HtmlTextStream & HtmlTextStream::write(const char * buf, size_t len)
{
TextStream<std::wstring>::write(buf, len);
return *this;
}
HtmlTextStream & HtmlTextStream::write(const wchar_t * buf, size_t len)
{
TextStream<std::wstring>::write(buf, len);
return *this;
}
/*
with escaping
*/
HtmlTextStream & HtmlTextStream::ETextPutChar(char c)
{
return ETextPutChar(static_cast<wchar_t>(c));
}
HtmlTextStream & HtmlTextStream::ETextPutChar(wchar_t c)
{
if( c == '<' )
buffer += L"&lt;";
else
if( c == '>' )
buffer += L"&gt;";
else
if( c == '&' )
buffer += L"&amp;";
else
if( c != 0 )
buffer += c;
return *this;
}
HtmlTextStream & HtmlTextStream::EPutText(const char * str)
{
for( ; *str ; ++str )
ETextPutChar(*str);
return *this;
}
HtmlTextStream & HtmlTextStream::EPutText(const char * str, size_t len)
{
for(size_t i=0 ; i<len ; ++i)
ETextPutChar(str[i]);
return *this;
}
HtmlTextStream & HtmlTextStream::EPutText(const std::string * str)
{
return EPutText(str->c_str(), str->size());
}
HtmlTextStream & HtmlTextStream::EPutText(const std::string & str)
{
return EPutText(str.c_str(), str.size());
}
HtmlTextStream & HtmlTextStream::EPutText(const wchar_t * str)
{
for( ; *str ; ++str )
ETextPutChar(*str);
return *this;
}
HtmlTextStream & HtmlTextStream::EPutText(const wchar_t * str, size_t len)
{
for(size_t i=0 ; i<len ; ++i)
ETextPutChar(str[i]);
return *this;
}
HtmlTextStream & HtmlTextStream::EPutText(const std::wstring * str)
{
return EPutText(str->c_str(), str->size());
}
HtmlTextStream & HtmlTextStream::EPutText(const std::wstring & str)
{
return EPutText(str.c_str(), str.size());
}
HtmlTextStream & HtmlTextStream::operator<<(const char * str)
{
return EPutText(str);
}
HtmlTextStream & HtmlTextStream::operator<<(const std::string * str)
{
return EPutText(str);
}
HtmlTextStream & HtmlTextStream::operator<<(const std::string & str)
{
return EPutText(str);
}
HtmlTextStream & HtmlTextStream::operator<<(const wchar_t * str)
{
return EPutText(str);
}
HtmlTextStream & HtmlTextStream::operator<<(const std::wstring * str)
{
return EPutText(str);
}
HtmlTextStream & HtmlTextStream::operator<<(const std::wstring & str)
{
return EPutText(str);
}
HtmlTextStream & HtmlTextStream::operator<<(char v)
{
ETextPutChar(v);
return *this;
}
HtmlTextStream & HtmlTextStream::operator<<(wchar_t v)
{
ETextPutChar(v);
return *this;
}
HtmlTextStream & HtmlTextStream::operator<<(int v)
{
TextStream<std::wstring>::operator<<(v);
return *this;
}
HtmlTextStream & HtmlTextStream::operator<<(long v)
{
TextStream<std::wstring>::operator<<(v);
return *this;
}
HtmlTextStream & HtmlTextStream::operator<<(unsigned int v)
{
TextStream<std::wstring>::operator<<(v);
return *this;
}
HtmlTextStream & HtmlTextStream::operator<<(unsigned long v)
{
TextStream<std::wstring>::operator<<(v);
return *this;
}
HtmlTextStream & HtmlTextStream::operator<<(double v)
{
TextStream<std::wstring>::operator<<(v);
return *this;
}
HtmlTextStream & HtmlTextStream::operator<<(const void * v)
{
TextStream<std::wstring>::operator<<(v);
return *this;
}
HtmlTextStream & HtmlTextStream::operator<<(const tm & t)
{
buffer += DateToStr(t); // from core/misc
return *this;
}

154
templates/htmltextstream.h Executable file
View File

@ -0,0 +1,154 @@
/*
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2010, Tomasz Sowa
* All rights reserved.
*
*/
#ifndef headerfile_winix_templates_htmltextstream
#define headerfile_winix_templates_htmltextstream
#include <ctime>
#include "core/textstream.h"
/*
HtmlTextStream is used as a buffer for creating a html page
By default all operators<< escape its string artuments. If you don't want
to escape an argument you should use a helper function R() (raw argument)
note: you have to define the function yourself, we do not provide it
because such a short name would make a mess in namespaces
sample:
create a helper function R as follows:
template<class RawType>
HtmlTextStream::RawText<RawType> R(const RawType & par)
{
return HtmlTextStream::RawText<RawType>(par);
}
now you can use HtmlTextStream in an easy way:
HtmlTextStream page;
std::string key = "some <b>string</b>";
page << key << R("<h2>html goes here</h2>");
only html tags "<b>" and "</b>" will be correctly escaped
currently following characters are escaped:
< -> &lt;
> -> &gt;
& -> &nbsp;
*/
class HtmlTextStream : public TextStream<std::wstring>
{
public:
/*
a helper struct to select a proper operator<<
(for non-escaping versions of these operators)
*/
template<class RawType>
struct RawText
{
const RawType & par;
RawText(const RawText<RawType> & p) : par(p.par) {}
RawText(const RawType & p) : par(p) {}
};
/*
without escaping
*/
HtmlTextStream & PutText(const char *);
HtmlTextStream & PutText(const char *, size_t len);
HtmlTextStream & PutText(const std::string *);
HtmlTextStream & PutText(const std::string &);
HtmlTextStream & PutText(const wchar_t * str);
HtmlTextStream & PutText(const wchar_t * str, size_t len);
HtmlTextStream & PutText(const std::wstring * str);
HtmlTextStream & PutText(const std::wstring & str);
/*
we need this template operator for such calling:
HtmlTextStream_object << R("some string");
"some string" is actually a table (not a pointer)
*/
template<size_t str_size>
HtmlTextStream & operator<<(const RawText<char [str_size]> & raw) { return PutText(raw.par); }
template<size_t str_size>
HtmlTextStream & operator<<(const RawText<wchar_t [str_size]> & raw) { return PutText(raw.par); }
HtmlTextStream & operator<<(const RawText<const char*> & raw);
HtmlTextStream & operator<<(const RawText<const wchar_t*> & raw);
HtmlTextStream & operator<<(RawText<const std::string*> raw);
HtmlTextStream & operator<<(RawText<const std::wstring*> raw);
HtmlTextStream & operator<<(RawText<std::string> raw);
HtmlTextStream & operator<<(RawText<std::wstring> raw);
HtmlTextStream & operator<<(RawText<char> raw);
HtmlTextStream & operator<<(RawText<wchar_t> raw);
HtmlTextStream & operator<<(RawText<int> raw);
HtmlTextStream & operator<<(RawText<long> raw);
HtmlTextStream & operator<<(RawText<unsigned int> raw);
HtmlTextStream & operator<<(RawText<unsigned long> raw);
HtmlTextStream & operator<<(RawText<double> raw);
HtmlTextStream & operator<<(RawText<void*> raw);
// 'write' don't escapes too
// with these methods you can write a zero character too
HtmlTextStream & Write(const char * buf, size_t len);
HtmlTextStream & Write(const wchar_t * buf, size_t len);
// for compatibility with standard library (Ezc uses it)
HtmlTextStream & write(const char * buf, size_t len);
HtmlTextStream & write(const wchar_t * buf, size_t len);
/*
with escaping
*/
HtmlTextStream & ETextPutChar(char c);
HtmlTextStream & ETextPutChar(wchar_t c);
HtmlTextStream & EPutText(const char * str);
HtmlTextStream & EPutText(const char * str, size_t len);
HtmlTextStream & EPutText(const std::string * str);
HtmlTextStream & EPutText(const std::string & str);
HtmlTextStream & EPutText(const wchar_t * str);
HtmlTextStream & EPutText(const wchar_t * str, size_t len);
HtmlTextStream & EPutText(const std::wstring * str);
HtmlTextStream & EPutText(const std::wstring & str);
HtmlTextStream & operator<<(const char * str);
HtmlTextStream & operator<<(const std::string * str);
HtmlTextStream & operator<<(const std::string & str);
HtmlTextStream & operator<<(const wchar_t * str);
HtmlTextStream & operator<<(const std::wstring * str);
HtmlTextStream & operator<<(const std::wstring & str);
HtmlTextStream & operator<<(char);
HtmlTextStream & operator<<(wchar_t);
HtmlTextStream & operator<<(int);
HtmlTextStream & operator<<(long);
HtmlTextStream & operator<<(unsigned int);
HtmlTextStream & operator<<(unsigned long);
HtmlTextStream & operator<<(double);
HtmlTextStream & operator<<(const void *);
HtmlTextStream & operator<<(const tm & t);
};
#endif

48
templates/item.cpp
View File

@ -40,7 +40,7 @@ void item_id(Info & i)
void item_subject(Info & i)
{
HtmlEscape(i.out, request->item.subject);
i.out << request->item.subject;
}
@ -53,7 +53,7 @@ void item_subject_noescape(Info & i)
void item_content(Info & i)
{
HtmlEscape(i.out, request->item.content);
i.out << request->item.content;
}
@ -91,11 +91,11 @@ void item_content_type_is(Info & i)
}
void item_print_content(TextStream<std::wstring> & out, const std::wstring & content, Item::ContentType content_type)
void item_print_content(HtmlTextStream & out, const std::wstring & content, Item::ContentType content_type)
{
if( content_type == Item::ct_text )
{
HtmlEscape(out, content);
out << content;
}
else
if( content_type == Item::ct_formatted_text )
@ -105,7 +105,7 @@ void item_print_content(TextStream<std::wstring> & out, const std::wstring & con
else
if( content_type == Item::ct_html || content_type == Item::ct_raw )
{
out << content;
out << R(content);
}
else
if( content_type == Item::ct_bbcode )
@ -115,7 +115,7 @@ void item_print_content(TextStream<std::wstring> & out, const std::wstring & con
out_temp.reserve(content.size()*2);
bbcode_parser.Filter(content.c_str(), out_temp);
out << out_temp;
out << R(out_temp);
}
}
@ -134,7 +134,7 @@ void item_print_content(Info & i)
void item_privileges(Info & i)
{
i.out << Itoa(request->item.privileges, 8);
i.out << Toa(request->item.privileges, 8);
}
@ -146,7 +146,7 @@ void item_dir(Info & i)
void item_url(Info & i)
{
HtmlEscape(i.out, request->item.url);
i.out << request->item.url;
}
@ -161,7 +161,7 @@ void item_url_is(Info & i)
void item_link(Info & i)
{
HtmlEscape(i.out, config->base_url);
i.out << config->base_url;
item_dir(i);
item_url(i);
}
@ -278,9 +278,9 @@ void item_run(Info & i)
}
Ezc::Pattern * p = pattern_cacher.GetPattern(request->item);
TextStream<std::wstring> item_run_content;
HtmlTextStream item_run_content; // !! zrobic static z tego i tu dac tylko clearowanie
Ezc::Generator<TextStream<std::wstring> > gen(item_run_content, *p, ezc_functions);
EzcGen gen(item_run_content, *p, ezc_functions);
gen.Generate();
item_print_content(i.out, item_run_content.Str(), request->item.content_type);
@ -289,13 +289,13 @@ void item_run(Info & i)
void item_guest_name(Info & i)
{
HtmlEscape(i.out, request->item.guest_name);
i.out << request->item.guest_name;
}
void item_html_template(Info & i)
{
HtmlEscape(i.out, request->item.html_template);
i.out << request->item.html_template;
}
@ -330,7 +330,7 @@ void item_tab_id(Info & i)
void item_tab_subject(Info & i)
{
if( item_index < request->item_tab.size() )
HtmlEscape(i.out, request->item_tab[item_index].subject);
i.out << request->item_tab[item_index].subject;
}
void item_tab_subject_noescape(Info & i)
@ -343,7 +343,7 @@ void item_tab_subject_noescape(Info & i)
void item_tab_content(Info & i)
{
if( item_index < request->item_tab.size() )
HtmlEscape(i.out, request->item_tab[item_index].content);
i.out << request->item_tab[item_index].content;
}
@ -369,7 +369,7 @@ void item_tab_print_content(Info & i)
void item_tab_privileges(Info & i)
{
if( item_index < request->item_tab.size() )
i.out << "0" << Itoa(request->item_tab[item_index].privileges, 8);
i.out << "0" << Toa(request->item_tab[item_index].privileges, 8);
}
@ -381,9 +381,9 @@ void item_tab_dir(Info & i)
std::wstring path;
if( system->dirs.MakePath(request->item_tab[item_index].parent_id, path) )
HtmlEscape(i.out, path);
i.out << path;
else
i.out << "/the path does not exist/";
i.out << "/the path does not exist/"; // !! do konfiga
}
}
@ -391,7 +391,7 @@ void item_tab_dir(Info & i)
void item_tab_url(Info & i)
{
if( item_index < request->item_tab.size() )
HtmlEscape(i.out, request->item_tab[item_index].url);
i.out << request->item_tab[item_index].url;
}
@ -399,7 +399,7 @@ void item_tab_link(Info & i)
{
if( item_index < request->item_tab.size() )
{
HtmlEscape(i.out, config->base_url);
i.out << config->base_url;
item_tab_dir(i);
item_tab_url(i);
}
@ -410,7 +410,7 @@ void item_tab_link_auth(Info & i)
{
if( item_index < request->item_tab.size() )
{
HtmlEscape(i.out, config->base_url_auth);
i.out << config->base_url_auth;
item_tab_dir(i);
item_tab_url(i);
}
@ -477,7 +477,7 @@ void item_tab_group(Info & i)
Group * pgroup = system->groups.GetGroup(group_id);
if( pgroup )
HtmlEscape(i.out, pgroup->name);
i.out << pgroup->name;
else
i.out << group_id;
}
@ -551,9 +551,9 @@ void item_tab_run(Info & i)
}
Ezc::Pattern * p = pattern_cacher.GetPattern(request->item_tab[item_index]);
TextStream<std::wstring> item_run_content;
HtmlTextStream item_run_content; // !! zrobic static z tego i tu dac tylko clearowanie
Ezc::Generator<TextStream<std::wstring> > gen(item_run_content, *p, ezc_functions);
EzcGen gen(item_run_content, *p, ezc_functions);
gen.Generate();
item_print_content(i.out, item_run_content.Str(), request->item_tab[item_index].content_type);

2
templates/last.cpp
View File

@ -50,7 +50,7 @@ void last_tab_name(Info & i)
if( !last_init() )
return;
HtmlEscape(i.out, last_iterator->name);
i.out << last_iterator->name;
}

23
templates/misc.cpp
View File

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

21
templates/misc.h
View File

@ -15,19 +15,28 @@
#include <string>
#include "localefilter.h"
#include "ezc.h"
#include "htmltextstream.h"
#include "core/user.h"
#include "core/textstream.h"
namespace TemplatesFunctions
{
typedef Ezc::FunInfo<TextStream<std::wstring> > Info;
typedef Ezc::Functions<HtmlTextStream> EzcFun;
typedef Ezc::Generator<HtmlTextStream> EzcGen;
typedef Ezc::FunInfo<HtmlTextStream> Info;
template<class RawType>
HtmlTextStream::RawText<RawType> R(const RawType & par)
{
return HtmlTextStream::RawText<RawType>(par);
}
void HtmlEscape(TextStream<std::wstring> & out, const std::wstring & in);
void HtmlEscapeFormTxt(TextStream<std::wstring> & out, const std::wstring & in);
std::wstring HtmlEscape(const std::wstring & in);
std::wstring HtmlEscapeFormTxt(const std::wstring & in);
//void HtmlEscape(TextStream<std::wstring> & out, const std::wstring & in);
void HtmlEscapeFormTxt(HtmlTextStream & out, const std::wstring & in);
//std::wstring HtmlEscape(const std::wstring & in);
//std::wstring HtmlEscapeFormTxt(const std::wstring & in);
// table: [language][file]

2
templates/mount.cpp
View File

@ -50,7 +50,7 @@ void mount_first_html_template(Info & i)
Mount::ParamRow & par = system->mounts.pmount->param[system->mounts.MountParHtmlTemplate()];
if( par.defined && !par.arg.empty() )
HtmlEscape(i.out, par.arg[0]);
i.out << par.arg[0];
}

16
templates/priv.cpp
View File

@ -84,13 +84,13 @@ void priv_user_tab_name(Info & i)
User * puser = system->users.GetUser( uid );
if( puser )
HtmlEscape(i.out, puser->name);
i.out << puser->name;
else
i.out << "user_id: " << uid;
}
else
{
HtmlEscape(i.out, config->priv_no_user);
i.out << config->priv_no_user;
}
}
}
@ -209,13 +209,13 @@ void priv_group_tab_name(Info & i)
Group * pgroup = system->groups.GetGroup( gid );
if( pgroup )
HtmlEscape(i.out, pgroup->name);
i.out << pgroup->name;
else
i.out << "group_id: " << gid;
}
else
{
HtmlEscape(i.out, config->priv_no_group);
i.out << config->priv_no_group;
}
}
}
@ -245,23 +245,23 @@ void priv_group_tab_isdefault(Info & i)
void priv_privileges(Info & i)
{
if( request->is_item )
i.out << Itoa(request->item.privileges, 8);
i.out << Toa(request->item.privileges, 8);
else
i.out << Itoa(request->dir_tab.back()->privileges, 8);
i.out << Toa(request->dir_tab.back()->privileges, 8);
}
void priv_privileges_for_files(Info & i)
{
//!! bedzie uzyte umask
i.out << Itoa((int)0644, 8);
i.out << Toa((int)0644, 8);
}
void priv_privileges_for_dirs(Info & i)
{
//!! bedzie uzyte umask
i.out << Itoa((int)0755, 8);
i.out << Toa((int)0755, 8);
}

6
templates/stat.cpp
View File

@ -57,7 +57,7 @@ void stat_item_group(Info & i)
Group * pgroup = system->groups.GetGroup(group_id);
if( pgroup )
HtmlEscape(i.out, pgroup->name);
i.out << pgroup->name;
else
i.out << group_id;
}
@ -65,7 +65,7 @@ void stat_item_group(Info & i)
void stat_item_privileges(Info & i)
{
i.out << Itoa(request->last_item->privileges, 8);
i.out << Toa(request->last_item->privileges, 8);
}
@ -87,7 +87,7 @@ void stat_item_date_modification(Info & i)
void stat_item_template(Info & i)
{
HtmlEscape(i.out, request->last_item->html_template);
i.out << request->last_item->html_template;
}

4
templates/template.cpp
View File

@ -20,7 +20,7 @@ namespace TemplatesFunctions
void template_index(Info & i)
{
HtmlEscape(i.out, config->templates_index);
i.out << config->templates_index;
}
@ -110,7 +110,7 @@ void template_tab_isdefault(Info & i)
void template_tab_file_name(Info & i)
{
if( temp_index < temp_tab.size() )
HtmlEscape(i.out, temp_tab[temp_index]);
i.out << temp_tab[temp_index];
}

7
templates/templates.cpp
View File

@ -22,7 +22,7 @@ namespace TemplatesFunctions
IndexPatterns index_patterns;
Patterns patterns;
Patterns patterns_fun;
Ezc::Functions<TextStream<std::wstring> > ezc_functions;
EzcFun ezc_functions;
PatternCacher pattern_cacher;
Locale locale;
LocaleFilter locale_filter;
@ -111,7 +111,7 @@ Ezc::Pattern * p = 0;
if( p )
{
Ezc::Generator<TextStream<std::wstring> > gen(i.out, *p, ezc_functions);
EzcGen gen(i.out, *p, ezc_functions);
gen.Generate();
}
else
@ -385,6 +385,7 @@ void Templates::CreateFunctions()
winix
*/
ezc_functions.Insert("winix_cur_time", winix_cur_time);
ezc_functions.Insert("winix_how_many_sessions", winix_how_many_sessions);
ezc_functions.Insert("winix_users_logged", winix_users_logged);
ezc_functions.Insert("winix_function", winix_function);
ezc_functions.Insert("winix_function_is", winix_function_is);
@ -606,7 +607,7 @@ using namespace TemplatesFunctions;
if( !index )
index = &patterns[locale.GetLang()][pat_index];
Ezc::Generator<TextStream<std::wstring> > generator(request->page, *index, ezc_functions);
EzcGen generator(request->page, *index, ezc_functions);
generator.Generate();
}

6
templates/templates.h
View File

@ -19,6 +19,7 @@
#include "indexpatterns.h"
#include "locale.h"
#include "db/db.h"
#include "htmltextstream.h"
#include "core/config.h"
#include "core/request.h"
#include "core/system.h"
@ -46,7 +47,7 @@ namespace TemplatesFunctions
extern Patterns patterns_fun;
extern PatternCacher pattern_cacher;
extern Locale locale;
extern Ezc::Functions<TextStream<std::wstring> > ezc_functions;
extern EzcFun ezc_functions;
extern CKEditorGetParser ckeditor_getparser;
extern Config * config;
@ -131,7 +132,7 @@ namespace TemplatesFunctions
void item_content_type_is(Item & item, Info & i);
void item_content_type_is(Info & i);
void item_content_is_empty(Info & i);
void item_print_content(TextStream<std::wstring> & out, const std::wstring & content, Item::ContentType content_type);
void item_print_content(HtmlTextStream & out, const std::wstring & content, Item::ContentType content_type);
void item_print_content(Info & i);
void item_privileges(Info & i);
void item_dir(Info & i);
@ -314,6 +315,7 @@ namespace TemplatesFunctions
winix
*/
void winix_cur_time(Info & i);
void winix_how_many_sessions(Info & i);
void winix_users_logged(Info & i);
void winix_function(Info & i);
void winix_function_is(Info & i);

18
templates/thread.cpp
View File

@ -48,11 +48,11 @@ void thread_tab_url(Info & i)
if( dir )
{
HtmlEscape(i.out, dir->url);
i.out << dir->url;
}
else
{
i.out << "<!-- unknown directory -->";
i.out << "<!-- unknown directory -->"; // !! do konfiga
}
}
}
@ -67,13 +67,13 @@ void thread_tab_subject(Info & i)
if( dir )
{
if( !dir->subject.empty() )
HtmlEscape(i.out, dir->subject);
i.out << dir->subject;
else
HtmlEscape(i.out, dir->url);
i.out << dir->url;
}
else
{
i.out << "<!-- unknown subject -->";
i.out << "<!-- unknown subject -->"; // !! do konfiga
}
}
}
@ -110,13 +110,13 @@ bool unknown = true;
unknown = false;
if( puser )
HtmlEscape(i.out, puser->name);
i.out << puser->name;
else
{
i.out << "~";
if( !dir->guest_name.empty() )
HtmlEscape(i.out, dir->guest_name);
i.out << dir->guest_name;
else
i.out << "guest"; // !! dodac do konfiga
}
@ -156,13 +156,13 @@ void thread_tab_last_item_user(Info & i)
User * puser = system->users.GetUser( functions->fun_thread.thread_tab[thread_tab_index].last_item.user_id );
if( puser )
HtmlEscape(i.out, puser->name);
i.out << puser->name;
else
{
i.out << "~";
if( !functions->fun_thread.thread_tab[thread_tab_index].last_item.guest_name.empty() )
HtmlEscape(i.out, functions->fun_thread.thread_tab[thread_tab_index].last_item.guest_name);
i.out << functions->fun_thread.thread_tab[thread_tab_index].last_item.guest_name;
else
i.out << "guest"; // !! dodac do konfiga
}

2
templates/user.cpp
View File

@ -30,7 +30,7 @@ void user_name(Info & i)
if( !request->session->puser )
return;
HtmlEscape(i.out, request->session->puser->name);
i.out << request->session->puser->name;
}

7
templates/winix.cpp
View File

@ -32,6 +32,11 @@ static char buffer[100];
}
void winix_how_many_sessions(Info & i)
{
i.out << session_manager->Size();
}
void winix_users_logged(Info & i)
{
@ -152,7 +157,7 @@ char buf[20];
void winix_err_is(Info & i)
{
int value = Atoi(i.par);
int value = Toi(i.par);
i.res = (request->status == value);
}

27
templatesnotify/Makefile.dep
View File

@ -7,19 +7,19 @@ notify.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h ../core/mount.h
notify.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
notify.o: ../core/textstream.h ../core/misc.h ../templates/misc.h
notify.o: ../templates/localefilter.h ../templates/locale.h
notify.o: ../core/confparser.h ../core/user.h ../core/notify.h
notify.o: ../templatesnotify/templatesnotify.h ../core/request.h
notify.o: ../core/requesttypes.h ../core/session.h ../core/error.h
notify.o: ../core/log.h ../core/textstream.h ../core/user.h
notify.o: ../core/confparser.h ../templates/htmltextstream.h ../core/user.h
notify.o: ../core/notify.h ../templatesnotify/templatesnotify.h
notify.o: ../core/request.h ../core/requesttypes.h ../core/session.h
notify.o: ../core/error.h ../core/log.h ../core/textstream.h ../core/user.h
notify.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
notify.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
notify.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
notify.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
notify.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
notify.o: ../core/ugcontainer.h ../core/mounts.h ../core/mount.h
notify.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
notify.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
notify.o: ../core/loadavg.h
notify.o: ../templates/htmltextstream.h ../core/system.h ../core/dirs.h
notify.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
notify.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h
notify.o: ../core/item.h ../db/dbitemcolumns.h ../core/group.h
notify.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
notify.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
notify.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
notify.o: ../core/groups.h ../core/group.h ../core/loadavg.h
templatesnotify.o: templatesnotify.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
templatesnotify.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
templatesnotify.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
@ -27,6 +27,7 @@ templatesnotify.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
templatesnotify.o: ../core/mount.h ../core/config.h ../core/confparser.h
templatesnotify.o: ../core/htmlfilter.h ../core/textstream.h ../core/misc.h
templatesnotify.o: ../templates/misc.h ../templates/localefilter.h
templatesnotify.o: ../templates/locale.h ../core/confparser.h ../core/user.h
templatesnotify.o: ../templates/locale.h ../core/confparser.h
templatesnotify.o: ../templates/htmltextstream.h ../core/user.h
templatesnotify.o: ../core/misc.h ../core/log.h ../core/textstream.h
templatesnotify.o: ../templates/locale.h

2
templatesnotify/notify.cpp
View File

@ -8,7 +8,7 @@
*/
#include "templatesnotify.h"
#include "../core/notify.h"
#include "core/notify.h"

2
templatesnotify/templatesnotify.h
View File

@ -39,7 +39,7 @@ namespace TemplatesNotifyFunctions
extern int mount_type_thread;
extern int mount_type_ticket;
using TemplatesFunctions::Info;
typedef Ezc::FunInfo<TextStream<std::wstring> > Info;
enum Pat {
pat_email_notify = 0, // first should be zero