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

html code in editors (emacs, ckeditor...) is filtered now for normal users

Browse Source 
(root is allowed to use any html code)


git-svn-id: svn://ttmath.org/publicrep/winix/trunk@641 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2010-08-14 17:56:07 +00:00
parent d9f2e91806
commit ca4e53bb0f
11 changed files with 116 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
core/Makefile.dep
View File

@@ -24,8 +24,9 @@ app.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h
app.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h app.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h
app.o: ../functions/template.h ../functions/tinymce.h ../functions/uname.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/upload.h ../functions/uptime.h ../functions/who.h
app.o: ../templates/templates.h ../templates/patterncacher.h ../core/item.h app.o: ../core/htmlfilter.h ../templates/templates.h
app.o: misc.h ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h app.o: ../templates/patterncacher.h ../core/item.h misc.h
app.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
app.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h app.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h
app.o: compress.h getparser.h httpsimpleparser.h postparser.h cookieparser.h app.o: compress.h getparser.h httpsimpleparser.h postparser.h cookieparser.h
app.o: postmultiparser.h acceptencodingparser.h acceptbaseparser.h plugin.h app.o: postmultiparser.h acceptencodingparser.h acceptbaseparser.h plugin.h
@@ -53,11 +54,12 @@ config.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h
config.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h config.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h
config.o: ../functions/template.h ../functions/tinymce.h ../functions/uname.h config.o: ../functions/template.h ../functions/tinymce.h ../functions/uname.h
config.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h config.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h
config.o: ../templates/templates.h ../templates/patterncacher.h config.o: ../core/htmlfilter.h ../templates/templates.h
config.o: ../core/item.h misc.h ../templates/ckeditorgetparser.h config.o: ../templates/patterncacher.h ../core/item.h misc.h
config.o: ../core/httpsimpleparser.h ../core/log.h config.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
config.o: ../templates/indexpatterns.h ../templates/localefilter.h config.o: ../core/log.h ../templates/indexpatterns.h
config.o: ../core/locale.h ../core/locale.h ../core/sessionmanager.h config.o: ../templates/localefilter.h ../core/locale.h ../core/locale.h
config.o: ../core/sessionmanager.h
confparser.o: confparser.h misc.h item.h confparser.o: confparser.h misc.h item.h
db.o: db.h item.h user.h group.h thread.h error.h log.h dircontainer.h db.o: db.h item.h user.h group.h thread.h error.h log.h dircontainer.h
db.o: ugcontainer.h ticket.h misc.h db.o: ugcontainer.h ticket.h misc.h
@@ -113,11 +115,12 @@ plugin.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h
plugin.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h plugin.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h
plugin.o: ../functions/template.h ../functions/tinymce.h ../functions/uname.h plugin.o: ../functions/template.h ../functions/tinymce.h ../functions/uname.h
plugin.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h plugin.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h
plugin.o: ../templates/templates.h ../templates/patterncacher.h plugin.o: ../core/htmlfilter.h ../templates/templates.h
plugin.o: ../core/item.h misc.h ../templates/ckeditorgetparser.h plugin.o: ../templates/patterncacher.h ../core/item.h misc.h
plugin.o: ../core/httpsimpleparser.h ../core/log.h plugin.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
plugin.o: ../templates/indexpatterns.h ../templates/localefilter.h plugin.o: ../core/log.h ../templates/indexpatterns.h
plugin.o: ../core/locale.h ../core/locale.h ../core/sessionmanager.h plugin.o: ../templates/localefilter.h ../core/locale.h ../core/locale.h
plugin.o: ../core/sessionmanager.h
plugindata.o: plugindata.h plugin.h pluginmsg.h log.h config.h confparser.h plugindata.o: plugindata.h plugin.h pluginmsg.h log.h config.h confparser.h
plugindata.o: htmlfilter.h request.h requesttypes.h session.h item.h error.h plugindata.o: htmlfilter.h request.h requesttypes.h session.h item.h error.h
plugindata.o: user.h rebus.h system.h dirs.h dircontainer.h db.h group.h plugindata.o: user.h rebus.h system.h dirs.h dircontainer.h db.h group.h
@@ -142,7 +145,7 @@ plugindata.o: ../functions/funthread.h ../core/thread.h
plugindata.o: ../functions/funticket.h ../core/ticket.h plugindata.o: ../functions/funticket.h ../core/ticket.h
plugindata.o: ../functions/template.h ../functions/tinymce.h plugindata.o: ../functions/template.h ../functions/tinymce.h
plugindata.o: ../functions/uname.h ../functions/upload.h plugindata.o: ../functions/uname.h ../functions/upload.h
plugindata.o: ../functions/uptime.h ../functions/who.h plugindata.o: ../functions/uptime.h ../functions/who.h ../core/htmlfilter.h
plugindata.o: ../templates/templates.h ../templates/patterncacher.h plugindata.o: ../templates/templates.h ../templates/patterncacher.h
plugindata.o: ../core/item.h misc.h ../templates/ckeditorgetparser.h plugindata.o: ../core/item.h misc.h ../templates/ckeditorgetparser.h
plugindata.o: ../core/httpsimpleparser.h ../core/log.h plugindata.o: ../core/httpsimpleparser.h ../core/log.h
@@ -173,7 +176,7 @@ request.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h
request.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h request.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h
request.o: ../functions/template.h ../functions/tinymce.h request.o: ../functions/template.h ../functions/tinymce.h
request.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h request.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
request.o: ../functions/who.h ../templates/templates.h request.o: ../functions/who.h ../core/htmlfilter.h ../templates/templates.h
request.o: ../templates/patterncacher.h ../core/item.h misc.h request.o: ../templates/patterncacher.h ../core/item.h misc.h
request.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h request.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
request.o: ../core/log.h ../templates/indexpatterns.h request.o: ../core/log.h ../templates/indexpatterns.h
@@ -208,11 +211,12 @@ sessionmanager.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h
sessionmanager.o: ../functions/template.h ../functions/tinymce.h sessionmanager.o: ../functions/template.h ../functions/tinymce.h
sessionmanager.o: ../functions/uname.h ../functions/upload.h sessionmanager.o: ../functions/uname.h ../functions/upload.h
sessionmanager.o: ../functions/uptime.h ../functions/who.h sessionmanager.o: ../functions/uptime.h ../functions/who.h
sessionmanager.o: ../templates/templates.h ../templates/patterncacher.h sessionmanager.o: ../core/htmlfilter.h ../templates/templates.h
sessionmanager.o: ../core/item.h misc.h ../templates/ckeditorgetparser.h sessionmanager.o: ../templates/patterncacher.h ../core/item.h misc.h
sessionmanager.o: ../core/httpsimpleparser.h ../core/log.h sessionmanager.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
sessionmanager.o: ../templates/indexpatterns.h ../templates/localefilter.h sessionmanager.o: ../core/log.h ../templates/indexpatterns.h
sessionmanager.o: ../core/locale.h ../core/locale.h ../core/sessionmanager.h sessionmanager.o: ../templates/localefilter.h ../core/locale.h
sessionmanager.o: ../core/locale.h ../core/sessionmanager.h
sessionparser.o: sessionparser.h session.h item.h error.h log.h user.h sessionparser.o: sessionparser.h session.h item.h error.h log.h user.h
sessionparser.o: plugindata.h rebus.h sessioncontainer.h lastcontainer.h sessionparser.o: plugindata.h rebus.h sessioncontainer.h lastcontainer.h
sessionparser.o: users.h ugcontainer.h request.h requesttypes.h config.h sessionparser.o: users.h ugcontainer.h request.h requesttypes.h config.h

