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

added: uptime winix function prints how many sessions there are

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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

25
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 << *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);
}