3
core/config.cpp
View File

@@ -158,6 +158,9 @@ void Config::AssignValues(bool stdout_is_closed)
password_min_size = Size("password_min_size", 5); password_min_size = Size("password_min_size", 5);
debug_info = Bool("debug_info", false); debug_info = Bool("debug_info", false);
editors_html_safe_mode = Bool("editors_html_safe_mode", true);
editors_html_safe_mode_skip_root = Bool("editors_html_safe_mode_skip_root", true);
parser.ListText("plugins", plugin_file); parser.ListText("plugins", plugin_file);
} }

12
core/config.h
View File

@@ -137,7 +137,6 @@ public:
std::string html_filter_orphans_mode_str; std::string html_filter_orphans_mode_str;
HTMLFilter::OrphanMode html_filter_orphans_mode; HTMLFilter::OrphanMode html_filter_orphans_mode;
// the url of a new empty item (if there is not the subject too) // the url of a new empty item (if there is not the subject too)
std::string item_url_empty; std::string item_url_empty;
@@ -189,9 +188,18 @@ public:
size_t password_min_size; size_t password_min_size;
// prints additional information (in the end of the html page as a commentary) // prints additional information (in the end of the html page as a commentary)
//
bool debug_info; bool debug_info;
// in editors (emacs, ckeditor,...) the html will be filtered and unsafe tags
// will be dropped (script, frame, etc.)
// default: true;
bool editors_html_safe_mode;
// don't filter the html code for root
// default: true
// (if true the html code for root is not filtered)
bool editors_html_safe_mode_skip_root;
/* /*
*/ */

4
core/htmlfilter.cpp
View File

@@ -1139,6 +1139,10 @@ bool HTMLFilter::PrintRest()
{ {
const char * start = pchar; const char * start = pchar;
// in safe mode we do not print the rest html code
if( safe_mode )
return false;
while( *pchar ) while( *pchar )
++pchar; ++pchar;

35
functions/Makefile.dep
View File

@@ -71,6 +71,7 @@ ckeditor.o: default.h download.h editticket.h emacs.h last.h login.h logout.h
ckeditor.o: ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h subject.h ckeditor.o: ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h subject.h
ckeditor.o: funthread.h ../core/thread.h funticket.h ../core/ticket.h ckeditor.o: funthread.h ../core/thread.h funticket.h ../core/ticket.h
ckeditor.o: template.h tinymce.h uname.h upload.h uptime.h who.h ckeditor.o: template.h tinymce.h uname.h upload.h uptime.h who.h
ckeditor.o: ../core/htmlfilter.h
cp.o: cp.h functionbase.h ../core/item.h ../core/db.h ../core/item.h cp.o: cp.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
cp.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h cp.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
cp.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h cp.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -88,7 +89,7 @@ cp.o: cat.h chmod.h privchanger.h chown.h ckeditor.h createthread.h
cp.o: createticket.h default.h download.h editticket.h emacs.h last.h login.h cp.o: createticket.h default.h download.h editticket.h emacs.h last.h login.h
cp.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h subject.h cp.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h subject.h
cp.o: funthread.h ../core/thread.h funticket.h ../core/ticket.h template.h cp.o: funthread.h ../core/thread.h funticket.h ../core/ticket.h template.h
cp.o: tinymce.h uname.h upload.h uptime.h who.h cp.o: tinymce.h uname.h upload.h uptime.h who.h ../core/htmlfilter.h
createthread.o: createthread.h functionbase.h ../core/item.h ../core/db.h createthread.o: createthread.h functionbase.h ../core/item.h ../core/db.h
createthread.o: ../core/item.h ../core/user.h ../core/group.h createthread.o: ../core/item.h ../core/user.h ../core/group.h
createthread.o: ../core/thread.h ../core/error.h ../core/log.h createthread.o: ../core/thread.h ../core/error.h ../core/log.h
@@ -109,7 +110,7 @@ createthread.o: default.h download.h editticket.h emacs.h last.h login.h
createthread.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h createthread.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h
createthread.o: subject.h funthread.h ../core/thread.h funticket.h createthread.o: subject.h funthread.h ../core/thread.h funticket.h
createthread.o: ../core/ticket.h template.h tinymce.h uname.h upload.h createthread.o: ../core/ticket.h template.h tinymce.h uname.h upload.h
createthread.o: uptime.h who.h createthread.o: uptime.h who.h ../core/htmlfilter.h
createticket.o: createticket.h functionbase.h ../core/item.h ../core/db.h createticket.o: createticket.h functionbase.h ../core/item.h ../core/db.h
createticket.o: ../core/item.h ../core/user.h ../core/group.h createticket.o: ../core/item.h ../core/user.h ../core/group.h
createticket.o: ../core/thread.h ../core/error.h ../core/log.h createticket.o: ../core/thread.h ../core/error.h ../core/log.h
@@ -130,7 +131,7 @@ createticket.o: createthread.h default.h download.h editticket.h emacs.h
createticket.o: last.h login.h logout.h ls.h mkdir.h mv.h node.h priv.h createticket.o: last.h login.h logout.h ls.h mkdir.h mv.h node.h priv.h
createticket.o: reload.h rm.h run.h subject.h funthread.h ../core/thread.h createticket.o: reload.h rm.h run.h subject.h funthread.h ../core/thread.h
createticket.o: funticket.h template.h tinymce.h uname.h upload.h uptime.h createticket.o: funticket.h template.h tinymce.h uname.h upload.h uptime.h
createticket.o: who.h createticket.o: who.h ../core/htmlfilter.h
default.o: default.h functionbase.h ../core/item.h ../core/db.h default.o: default.h functionbase.h ../core/item.h ../core/db.h
default.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h default.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
default.o: ../core/error.h ../core/log.h ../core/dircontainer.h default.o: ../core/error.h ../core/log.h ../core/dircontainer.h
@@ -176,7 +177,7 @@ editticket.o: createticket.h default.h download.h emacs.h last.h login.h
editticket.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h editticket.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h
editticket.o: subject.h funthread.h ../core/thread.h funticket.h editticket.o: subject.h funthread.h ../core/thread.h funticket.h
editticket.o: ../core/ticket.h template.h tinymce.h uname.h upload.h uptime.h editticket.o: ../core/ticket.h template.h tinymce.h uname.h upload.h uptime.h
editticket.o: who.h readticket.h editticket.o: who.h ../core/htmlfilter.h readticket.h
emacs.o: emacs.h functionbase.h ../core/item.h ../core/db.h ../core/item.h emacs.o: emacs.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
emacs.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h emacs.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
emacs.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h emacs.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -199,6 +200,7 @@ emacs.o: createticket.h default.h download.h editticket.h last.h login.h
emacs.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h emacs.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h
emacs.o: subject.h funthread.h ../core/thread.h funticket.h ../core/ticket.h emacs.o: subject.h funthread.h ../core/thread.h funticket.h ../core/ticket.h
emacs.o: template.h tinymce.h uname.h upload.h uptime.h who.h emacs.o: template.h tinymce.h uname.h upload.h uptime.h who.h
emacs.o: ../core/htmlfilter.h
functionbase.o: functionbase.h ../core/item.h ../core/db.h ../core/item.h functionbase.o: functionbase.h ../core/item.h ../core/db.h ../core/item.h
functionbase.o: ../core/user.h ../core/group.h ../core/thread.h functionbase.o: ../core/user.h ../core/group.h ../core/thread.h
functionbase.o: ../core/error.h ../core/log.h ../core/dircontainer.h functionbase.o: ../core/error.h ../core/log.h ../core/dircontainer.h
@@ -219,7 +221,7 @@ functionbase.o: default.h download.h editticket.h emacs.h last.h login.h
functionbase.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h functionbase.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h run.h
functionbase.o: subject.h funthread.h ../core/thread.h funticket.h functionbase.o: subject.h funthread.h ../core/thread.h funticket.h
functionbase.o: ../core/ticket.h template.h tinymce.h uname.h upload.h functionbase.o: ../core/ticket.h template.h tinymce.h uname.h upload.h
functionbase.o: uptime.h who.h functionbase.o: uptime.h who.h ../core/htmlfilter.h
functionparser.o: functionparser.h ../core/request.h ../core/requesttypes.h functionparser.o: functionparser.h ../core/request.h ../core/requesttypes.h
functionparser.o: ../core/session.h ../core/item.h ../core/error.h functionparser.o: ../core/session.h ../core/item.h ../core/error.h
functionparser.o: ../core/log.h ../core/user.h ../core/plugindata.h functionparser.o: ../core/log.h ../core/user.h ../core/plugindata.h
@@ -241,7 +243,7 @@ functionparser.o: default.h download.h editticket.h emacs.h last.h login.h
functionparser.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h functionparser.o: logout.h ls.h mkdir.h mv.h node.h priv.h reload.h rm.h
functionparser.o: run.h subject.h funthread.h ../core/thread.h funticket.h functionparser.o: run.h subject.h funthread.h ../core/thread.h funticket.h
functionparser.o: ../core/ticket.h template.h tinymce.h uname.h upload.h functionparser.o: ../core/ticket.h template.h tinymce.h uname.h upload.h
functionparser.o: uptime.h who.h functionparser.o: uptime.h who.h ../core/htmlfilter.h
functions.o: functions.h functionbase.h ../core/item.h ../core/db.h functions.o: functions.h functionbase.h ../core/item.h ../core/db.h
functions.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h functions.o: ../core/item.h ../core/user.h ../core/group.h ../core/thread.h
functions.o: ../core/error.h ../core/log.h ../core/dircontainer.h functions.o: ../core/error.h ../core/log.h ../core/dircontainer.h
@@ -261,8 +263,9 @@ functions.o: download.h editticket.h emacs.h last.h login.h logout.h ls.h
functions.o: mkdir.h mv.h node.h priv.h reload.h rm.h run.h subject.h functions.o: mkdir.h mv.h node.h priv.h reload.h rm.h run.h subject.h
functions.o: funthread.h ../core/thread.h funticket.h ../core/ticket.h functions.o: funthread.h ../core/thread.h funticket.h ../core/ticket.h
functions.o: template.h tinymce.h uname.h upload.h uptime.h who.h functions.o: template.h tinymce.h uname.h upload.h uptime.h who.h
functions.o: ../core/log.h ../core/misc.h ../templates/templates.h functions.o: ../core/htmlfilter.h ../core/log.h ../core/misc.h
functions.o: ../templates/patterncacher.h ../core/item.h ../templates/misc.h functions.o: ../templates/templates.h ../templates/patterncacher.h
functions.o: ../core/item.h ../templates/misc.h
functions.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h functions.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
functions.o: ../core/log.h ../templates/indexpatterns.h functions.o: ../core/log.h ../templates/indexpatterns.h
functions.o: ../core/sessionmanager.h ../core/sessioncontainer.h functions.o: ../core/sessionmanager.h ../core/sessioncontainer.h
@@ -364,6 +367,7 @@ mkdir.o: createticket.h default.h download.h editticket.h emacs.h last.h
mkdir.o: login.h logout.h ls.h mv.h node.h priv.h reload.h rm.h run.h mkdir.o: login.h logout.h ls.h mv.h node.h priv.h reload.h rm.h run.h
mkdir.o: subject.h funthread.h ../core/thread.h funticket.h ../core/ticket.h mkdir.o: subject.h funthread.h ../core/thread.h funticket.h ../core/ticket.h
mkdir.o: template.h tinymce.h uname.h upload.h uptime.h who.h mkdir.o: template.h tinymce.h uname.h upload.h uptime.h who.h
mkdir.o: ../core/htmlfilter.h
mv.o: mv.h functionbase.h ../core/item.h ../core/db.h ../core/item.h mv.o: mv.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
mv.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h mv.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
mv.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h mv.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -381,7 +385,7 @@ mv.o: privchanger.h chown.h ckeditor.h cp.h createthread.h createticket.h
mv.o: default.h download.h editticket.h emacs.h last.h login.h logout.h ls.h mv.o: default.h download.h editticket.h emacs.h last.h login.h logout.h ls.h
mv.o: mkdir.h node.h priv.h reload.h rm.h run.h subject.h funthread.h mv.o: mkdir.h node.h priv.h reload.h rm.h run.h subject.h funthread.h
mv.o: ../core/thread.h funticket.h ../core/ticket.h template.h tinymce.h mv.o: ../core/thread.h funticket.h ../core/ticket.h template.h tinymce.h
mv.o: uname.h upload.h uptime.h who.h mv.o: uname.h upload.h uptime.h who.h ../core/htmlfilter.h
node.o: node.h functionbase.h ../core/item.h ../core/db.h ../core/item.h node.o: node.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
node.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h node.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
node.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h node.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -463,10 +467,11 @@ rm.o: privchanger.h chown.h ckeditor.h cp.h createthread.h createticket.h
rm.o: default.h download.h editticket.h emacs.h last.h login.h logout.h ls.h rm.o: default.h download.h editticket.h emacs.h last.h login.h logout.h ls.h
rm.o: mkdir.h mv.h node.h priv.h reload.h run.h subject.h funthread.h rm.o: mkdir.h mv.h node.h priv.h reload.h run.h subject.h funthread.h
rm.o: ../core/thread.h funticket.h ../core/ticket.h template.h tinymce.h rm.o: ../core/thread.h funticket.h ../core/ticket.h template.h tinymce.h
rm.o: uname.h upload.h uptime.h who.h ../templates/templates.h rm.o: uname.h upload.h uptime.h who.h ../core/htmlfilter.h
rm.o: ../templates/patterncacher.h ../core/item.h ../templates/misc.h rm.o: ../templates/templates.h ../templates/patterncacher.h ../core/item.h
rm.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h rm.o: ../templates/misc.h ../templates/ckeditorgetparser.h
rm.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h rm.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h
rm.o: ../core/sessionmanager.h
run.o: run.h functionbase.h ../core/item.h ../core/db.h ../core/item.h run.o: run.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
run.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h run.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
run.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h run.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -525,7 +530,7 @@ tinymce.o: chown.h ckeditor.h cp.h createthread.h createticket.h default.h
tinymce.o: download.h editticket.h emacs.h last.h login.h logout.h ls.h tinymce.o: download.h editticket.h emacs.h last.h login.h logout.h ls.h
tinymce.o: mkdir.h mv.h node.h priv.h reload.h rm.h run.h subject.h tinymce.o: mkdir.h mv.h node.h priv.h reload.h rm.h run.h subject.h
tinymce.o: funthread.h ../core/thread.h funticket.h ../core/ticket.h tinymce.o: funthread.h ../core/thread.h funticket.h ../core/ticket.h
tinymce.o: template.h uname.h upload.h uptime.h who.h tinymce.o: template.h uname.h upload.h uptime.h who.h ../core/htmlfilter.h
uname.o: uname.h functionbase.h ../core/item.h ../core/db.h ../core/item.h uname.o: uname.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
uname.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h uname.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
uname.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h uname.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h
@@ -557,7 +562,7 @@ upload.o: ckeditor.h cp.h createthread.h createticket.h default.h download.h
upload.o: editticket.h emacs.h last.h login.h logout.h ls.h mkdir.h mv.h upload.o: editticket.h emacs.h last.h login.h logout.h ls.h mkdir.h mv.h
upload.o: node.h priv.h reload.h rm.h run.h subject.h funthread.h upload.o: node.h priv.h reload.h rm.h run.h subject.h funthread.h
upload.o: ../core/thread.h funticket.h ../core/ticket.h template.h tinymce.h upload.o: ../core/thread.h funticket.h ../core/ticket.h template.h tinymce.h
upload.o: uname.h uptime.h who.h upload.o: uname.h uptime.h who.h ../core/htmlfilter.h
uptime.o: uptime.h functionbase.h ../core/item.h ../core/db.h ../core/item.h uptime.o: uptime.h functionbase.h ../core/item.h ../core/db.h ../core/item.h
uptime.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h uptime.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
uptime.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h uptime.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h

1
functions/functionbase.h
View File

@@ -63,7 +63,6 @@ protected:
Templates * templates; Templates * templates;
Notify * notify; Notify * notify;
// std::vector<Ezc::Pattern> pattern_tab;
}; };

31
functions/functions.cpp
View File

@@ -409,12 +409,41 @@ return with_url;
} }
void Functions::ReadItemFilterHtml(Item & item)
{
html_filter.BreakLines(0);
html_filter.TrimWhite(false);
html_filter.InsertTabs(0);
html_filter.CheckOrphans(HTMLFilter::lang_none);
html_filter.SafeMode(true);
html_filter.Filter(request->PostVar("itemcontent"), item.content);
}
void Functions::ReadItemContent(Item & item, const std::string & content_type)
{
bool is_root = request->session->puser && request->session->puser->super_user;
bool filter_html = (content_type == "2") && config->editors_html_safe_mode;
if( filter_html && is_root && config->editors_html_safe_mode_skip_root )
filter_html = false;
if( filter_html )
ReadItemFilterHtml(item);
else
request->PostVar("itemcontent", item.content);
}
void Functions::ReadItemContentWithType(Item & item) void Functions::ReadItemContentWithType(Item & item)
{ {
item.content_type = Item::ct_formatted_text; // default is formatted text item.content_type = Item::ct_formatted_text; // default is formatted text
request->PostVar("itemcontent", request->item.content);
request->PostVar("contenttype", temp); request->PostVar("contenttype", temp);
ReadItemContent(item, temp);
// ct_text and ct_formatted_text can use everyone // ct_text and ct_formatted_text can use everyone
if( temp == "0" ) if( temp == "0" )

4
functions/functions.h
View File

@@ -45,6 +45,7 @@
#include "upload.h" #include "upload.h"
#include "uptime.h" #include "uptime.h"
#include "who.h" #include "who.h"
#include "core/htmlfilter.h"
class Templates; class Templates;
@@ -116,6 +117,8 @@ public:
void CheckGetPostTimes(time_t difference = 10); void CheckGetPostTimes(time_t difference = 10);
// !! dac lepsze nazwy // !! dac lepsze nazwy
void ReadItemFilterHtml(Item & item);
void ReadItemContent(Item & item, const std::string & content_type);
void ReadItemContentWithType(Item & item); void ReadItemContentWithType(Item & item);
bool ReadItem(Item & item, Item::Type item_type); bool ReadItem(Item & item, Item::Type item_type);
@@ -131,6 +134,7 @@ private:
Notify * notify; Notify * notify;
std::string temp; std::string temp;
HTMLFilter html_filter;
void Add(FunctionBase * fun); void Add(FunctionBase * fun);
void Add(FunctionBase & fun); void Add(FunctionBase & fun);

12
main/Makefile.dep
View File

@@ -27,11 +27,11 @@ main.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h
main.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h main.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h
main.o: ../functions/template.h ../functions/tinymce.h ../functions/uname.h main.o: ../functions/template.h ../functions/tinymce.h ../functions/uname.h
main.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h main.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h
main.o: ../templates/templates.h ../templates/patterncacher.h ../core/item.h main.o: ../core/htmlfilter.h ../templates/templates.h
main.o: ../templates/misc.h ../templates/ckeditorgetparser.h main.o: ../templates/patterncacher.h ../core/item.h ../templates/misc.h
main.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h main.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
main.o: ../core/sessionmanager.h ../core/compress.h ../core/getparser.h main.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h
main.o: ../core/httpsimpleparser.h ../core/postparser.h main.o: ../core/compress.h ../core/getparser.h ../core/httpsimpleparser.h
main.o: ../core/cookieparser.h ../core/postmultiparser.h main.o: ../core/postparser.h ../core/cookieparser.h ../core/postmultiparser.h
main.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h main.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
main.o: ../core/plugin.h ../core/pluginmsg.h main.o: ../core/plugin.h ../core/pluginmsg.h

17
plugins/stats/Makefile.dep
View File

@@ -35,11 +35,12 @@ init.o: ../../functions/funticket.h ../../core/ticket.h
init.o: ../../functions/template.h ../../functions/tinymce.h init.o: ../../functions/template.h ../../functions/tinymce.h
init.o: ../../functions/uname.h ../../functions/upload.h init.o: ../../functions/uname.h ../../functions/upload.h
init.o: ../../functions/uptime.h ../../functions/who.h init.o: ../../functions/uptime.h ../../functions/who.h
init.o: ../../templates/templates.h ../../templates/patterncacher.h init.o: ../../core/htmlfilter.h ../../templates/templates.h
init.o: ../../core/item.h ../../templates/misc.h init.o: ../../templates/patterncacher.h ../../core/item.h
init.o: ../../templates/ckeditorgetparser.h ../../core/httpsimpleparser.h init.o: ../../templates/misc.h ../../templates/ckeditorgetparser.h
init.o: ../../core/log.h ../../templates/indexpatterns.h init.o: ../../core/httpsimpleparser.h ../../core/log.h
init.o: ../../core/sessionmanager.h statssession.h ../../core/plugindata.h init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h
init.o: statssession.h ../../core/plugindata.h
stats.o: stats.h ../../core/config.h ../../core/log.h stats.o: stats.h ../../core/config.h ../../core/log.h
templates.o: templates.h ../../core/plugin.h ../../core/pluginmsg.h templates.o: templates.h ../../core/plugin.h ../../core/pluginmsg.h
templates.o: ../../core/log.h ../../core/plugindata.h ../../core/config.h templates.o: ../../core/log.h ../../core/plugindata.h ../../core/config.h
@@ -77,9 +78,9 @@ templates.o: ../../functions/funticket.h ../../core/ticket.h
templates.o: ../../functions/template.h ../../functions/tinymce.h templates.o: ../../functions/template.h ../../functions/tinymce.h
templates.o: ../../functions/uname.h ../../functions/upload.h templates.o: ../../functions/uname.h ../../functions/upload.h
templates.o: ../../functions/uptime.h ../../functions/who.h templates.o: ../../functions/uptime.h ../../functions/who.h
templates.o: ../../templates/templates.h ../../templates/patterncacher.h templates.o: ../../core/htmlfilter.h ../../templates/templates.h
templates.o: ../../core/item.h ../../templates/misc.h templates.o: ../../templates/patterncacher.h ../../core/item.h
templates.o: ../../templates/ckeditorgetparser.h templates.o: ../../templates/misc.h ../../templates/ckeditorgetparser.h
templates.o: ../../core/httpsimpleparser.h ../../core/log.h templates.o: ../../core/httpsimpleparser.h ../../core/log.h
templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h
templates.o: ../../core/misc.h stats.h templates.o: ../../core/misc.h stats.h

9
templates/Makefile.dep
View File

@@ -42,7 +42,7 @@ dir.o: ../functions/rm.h ../functions/run.h ../functions/subject.h
dir.o: ../functions/funthread.h ../core/thread.h ../functions/funticket.h dir.o: ../functions/funthread.h ../core/thread.h ../functions/funticket.h
dir.o: ../core/ticket.h ../functions/template.h ../functions/tinymce.h dir.o: ../core/ticket.h ../functions/template.h ../functions/tinymce.h
dir.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h dir.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
dir.o: ../functions/who.h dir.o: ../functions/who.h ../core/htmlfilter.h
doc.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h doc.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h
doc.o: localefilter.h ../core/locale.h ../core/confparser.h doc.o: localefilter.h ../core/locale.h ../core/confparser.h
doc.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h doc.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -159,7 +159,7 @@ priv.o: ../functions/reload.h ../functions/rm.h ../functions/run.h
priv.o: ../functions/subject.h ../functions/funthread.h ../core/thread.h priv.o: ../functions/subject.h ../functions/funthread.h ../core/thread.h
priv.o: ../functions/funticket.h ../core/ticket.h ../functions/template.h priv.o: ../functions/funticket.h ../core/ticket.h ../functions/template.h
priv.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h priv.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
priv.o: ../functions/uptime.h ../functions/who.h priv.o: ../functions/uptime.h ../functions/who.h ../core/htmlfilter.h
rebus.o: ../core/request.h templates.h ../../ezc/src/ezc.h patterncacher.h rebus.o: ../core/request.h templates.h ../../ezc/src/ezc.h patterncacher.h
rebus.o: ../core/item.h misc.h localefilter.h ../core/locale.h rebus.o: ../core/item.h misc.h localefilter.h ../core/locale.h
rebus.o: ../core/confparser.h ckeditorgetparser.h ../core/httpsimpleparser.h rebus.o: ../core/confparser.h ckeditorgetparser.h ../core/httpsimpleparser.h
@@ -233,7 +233,7 @@ templates.o: ../functions/funthread.h ../core/thread.h
templates.o: ../functions/funticket.h ../core/ticket.h templates.o: ../functions/funticket.h ../core/ticket.h
templates.o: ../functions/template.h ../functions/tinymce.h templates.o: ../functions/template.h ../functions/tinymce.h
templates.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h templates.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h
templates.o: ../functions/who.h ../templates/templates.h templates.o: ../functions/who.h ../core/htmlfilter.h ../templates/templates.h
thread.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h thread.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h
thread.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h thread.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h
thread.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h thread.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -264,6 +264,7 @@ thread.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h
thread.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h thread.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h
thread.o: ../functions/template.h ../functions/tinymce.h ../functions/uname.h thread.o: ../functions/template.h ../functions/tinymce.h ../functions/uname.h
thread.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h thread.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h
thread.o: ../core/htmlfilter.h
ticket.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h ticket.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h
ticket.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h ticket.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h
ticket.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h ticket.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -294,6 +295,7 @@ ticket.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h
ticket.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h ticket.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h
ticket.o: ../functions/template.h ../functions/tinymce.h ../functions/uname.h ticket.o: ../functions/template.h ../functions/tinymce.h ../functions/uname.h
ticket.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h ticket.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h
ticket.o: ../core/htmlfilter.h
upload.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h upload.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h
upload.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h upload.o: misc.h localefilter.h ../core/locale.h ../core/confparser.h
upload.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h upload.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
@@ -378,3 +380,4 @@ winix.o: ../functions/run.h ../functions/subject.h ../functions/funthread.h
winix.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h winix.o: ../core/thread.h ../functions/funticket.h ../core/ticket.h
winix.o: ../functions/template.h ../functions/tinymce.h ../functions/uname.h winix.o: ../functions/template.h ../functions/tinymce.h ../functions/uname.h
winix.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h winix.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h
winix.o: ../core/htmlfilter.h