From 4d87359acaf4729e8a10a9d2098e7caf41c744dc Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Thu, 28 Jul 2011 22:18:10 +0000 Subject: [PATCH] added: Export plugin (not finished yet) added: ThreadManager all threads are connected to the ThreadManager they are started/stopped by the manager changed: FunctionParser now we are parsing directly what is in URI (we were using GetParser beforehand) we are able to recognize ordinary URI scheme (with '?' and '#' characters) sample: http://domain.com/dir1/dir2/item/function?par1=val2&par2=val2#htmlanchor is the same as: http://domain.com/dir1/dir2/item/function/par1:val2/par2:val2#htmlanchor 'htmlanchor' is put in Request::anchor field, and the default function can be used like this: http://domain.com/dir1/dir2/item?par1=val2&par2=val2#htmlanchor but there is not an equivalent in winix form e.g. http://domain.com/dir1/dir2/item/par1:val2/par2:val2#htmlanchor because 'par1:val2' would be treated as a function name removed: GetParser now we don't have Request::get_tab structure removed: CKEditorGetParser it is not needed now git-svn-id: svn://ttmath.org/publicrep/winix/trunk@752 e52654a7-88a9-db11-a3e9-0013d4bc506e --- Makefile | 3 + core/Makefile.dep | 191 +++++---- core/Makefile.o.dep | 2 +- core/app.cpp | 40 +- core/app.h | 5 +- core/basethread.cpp | 11 +- core/basethread.h | 7 +- core/error.h | 3 +- core/getparser.h | 87 ---- core/item.h | 3 +- core/misc.cpp | 12 +- core/pluginmsg.h | 14 +- core/request.cpp | 12 +- core/request.h | 9 +- core/requesttypes.h | 1 - core/system.cpp | 11 + core/system.h | 6 +- core/threadmanager.cpp | 104 +++++ core/threadmanager.h | 55 +++ functions/Makefile.dep | 137 +++--- functions/functionparser.cpp | 483 ++++++++++++++------- functions/functionparser.h | 55 ++- functions/functions.cpp | 1 + html/fun_ckeditor.html | 4 +- main/Makefile.dep | 9 +- main/main.cpp | 7 +- notify/Makefile.dep | 18 +- notify/notify.cpp | 29 +- notify/notify.h | 9 +- plugins/export/Makefile | 27 ++ plugins/export/Makefile.dep | 56 +++ plugins/export/Makefile.o.dep | 1 + plugins/export/exportthread.cpp | 43 ++ plugins/export/exportthread.h | 43 ++ plugins/export/init.cpp | 81 ++++ plugins/export/message.h | 37 ++ plugins/gallery/Makefile.dep | 35 +- plugins/groupitem/Makefile.dep | 62 ++- plugins/menu/Makefile.dep | 62 ++- plugins/stats/Makefile.dep | 24 +- plugins/thread/Makefile.dep | 49 ++- plugins/ticket/Makefile.dep | 144 +++---- templates/Makefile.dep | 740 +++++++++++++++----------------- templates/ckeditorgetparser.h | 68 --- templates/insert.cpp | 2 +- templates/ls.cpp | 6 +- templates/misc.cpp | 24 +- templates/misc.h | 4 +- templates/templates.cpp | 5 +- templates/templates.h | 2 - templates/upload.cpp | 6 +- 51 files changed, 1646 insertions(+), 1203 deletions(-) delete mode 100755 core/getparser.h create mode 100755 core/threadmanager.cpp create mode 100755 core/threadmanager.h create mode 100755 plugins/export/Makefile create mode 100755 plugins/export/Makefile.dep create mode 100755 plugins/export/Makefile.o.dep create mode 100755 plugins/export/exportthread.cpp create mode 100755 plugins/export/exportthread.h create mode 100755 plugins/export/init.cpp create mode 100755 plugins/export/message.h delete mode 100755 templates/ckeditorgetparser.h diff --git a/Makefile b/Makefile index c2d3cfe..855c85f 100755 --- a/Makefile +++ b/Makefile @@ -41,6 +41,7 @@ plugins: FORCE @cd plugins/gallery ; $(MAKE) -e @cd plugins/groupitem ; $(MAKE) -e @cd plugins/menu ; $(MAKE) -e + @cd plugins/export ; $(MAKE) -e FORCE: @@ -58,6 +59,7 @@ clean: @cd plugins/gallery ; $(MAKE) -e clean @cd plugins/groupitem ; $(MAKE) -e clean @cd plugins/menu ; $(MAKE) -e clean + @cd plugins/export ; $(MAKE) -e clean @cd ../ezc/src ; $(MAKE) -e clean @cd main ; $(MAKE) -e clean rm -f winix.so @@ -79,6 +81,7 @@ depend: @cd plugins/gallery ; $(MAKE) -e depend @cd plugins/groupitem ; $(MAKE) -e depend @cd plugins/menu ; $(MAKE) -e depend + @cd plugins/export ; $(MAKE) -e depend @cd ../ezc/src ; $(MAKE) -e depend @cd main ; $(MAKE) -e depend diff --git a/core/Makefile.dep b/core/Makefile.dep index 670a603..be3f350 100755 --- a/core/Makefile.dep +++ b/core/Makefile.dep @@ -19,11 +19,11 @@ app.o: ../notify/notifythread.h ../core/basethread.h synchro.h app.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h app.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h app.o: users.h groups.h group.h loadavg.h thumb.h basethread.h -app.o: sessionmanager.h sessioncontainer.h ../functions/functions.h -app.o: ../functions/functionbase.h ../core/request.h ../core/system.h -app.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h -app.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h -app.o: ../functions/privchanger.h ../functions/chown.h +app.o: threadmanager.h sessionmanager.h sessioncontainer.h +app.o: ../functions/functions.h ../functions/functionbase.h ../core/request.h +app.o: ../core/system.h ../core/synchro.h ../functions/functionparser.h +app.o: ../core/cur.h ../functions/adduser.h ../functions/cat.h +app.o: ../functions/chmod.h ../functions/privchanger.h ../functions/chown.h app.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h app.o: ../functions/download.h ../functions/emacs.h ../functions/last.h app.o: ../functions/login.h ../functions/logout.h ../functions/ln.h @@ -35,16 +35,10 @@ app.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h app.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h app.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h app.o: ../templates/templates.h ../templates/patterncacher.h -app.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.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: postmultiparser.h acceptencodingparser.h acceptbaseparser.h plugin.h -app.o: pluginmsg.h -basethread.o: basethread.h log.h textstream.h logmanipulators.h slog.h cur.h -basethread.o: request.h requesttypes.h item.h error.h config.h confparser.h -basethread.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h -basethread.o: misc.h session.h user.h plugindata.h rebus.h mount.h -basethread.o: ../templates/locale.h ../core/confparser.h +app.o: ../templates/indexpatterns.h ../core/sessionmanager.h compress.h +app.o: postparser.h httpsimpleparser.h cookieparser.h postmultiparser.h +app.o: acceptencodingparser.h acceptbaseparser.h plugin.h pluginmsg.h +basethread.o: basethread.h bbcodeparser.o: bbcodeparser.h htmlfilter.h compress.o: compress.h log.h textstream.h logmanipulators.h slog.h cur.h compress.o: request.h requesttypes.h item.h error.h config.h confparser.h @@ -69,25 +63,25 @@ config.o: ../templates/htmltextstream.h ../notify/notifythread.h config.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h config.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h config.o: mounts.h mountparser.h crypt.h run.h users.h groups.h group.h -config.o: loadavg.h thumb.h basethread.h sessionmanager.h sessioncontainer.h -config.o: ../functions/functions.h ../functions/functionbase.h -config.o: ../core/request.h ../core/system.h ../core/synchro.h -config.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h -config.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h -config.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h -config.o: ../functions/default.h ../functions/download.h ../functions/emacs.h -config.o: ../functions/last.h ../functions/login.h ../functions/logout.h -config.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h -config.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h -config.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h -config.o: ../functions/rm.h ../functions/specialdefault.h ../functions/stat.h +config.o: loadavg.h thumb.h basethread.h threadmanager.h sessionmanager.h +config.o: sessioncontainer.h ../functions/functions.h +config.o: ../functions/functionbase.h ../core/request.h ../core/system.h +config.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h +config.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h +config.o: ../functions/privchanger.h ../functions/chown.h +config.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h +config.o: ../functions/download.h ../functions/emacs.h ../functions/last.h +config.o: ../functions/login.h ../functions/logout.h ../functions/ln.h +config.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h +config.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h +config.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h +config.o: ../functions/specialdefault.h ../functions/stat.h config.o: ../functions/subject.h ../functions/template.h config.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h config.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h config.o: ../core/htmlfilter.h ../templates/templates.h -config.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h -config.o: ../core/httpsimpleparser.h ../core/log.h -config.o: ../templates/indexpatterns.h ../core/sessionmanager.h +config.o: ../templates/patterncacher.h ../templates/indexpatterns.h +config.o: ../core/sessionmanager.h confparser.o: confparser.h misc.h item.h requesttypes.h ../../ezc/src/utf8.h crypt.o: crypt.h run.h config.h confparser.h htmlfilter.h user.h crypt.o: ../../ezc/src/utf8.h misc.h item.h requesttypes.h log.h textstream.h @@ -153,14 +147,13 @@ misc.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h misc.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h misc.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h misc.o: ../templates/patterncacher.h ../core/item.h -misc.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h -misc.o: ../core/log.h ../templates/indexpatterns.h -misc.o: ../templates/localefilter.h ../templates/locale.h ../core/config.h -misc.o: ../templates/htmltextstream.h ../core/cur.h ../core/system.h -misc.o: ../core/sessionmanager.h ../core/htmlfilter.h ../db/db.h -misc.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h -misc.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h -misc.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +misc.o: ../templates/indexpatterns.h ../templates/localefilter.h +misc.o: ../templates/locale.h ../core/config.h ../templates/htmltextstream.h +misc.o: ../core/cur.h ../core/system.h ../core/sessionmanager.h +misc.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +misc.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h +misc.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h +misc.o: ../core/dircontainer.h ../core/ugcontainer.h mount.o: mount.h misc.h item.h requesttypes.h mountparser.o: mountparser.h mount.h item.h dirs.h dircontainer.h ../db/db.h mountparser.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h @@ -198,8 +191,8 @@ mounts.o: ../templates/htmltextstream.h ../notify/notifythread.h mounts.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h mounts.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h mounts.o: mountparser.h plugin.h pluginmsg.h system.h crypt.h run.h users.h -mounts.o: groups.h group.h loadavg.h thumb.h basethread.h sessionmanager.h -mounts.o: sessioncontainer.h ../functions/functions.h +mounts.o: groups.h group.h loadavg.h thumb.h basethread.h threadmanager.h +mounts.o: sessionmanager.h sessioncontainer.h ../functions/functions.h mounts.o: ../functions/functionbase.h ../core/request.h ../core/system.h mounts.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h mounts.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h @@ -215,9 +208,8 @@ mounts.o: ../functions/subject.h ../functions/template.h mounts.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h mounts.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h mounts.o: ../core/htmlfilter.h ../templates/templates.h -mounts.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h -mounts.o: ../core/httpsimpleparser.h ../core/log.h -mounts.o: ../templates/indexpatterns.h ../core/sessionmanager.h +mounts.o: ../templates/patterncacher.h ../templates/indexpatterns.h +mounts.o: ../core/sessionmanager.h plugin.o: plugin.h pluginmsg.h log.h textstream.h logmanipulators.h slog.h plugin.o: cur.h request.h requesttypes.h item.h error.h config.h confparser.h plugin.o: htmlfilter.h ../templates/htmltextstream.h ../core/textstream.h @@ -236,25 +228,25 @@ plugin.o: ../templates/htmltextstream.h ../notify/notifythread.h plugin.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h plugin.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h plugin.o: mounts.h mountparser.h crypt.h run.h users.h groups.h group.h -plugin.o: loadavg.h thumb.h basethread.h sessionmanager.h sessioncontainer.h -plugin.o: ../functions/functions.h ../functions/functionbase.h -plugin.o: ../core/request.h ../core/system.h ../core/synchro.h -plugin.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h -plugin.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h -plugin.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h -plugin.o: ../functions/default.h ../functions/download.h ../functions/emacs.h -plugin.o: ../functions/last.h ../functions/login.h ../functions/logout.h -plugin.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h -plugin.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h -plugin.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h -plugin.o: ../functions/rm.h ../functions/specialdefault.h ../functions/stat.h +plugin.o: loadavg.h thumb.h basethread.h threadmanager.h sessionmanager.h +plugin.o: sessioncontainer.h ../functions/functions.h +plugin.o: ../functions/functionbase.h ../core/request.h ../core/system.h +plugin.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h +plugin.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h +plugin.o: ../functions/privchanger.h ../functions/chown.h +plugin.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h +plugin.o: ../functions/download.h ../functions/emacs.h ../functions/last.h +plugin.o: ../functions/login.h ../functions/logout.h ../functions/ln.h +plugin.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h +plugin.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h +plugin.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h +plugin.o: ../functions/specialdefault.h ../functions/stat.h plugin.o: ../functions/subject.h ../functions/template.h plugin.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h plugin.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h plugin.o: ../core/htmlfilter.h ../templates/templates.h -plugin.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h -plugin.o: ../core/httpsimpleparser.h ../core/log.h -plugin.o: ../templates/indexpatterns.h ../core/sessionmanager.h +plugin.o: ../templates/patterncacher.h ../templates/indexpatterns.h +plugin.o: ../core/sessionmanager.h plugindata.o: plugindata.h plugin.h pluginmsg.h log.h textstream.h plugindata.o: logmanipulators.h slog.h cur.h request.h requesttypes.h item.h plugindata.o: error.h config.h confparser.h htmlfilter.h @@ -275,9 +267,10 @@ plugindata.o: ../notify/notifythread.h ../core/basethread.h synchro.h plugindata.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h plugindata.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h plugindata.o: run.h users.h groups.h group.h loadavg.h thumb.h basethread.h -plugindata.o: sessionmanager.h sessioncontainer.h ../functions/functions.h -plugindata.o: ../functions/functionbase.h ../core/request.h ../core/system.h -plugindata.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h +plugindata.o: threadmanager.h sessionmanager.h sessioncontainer.h +plugindata.o: ../functions/functions.h ../functions/functionbase.h +plugindata.o: ../core/request.h ../core/system.h ../core/synchro.h +plugindata.o: ../functions/functionparser.h ../core/cur.h plugindata.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h plugindata.o: ../functions/privchanger.h ../functions/chown.h plugindata.o: ../functions/ckeditor.h ../functions/cp.h @@ -293,9 +286,7 @@ plugindata.o: ../functions/tinymce.h ../functions/uname.h plugindata.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h plugindata.o: ../functions/vim.h ../core/htmlfilter.h plugindata.o: ../templates/templates.h ../templates/patterncacher.h -plugindata.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h -plugindata.o: ../core/log.h ../templates/indexpatterns.h -plugindata.o: ../core/sessionmanager.h +plugindata.o: ../templates/indexpatterns.h ../core/sessionmanager.h postmultiparser.o: postmultiparser.h error.h requesttypes.h config.h postmultiparser.o: confparser.h htmlfilter.h misc.h item.h log.h textstream.h postmultiparser.o: logmanipulators.h slog.h cur.h request.h @@ -327,25 +318,25 @@ request.o: ../notify/notifythread.h ../core/basethread.h synchro.h request.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h request.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h request.o: users.h groups.h group.h loadavg.h thumb.h basethread.h -request.o: sessionmanager.h sessioncontainer.h ../functions/functions.h -request.o: ../functions/functionbase.h ../core/request.h ../core/system.h -request.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h -request.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h -request.o: ../functions/privchanger.h ../functions/chown.h -request.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h -request.o: ../functions/download.h ../functions/emacs.h ../functions/last.h -request.o: ../functions/login.h ../functions/logout.h ../functions/ln.h -request.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h -request.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h -request.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h +request.o: threadmanager.h sessionmanager.h sessioncontainer.h +request.o: ../functions/functions.h ../functions/functionbase.h +request.o: ../core/request.h ../core/system.h ../core/synchro.h +request.o: ../functions/functionparser.h ../core/cur.h ../functions/adduser.h +request.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h +request.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h +request.o: ../functions/default.h ../functions/download.h +request.o: ../functions/emacs.h ../functions/last.h ../functions/login.h +request.o: ../functions/logout.h ../functions/ln.h ../functions/ls.h +request.o: ../functions/mkdir.h ../functions/mv.h ../functions/nicedit.h +request.o: ../functions/node.h ../functions/passwd.h ../functions/priv.h +request.o: ../functions/reload.h ../functions/rm.h request.o: ../functions/specialdefault.h ../functions/stat.h request.o: ../functions/subject.h ../functions/template.h request.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h request.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h request.o: ../core/htmlfilter.h ../templates/templates.h -request.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h -request.o: ../core/httpsimpleparser.h ../core/log.h -request.o: ../templates/indexpatterns.h ../core/sessionmanager.h +request.o: ../templates/patterncacher.h ../templates/indexpatterns.h +request.o: ../core/sessionmanager.h run.o: run.h log.h textstream.h logmanipulators.h slog.h cur.h request.h run.o: requesttypes.h item.h error.h config.h confparser.h htmlfilter.h run.o: ../templates/htmltextstream.h ../core/textstream.h misc.h session.h @@ -380,10 +371,10 @@ sessionmanager.o: ../templates/htmltextstream.h ../notify/notifythread.h sessionmanager.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h sessionmanager.o: ../core/config.h ../core/users.h ugcontainer.h mounts.h sessionmanager.o: mountparser.h crypt.h run.h users.h groups.h group.h -sessionmanager.o: loadavg.h thumb.h basethread.h sessionparser.h plugin.h -sessionmanager.o: pluginmsg.h ../functions/functions.h -sessionmanager.o: ../functions/functionbase.h ../core/request.h -sessionmanager.o: ../core/system.h ../core/synchro.h +sessionmanager.o: loadavg.h thumb.h basethread.h threadmanager.h +sessionmanager.o: sessionparser.h plugin.h pluginmsg.h +sessionmanager.o: ../functions/functions.h ../functions/functionbase.h +sessionmanager.o: ../core/request.h ../core/system.h ../core/synchro.h sessionmanager.o: ../functions/functionparser.h ../core/cur.h sessionmanager.o: ../functions/adduser.h ../functions/cat.h sessionmanager.o: ../functions/chmod.h ../functions/privchanger.h @@ -402,9 +393,7 @@ sessionmanager.o: ../functions/tinymce.h ../functions/uname.h sessionmanager.o: ../functions/upload.h ../functions/uptime.h sessionmanager.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h sessionmanager.o: ../templates/templates.h ../templates/patterncacher.h -sessionmanager.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h -sessionmanager.o: ../core/log.h ../templates/indexpatterns.h -sessionmanager.o: ../core/sessionmanager.h +sessionmanager.o: ../templates/indexpatterns.h ../core/sessionmanager.h sessionparser.o: sessionparser.h session.h item.h error.h user.h plugindata.h sessionparser.o: rebus.h textstream.h sessioncontainer.h cur.h request.h sessionparser.o: requesttypes.h config.h confparser.h htmlfilter.h @@ -434,12 +423,32 @@ system.o: ../notify/notifythread.h ../core/basethread.h synchro.h system.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h system.o: ugcontainer.h lastcontainer.h mounts.h mountparser.h crypt.h run.h system.o: users.h groups.h group.h loadavg.h thumb.h basethread.h -system.o: ../templates/templates.h ../templates/patterncacher.h -system.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h -system.o: ../core/log.h ../templates/indexpatterns.h ../core/cur.h -system.o: ../core/system.h ../core/sessionmanager.h ../core/htmlfilter.h -system.o: ../functions/functionbase.h ../core/request.h ../core/synchro.h +system.o: threadmanager.h ../templates/templates.h +system.o: ../templates/patterncacher.h ../templates/indexpatterns.h +system.o: ../core/cur.h ../core/system.h ../core/sessionmanager.h +system.o: ../core/htmlfilter.h ../functions/functionbase.h ../core/request.h +system.o: ../core/synchro.h plugin.h pluginmsg.h sessionmanager.h +system.o: sessioncontainer.h ../functions/functions.h +system.o: ../functions/functionbase.h ../functions/functionparser.h +system.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h +system.o: ../functions/privchanger.h ../functions/chown.h +system.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h +system.o: ../functions/download.h ../functions/emacs.h ../functions/last.h +system.o: ../functions/login.h ../functions/logout.h ../functions/ln.h +system.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h +system.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h +system.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h +system.o: ../functions/specialdefault.h ../functions/stat.h +system.o: ../functions/subject.h ../functions/template.h +system.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h +system.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h textstream.o: textstream.h misc.h item.h requesttypes.h +threadmanager.o: threadmanager.h basethread.h synchro.h log.h textstream.h +threadmanager.o: logmanipulators.h slog.h cur.h request.h requesttypes.h +threadmanager.o: item.h error.h config.h confparser.h htmlfilter.h +threadmanager.o: ../templates/htmltextstream.h ../core/textstream.h misc.h +threadmanager.o: session.h user.h plugindata.h rebus.h mount.h +threadmanager.o: ../templates/locale.h ../core/confparser.h thumb.o: thumb.h basethread.h textstream.h ../db/db.h ../db/dbbase.h thumb.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h thumb.o: item.h requesttypes.h ../core/error.h ../db/dbitemquery.h @@ -457,5 +466,5 @@ thumb.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h thumb.o: ../templates/htmltextstream.h ../notify/notifythread.h thumb.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h thumb.o: ../core/users.h ugcontainer.h lastcontainer.h mounts.h mountparser.h -thumb.o: crypt.h run.h users.h groups.h group.h loadavg.h +thumb.o: crypt.h run.h users.h groups.h group.h loadavg.h threadmanager.h users.o: users.h diff --git a/core/Makefile.o.dep b/core/Makefile.o.dep index 8575b55..bf4e6c0 100755 --- a/core/Makefile.o.dep +++ b/core/Makefile.o.dep @@ -1 +1 @@ -o = acceptbaseparser.o app.o basethread.o bbcodeparser.o compress.o config.o confparser.o crypt.o dircontainer.o dirs.o groups.o htmlfilter.o httpsimpleparser.o item.o lastcontainer.o loadavg.o log.o misc.o mount.o mountparser.o mounts.o plugin.o plugindata.o postmultiparser.o rebus.o request.o run.o session.o sessioncontainer.o sessionmanager.o sessionparser.o slog.o synchro.o system.o textstream.o thumb.o users.o +o = acceptbaseparser.o app.o basethread.o bbcodeparser.o compress.o config.o confparser.o crypt.o dircontainer.o dirs.o groups.o htmlfilter.o httpsimpleparser.o item.o lastcontainer.o loadavg.o log.o misc.o mount.o mountparser.o mounts.o plugin.o plugindata.o postmultiparser.o rebus.o request.o run.o session.o sessioncontainer.o sessionmanager.o sessionparser.o slog.o synchro.o system.o textstream.o threadmanager.o thumb.o users.o diff --git a/core/app.cpp b/core/app.cpp index 6e75873..0c48f48 100755 --- a/core/app.cpp +++ b/core/app.cpp @@ -152,7 +152,6 @@ bool App::Init() CreateStaticTree(); - get_parser.UTF8(config.utf8); post_parser.UTF8(config.utf8); post_parser.LogValueSize(config.log_post_value_size); // post_multi_parser has a pointer to the config @@ -184,6 +183,8 @@ bool App::BaseUrlRedirect() cur.request->redirect_to = config.base_url; AssignString(cur.request->env_request_uri, cur.request->redirect_to, false); + // cur.request->env_request_uri should not be UrlEncoded + cur.request->redirect_url_encoded = true; log << log3 << "RC: BaseUrlRedirect from: " << cur.request->env_http_host << logend; @@ -372,7 +373,6 @@ void App::Make() { // !! dodac inne informacje (get, post, itp) // jesli jest debug_info wlaczone to nie robic przekierowan - cur.request->PrintGetTab(); //cur.request->PrintEnv(); // !! PrintEnv() mozna przeniesc tutaj (do klasy App) } } @@ -476,7 +476,7 @@ void App::LogAccess() void App::ReadGetPostVars() { // get parameters we have always - get_parser.Parse(cur.request->env_request_uri, cur.request->get_tab); + //get_parser.Parse(cur.request->env_request_uri, cur.request->get_tab); if( cur.request->method == Request::post ) { @@ -621,7 +621,11 @@ void App::SendHeadersRedirect() break; } - UrlEncode(cur.request->redirect_to, cur.request->aredirect_to); + if( !cur.request->redirect_url_encoded ) + UrlEncode(cur.request->redirect_to, cur.request->aredirect_to); + else + Ezc::WideToUTF8(cur.request->redirect_to, cur.request->aredirect_to); + FCGX_FPrintF(fcgi_request.out, "Location: %s\r\n", cur.request->aredirect_to.c_str()); log << log2 << "Redirect to: " << cur.request->aredirect_to << logend; } @@ -1127,9 +1131,7 @@ void App::WaitForThreads() // but it doesn't matter, don't use pthread_join on it //pthread_join(signal_thread, 0); - system.notify.WaitForThread(); - session_manager.WaitForThread(); - system.thumb.WaitForThread(); + system.thread_manager.StopAll(); } @@ -1163,9 +1165,6 @@ sigset_t set; app->synchro.was_stop_signal = true; FCGX_ShutdownPending(); Ezc::WideToUTF8(app->config.base_url, app->url_to_fetch_on_exit); - app->system.notify.PrepareToStopThread(); - app->session_manager.WakeUpThread(); - app->system.thumb.WakeUpThread(); app->Unlock(); // this thread will hang on this method @@ -1180,27 +1179,14 @@ sigset_t set; void App::StartThreads() { -sigset_t set; - - sigemptyset(&set); - sigaddset(&set, SIGTERM); - sigaddset(&set, SIGINT); - - // blocking SIGTERM and SIGINT - // new threads will have the signals blocked too - pthread_sigmask(SIG_BLOCK, &set, 0); + // make sure system.thread_manager.Init() was called beforehand + // it is called in Init() -> system.Init() // special thread only for signals pthread_create(&signal_thread, 0, SpecialThreadForSignals, this); - // thread for notifications - system.notify.StartThread(); - - // gc for sessions - session_manager.StartThread(); - - // thumbnails - system.thumb.StartThread(); + system.thread_manager.Add(&session_manager); + system.thread_manager.StartAll(); } diff --git a/core/app.h b/core/app.h index 27447a7..3b89403 100755 --- a/core/app.h +++ b/core/app.h @@ -30,7 +30,6 @@ #include "functions/functions.h" #include "templates/templates.h" #include "compress.h" -#include "getparser.h" #include "postparser.h" #include "cookieparser.h" #include "postmultiparser.h" @@ -38,7 +37,6 @@ - class App { public: @@ -109,11 +107,10 @@ private: h_403 }; - GetParser get_parser; PostParser post_parser; PostMultiParser post_multi_parser; CookieParser cookie_parser; - AcceptEncodingParser accept_encoding_parser; + AcceptEncodingParser accept_encoding_parser; Compress compress; std::wstring clean_html, html_with_debug; FCGX_Request fcgi_request; diff --git a/core/basethread.cpp b/core/basethread.cpp index d750556..7968c19 100755 --- a/core/basethread.cpp +++ b/core/basethread.cpp @@ -2,14 +2,14 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2011, Tomasz Sowa * All rights reserved. * */ #include #include "basethread.h" -#include "log.h" + BaseThread::BaseThread() : thread_signal(PTHREAD_COND_INITIALIZER) @@ -21,6 +21,7 @@ BaseThread::BaseThread() : thread_signal(PTHREAD_COND_INITIALIZER) } + void BaseThread::SetSynchro(Synchro * psynchro) { synchro = psynchro; @@ -34,6 +35,12 @@ void BaseThread::Mode(int mode) } +pthread_t BaseThread::ThreadId() +{ + return thread_id; +} + + bool BaseThread::Lock() { diff --git a/core/basethread.h b/core/basethread.h index 5cb1a26..89df0a9 100755 --- a/core/basethread.h +++ b/core/basethread.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2011, Tomasz Sowa * All rights reserved. * */ @@ -63,6 +63,11 @@ public: // it's called only if Init() returned true virtual void Uninit() {} + // returns the thread id + // this identifier is set by StartThread() metdhod + pthread_t ThreadId(); + + protected: diff --git a/core/error.h b/core/error.h index 9989f2b..5999f63 100755 --- a/core/error.h +++ b/core/error.h @@ -68,8 +68,9 @@ //#define WINIX_ERR_UNKNOWN 1000 #define WINIX_NOTHING_TO_DO 109 +#define WINIX_ERR_INCORRECT_URI 110 - +#define WINIX_ERR_INTERNAL_ERROR 2000 typedef int Error; diff --git a/core/getparser.h b/core/getparser.h deleted file mode 100755 index ff2f4cd..0000000 --- a/core/getparser.h +++ /dev/null @@ -1,87 +0,0 @@ -/* - * This file is a part of Winix - * and is not publicly distributed - * - * Copyright (c) 2008-2010, Tomasz Sowa - * All rights reserved. - * - */ - -#ifndef headerfile_winix_core_getparser -#define headerfile_winix_core_getparser - -#include "httpsimpleparser.h" -#include "requesttypes.h" -#include "misc.h" -#include "utf8.h" -#include "log.h" - - -class GetParser : public HttpSimpleParser -{ - - const char * get_string; - GetTab * get_tab; - std::wstring temp; - bool input_as_utf8; - -protected: - - virtual int GetChar() - { - if( !get_string || *get_string == 0 ) - return -1; - - return (int)(unsigned char)*(get_string++); - } - - - virtual void Parameter(std::string &, std::string & value) - { - if( input_as_utf8 ) - Ezc::UTF8ToWide(value, temp); - else - AssignString(value, temp); - - get_tab->push_back(temp); - log << log2 << "Get, value: \"" << temp << "\"" << logend; - } - - - -public: - - - GetParser() - { - HttpSimpleParser::separator = '/'; - HttpSimpleParser::read_name = false; - input_as_utf8 = false; - } - - - void UTF8(bool utf) - { - input_as_utf8 = utf; - } - - - // get_string_ can be null - void Parse(const char * get_string_, GetTab & get_tab_) - { - get_string = get_string_; - get_tab = &get_tab_; - - if( get_string && *get_string == separator ) - { - // skipping one '/' at the beginning - ++get_string; - } - - HttpSimpleParser::Parse(); - } - -}; - - -#endif diff --git a/core/item.h b/core/item.h index 0333eba..caccbaa 100755 --- a/core/item.h +++ b/core/item.h @@ -16,7 +16,8 @@ #define WINIX_ITEM_FILETYPE_NONE 0 #define WINIX_ITEM_FILETYPE_IMAGE 1 #define WINIX_ITEM_FILETYPE_DOCUMENT 2 -#define WINIX_ITEM_FILETYPE_UNKNOWN 3 +#define WINIX_ITEM_FILETYPE_VIDEO 3 +#define WINIX_ITEM_FILETYPE_UNKNOWN 10 diff --git a/core/misc.cpp b/core/misc.cpp index 8e62805..b45730f 100755 --- a/core/misc.cpp +++ b/core/misc.cpp @@ -923,6 +923,15 @@ int SelectFileType(const wchar_t * file_name) EqualNoCase(ext, L"odt") ) return WINIX_ITEM_FILETYPE_DOCUMENT; + if( EqualNoCase(ext, L"avi") || + EqualNoCase(ext, L"mp4") || + EqualNoCase(ext, L"flv") || + EqualNoCase(ext, L"mpg") || + EqualNoCase(ext, L"mpeg") || + EqualNoCase(ext, L"mkv") || + EqualNoCase(ext, L"wmv") ) + return WINIX_ITEM_FILETYPE_VIDEO; + return WINIX_ITEM_FILETYPE_UNKNOWN; } @@ -987,6 +996,7 @@ char buffer[10]; if( clear_out ) out.clear(); + // !! we should not use such characters here: '/' '#' for(size_t i=0 ; i= 'a' && in[i] <= 'z') || @@ -1003,7 +1013,7 @@ char buffer[10]; out += '%'; if( buffer[1] == 0 ) - out += '0'; // there is only one characters in the buffer + out += '0'; // there is only one character in the buffer out += buffer; } diff --git a/core/pluginmsg.h b/core/pluginmsg.h index abf8e47..aa8595c 100755 --- a/core/pluginmsg.h +++ b/core/pluginmsg.h @@ -93,11 +93,21 @@ // with a template file name #define WINIX_NOTIFY_ADD_TEMPLATE 3013 - -// the request is ended +// the request is being ended // you can clear some of your object here #define WINIX_END_REQUEST 3014 +// a new file (page) has been added +// in p1 you have a pointer to the Item struct +#define WINIX_FILE_ADDED 3015 + +// a file (page) has been changed (edited) +// in p1 you have a pointer to the Item struct +#define WINIX_FILE_CHANGED 3016 + + + + // values from 4000 - 4099 reserved for 'thread' plugin // see plugins/thread/pluginmsg.h diff --git a/core/request.cpp b/core/request.cpp index fef009c..10ec9dd 100755 --- a/core/request.cpp +++ b/core/request.cpp @@ -40,7 +40,6 @@ void Request::Clear() RemovePostFileTmp(post_file_tab); - get_tab.clear(); post_tab.clear(); post_file_tab.clear(); cookie_tab.clear(); @@ -72,11 +71,13 @@ void Request::Clear() is_item = false; function = 0; // !! dodac jakas empty funkcje param_tab.clear(); + anchor.clear(); status = WINIX_ERR_OK; browser_msie = false; redirect_to.clear(); + redirect_url_encoded = false; redirect_type = 303; x_sendfile.clear(); send_as_attachment = false; @@ -169,15 +170,6 @@ return &p->second; -void Request::PrintGetTab() -{ - debug << "get_tab: " << get_tab.size() << "\n"; - - for(GetTab::iterator i = get_tab.begin() ; i != get_tab.end() ; ++i) - debug << " \"" << *i << "\"\n"; - - debug << '\n'; -} /* void Request::PrintEnv() diff --git a/core/request.h b/core/request.h index 4f928c6..11b26b5 100755 --- a/core/request.h +++ b/core/request.h @@ -52,11 +52,13 @@ struct Request bool use_html_filter; // raw parameters - GetTab get_tab; PostTab post_tab; PostFileTab post_file_tab; CookieTab cookie_tab; + // html anchor (those part of URI after '#' character) + std::wstring anchor; + // environment variables // they are not null -- when the server doesn't have such a variable // it will be pointing into 'char_empty' which is default '\0' @@ -102,6 +104,10 @@ struct Request std::wstring redirect_to; std::string aredirect_to; + // if false then we should use url encode on 'redirect_to' before sending the header + // default: false + bool redirect_url_encoded; + // a redirect type // following redirect types are supported: // 300 Multiple Choices @@ -126,7 +132,6 @@ struct Request void Clear(); // for debugging - void PrintGetTab(); //void PrintEnv(); diff --git a/core/requesttypes.h b/core/requesttypes.h index 894220c..bba1908 100755 --- a/core/requesttypes.h +++ b/core/requesttypes.h @@ -38,7 +38,6 @@ struct Param // some global types used by Request class -typedef std::vector GetTab; typedef std::map PostTab; typedef std::map PostFileTab; typedef std::vector ParamTab; diff --git a/core/system.cpp b/core/system.cpp index 29f714c..0463064 100755 --- a/core/system.cpp +++ b/core/system.cpp @@ -12,6 +12,7 @@ #include "error.h" #include "templates/templates.h" #include "functions/functionbase.h" +#include "plugin.h" @@ -43,6 +44,9 @@ void System::SetSynchro(Synchro * psynchro) void System::Init() { + thread_manager.SetSynchro(synchro); + thread_manager.Init(); + dirs.SetDb(db); dirs.SetCur(cur); dirs.SetNotify(¬ify); @@ -68,12 +72,15 @@ void System::Init() notify.SetConfig(config); notify.SetUsers(&users); notify.SetDirs(&dirs); + notify.SetThreadManager(&thread_manager); notify.Init(); + thumb.SetSynchro(synchro); thumb.SetDb(db); thumb.SetConfig(config); thumb.SetSystem(this); + thread_manager.Add(&thumb); crypt.SetConfig(config); } @@ -632,6 +639,8 @@ Error System::AddFile(Item & item, int notify_code) if( notify_code ) notify.ItemChanged(notify_code, item); + + plugin.Call(WINIX_FILE_ADDED, &item); } return status; @@ -661,6 +670,8 @@ Error System::EditFile(Item & item, bool with_url, int notify_code) if( notify_code ) notify.ItemChanged(notify_code, item); + + plugin.Call(WINIX_FILE_CHANGED, &item); } diff --git a/core/system.h b/core/system.h index d0c225b..e3437c4 100755 --- a/core/system.h +++ b/core/system.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2011, Tomasz Sowa * All rights reserved. * */ @@ -23,6 +23,7 @@ #include "loadavg.h" #include "synchro.h" #include "thumb.h" +#include "threadmanager.h" #include "notify/notify.h" @@ -63,6 +64,9 @@ public: // cryptography and hashes Crypt crypt; + // thread management + ThreadManager thread_manager; + void SetCur(Cur * pcur); void SetConfig(Config * pconfig); void SetDb(Db * pdb); diff --git a/core/threadmanager.cpp b/core/threadmanager.cpp new file mode 100755 index 0000000..0c8d29f --- /dev/null +++ b/core/threadmanager.cpp @@ -0,0 +1,104 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2011, Tomasz Sowa + * All rights reserved. + * + */ + +#include +#include "threadmanager.h" +#include "log.h" + + +ThreadManager::ThreadManager() +{ + were_started = false; +} + + +void ThreadManager::SetSynchro(Synchro * psynchro) +{ + synchro = psynchro; +} + + +void ThreadManager::Init() +{ +sigset_t set; + + sigemptyset(&set); + sigaddset(&set, SIGTERM); + sigaddset(&set, SIGINT); + + // blocking SIGTERM and SIGINT + // new threads will have the signals blocked too + pthread_sigmask(SIG_BLOCK, &set, 0); +} + + + + +void ThreadManager::Add(BaseThread * pbase) +{ + thread_tab.push_back(pbase); + + if( were_started ) + Start(thread_tab.size() - 1); + else + log << log4 << "TM: added a thread to the queue, number: " << (thread_tab.size()-1) << logend; +} + + + + +void ThreadManager::StartAll() +{ + for(size_t i=0 ; iStartThread() ) + { + log << log4 << "TM: thread " << i << " (" << thread_tab[i]->ThreadId() << ") started" << logend; + } + else + { + log << log4 << "TM: cannot run a thread, thread number: " << i << logend; + } + } +} + + +void ThreadManager::StopAll() +{ + if( !were_started ) + return; + + // WakeUpThread() should be used with Lock/Unlock + synchro->Lock(); + + for(size_t i=0 ; iWakeUpThread(); + + synchro->Unlock(); + + + for(size_t i=0 ; iThreadId() << ")" << logend; + thread_tab[i]->WaitForThread(); + log << log4 << "TM: thread " << i << " terminated" << logend; + } +} + + + diff --git a/core/threadmanager.h b/core/threadmanager.h new file mode 100755 index 0000000..9afee50 --- /dev/null +++ b/core/threadmanager.h @@ -0,0 +1,55 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2011, Tomasz Sowa + * All rights reserved. + * + */ + +#ifndef headerfile_winix_core_threadmanager +#define headerfile_winix_core_threadmanager + +#include +#include "basethread.h" +#include "synchro.h" + + + +class ThreadManager +{ +public: + + ThreadManager(); + + // synchro object + void SetSynchro(Synchro * psynchro); + + // initializing + void Init(); + + // adding a new thread to the queue + // the thread will be running only if we call StartAll() before + // otherwise the thread will be waiting for StartAll() + void Add(BaseThread * pbase); + + // starting all threads + void StartAll(); + + // sending a stop signal to all threads + // and waiting until they finish + void StopAll(); + +private: + + Synchro * synchro; + typedef std::vector ThreadTab; + ThreadTab thread_tab; + bool were_started; + + void Start(size_t i); + +}; + +#endif + diff --git a/functions/Makefile.dep b/functions/Makefile.dep index 375c797..29b4d5c 100755 --- a/functions/Makefile.dep +++ b/functions/Makefile.dep @@ -28,7 +28,7 @@ adduser.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h adduser.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h adduser.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h adduser.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -adduser.o: ../core/synchro.h ../core/slog.h +adduser.o: ../core/threadmanager.h ../core/synchro.h ../core/slog.h cat.o: cat.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h cat.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h cat.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -55,7 +55,7 @@ cat.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h cat.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h cat.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h cat.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -cat.o: ../core/basethread.h ../core/synchro.h +cat.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h chmod.o: chmod.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h chmod.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h chmod.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -83,7 +83,7 @@ chmod.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h chmod.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h chmod.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h chmod.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -chmod.o: ../core/synchro.h +chmod.o: ../core/threadmanager.h ../core/synchro.h chown.o: chown.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h chown.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h chown.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -111,7 +111,7 @@ chown.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h chown.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h chown.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h chown.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -chown.o: ../core/synchro.h +chown.o: ../core/threadmanager.h ../core/synchro.h ckeditor.o: ckeditor.h functionbase.h ../core/item.h ../db/db.h ckeditor.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ckeditor.o: ../core/textstream.h ../core/misc.h ../core/item.h @@ -141,7 +141,7 @@ ckeditor.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h ckeditor.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h ckeditor.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h ckeditor.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -ckeditor.o: ../core/synchro.h +ckeditor.o: ../core/threadmanager.h ../core/synchro.h cp.o: cp.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h cp.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h cp.o: ../core/item.h ../core/requesttypes.h ../core/error.h @@ -168,7 +168,7 @@ cp.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h cp.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h cp.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h cp.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -cp.o: ../core/synchro.h ../core/misc.h +cp.o: ../core/threadmanager.h ../core/synchro.h ../core/misc.h default.o: default.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h default.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h default.o: ../core/misc.h ../core/item.h ../core/requesttypes.h @@ -197,7 +197,7 @@ default.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h default.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h default.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h default.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -default.o: ../core/synchro.h +default.o: ../core/threadmanager.h ../core/synchro.h download.o: download.h functionbase.h ../core/item.h ../db/db.h download.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h download.o: ../core/textstream.h ../core/misc.h ../core/item.h @@ -227,7 +227,7 @@ download.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h download.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h download.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h download.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -download.o: ../core/synchro.h +download.o: ../core/threadmanager.h ../core/synchro.h emacs.o: emacs.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h emacs.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h emacs.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -255,11 +255,9 @@ emacs.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h emacs.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h emacs.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h emacs.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -emacs.o: ../core/synchro.h ../templates/templates.h -emacs.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h -emacs.o: ../core/httpsimpleparser.h ../core/log.h -emacs.o: ../templates/indexpatterns.h ../core/sessionmanager.h -emacs.o: ../core/sessioncontainer.h ../core/system.h +emacs.o: ../core/threadmanager.h ../core/synchro.h ../templates/templates.h +emacs.o: ../templates/patterncacher.h ../templates/indexpatterns.h +emacs.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h functionbase.o: functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h functionbase.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h functionbase.o: ../core/misc.h ../core/item.h ../core/requesttypes.h @@ -291,7 +289,7 @@ functionbase.o: ../core/ugcontainer.h ../core/lastcontainer.h functionbase.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h functionbase.o: ../core/users.h ../core/groups.h ../core/group.h functionbase.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -functionbase.o: ../core/synchro.h +functionbase.o: ../core/threadmanager.h ../core/synchro.h functionparser.o: functionparser.h ../db/db.h ../db/dbbase.h ../db/dbconn.h functionparser.o: ../db/dbtextstream.h ../core/textstream.h ../core/misc.h functionparser.o: ../core/item.h ../core/requesttypes.h ../core/error.h @@ -323,8 +321,9 @@ functionparser.o: ../core/users.h ../core/ugcontainer.h functionparser.o: ../core/lastcontainer.h ../core/mounts.h functionparser.o: ../core/mountparser.h ../core/crypt.h ../core/users.h functionparser.o: ../core/groups.h ../core/group.h ../core/loadavg.h -functionparser.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h -functionparser.o: ../core/cur.h ../core/log.h +functionparser.o: ../core/thumb.h ../core/basethread.h +functionparser.o: ../core/threadmanager.h ../core/synchro.h ../core/cur.h +functionparser.o: ../core/log.h functions.o: functions.h functionbase.h ../core/item.h ../db/db.h functions.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h functions.o: ../core/textstream.h ../core/misc.h ../core/item.h @@ -348,18 +347,17 @@ functions.o: ../notify/templatesnotify.h ../core/users.h functions.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h functions.o: ../core/mountparser.h ../core/crypt.h run.h ../core/users.h functions.o: ../core/groups.h ../core/group.h ../core/loadavg.h -functions.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h -functions.o: functionparser.h ../core/cur.h adduser.h cat.h chmod.h -functions.o: privchanger.h chown.h ckeditor.h cp.h default.h download.h -functions.o: emacs.h last.h login.h logout.h ln.h ls.h mkdir.h mv.h nicedit.h -functions.o: node.h passwd.h priv.h reload.h rm.h specialdefault.h stat.h -functions.o: subject.h template.h tinymce.h uname.h upload.h uptime.h who.h -functions.o: vim.h ../core/htmlfilter.h ../core/log.h ../core/misc.h -functions.o: ../core/plugin.h ../core/pluginmsg.h ../core/system.h -functions.o: ../core/sessionmanager.h ../core/sessioncontainer.h -functions.o: ../functions/functions.h ../templates/templates.h -functions.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h -functions.o: ../core/httpsimpleparser.h ../core/log.h +functions.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h +functions.o: ../core/synchro.h functionparser.h ../core/cur.h adduser.h cat.h +functions.o: chmod.h privchanger.h chown.h ckeditor.h cp.h default.h +functions.o: download.h emacs.h last.h login.h logout.h ln.h ls.h mkdir.h +functions.o: mv.h nicedit.h node.h passwd.h priv.h reload.h rm.h +functions.o: specialdefault.h stat.h subject.h template.h tinymce.h uname.h +functions.o: upload.h uptime.h who.h vim.h ../core/htmlfilter.h ../core/log.h +functions.o: ../core/misc.h ../core/plugin.h ../core/pluginmsg.h +functions.o: ../core/system.h ../core/sessionmanager.h +functions.o: ../core/sessioncontainer.h ../functions/functions.h +functions.o: ../templates/templates.h ../templates/patterncacher.h functions.o: ../templates/indexpatterns.h ../core/sessionmanager.h last.o: last.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h last.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h @@ -387,7 +385,8 @@ last.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h last.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h last.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h last.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -last.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +last.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h +last.o: ../core/synchro.h ln.o: ln.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h ln.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h ln.o: ../core/item.h ../core/requesttypes.h ../core/error.h @@ -414,7 +413,8 @@ ln.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h ln.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h ln.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h ln.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -ln.o: ../core/synchro.h ../core/misc.h ../functions/functions.h +ln.o: ../core/threadmanager.h ../core/synchro.h ../core/misc.h +ln.o: ../functions/functions.h login.o: login.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h login.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h login.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -442,7 +442,7 @@ login.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h login.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h login.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h login.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -login.o: ../core/synchro.h +login.o: ../core/threadmanager.h ../core/synchro.h logout.o: logout.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h logout.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h logout.o: ../core/misc.h ../core/item.h ../core/requesttypes.h @@ -471,7 +471,7 @@ logout.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h logout.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h logout.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h logout.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -logout.o: ../core/synchro.h +logout.o: ../core/threadmanager.h ../core/synchro.h ls.o: ls.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h ls.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h ls.o: ../core/item.h ../core/requesttypes.h ../core/error.h @@ -498,7 +498,7 @@ ls.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h ls.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h ls.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h ls.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -ls.o: ../core/synchro.h +ls.o: ../core/threadmanager.h ../core/synchro.h mkdir.o: mkdir.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h mkdir.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h mkdir.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -526,7 +526,7 @@ mkdir.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h mkdir.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h mkdir.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h mkdir.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -mkdir.o: ../core/synchro.h +mkdir.o: ../core/threadmanager.h ../core/synchro.h mount.o: mount.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h mount.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h mount.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -554,7 +554,7 @@ mount.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h mount.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h mount.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h mount.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -mount.o: ../core/synchro.h +mount.o: ../core/threadmanager.h ../core/synchro.h mv.o: mv.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h mv.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h mv.o: ../core/item.h ../core/requesttypes.h ../core/error.h @@ -581,7 +581,7 @@ mv.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h mv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h mv.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h mv.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -mv.o: ../core/synchro.h +mv.o: ../core/threadmanager.h ../core/synchro.h nicedit.o: nicedit.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h nicedit.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h nicedit.o: ../core/misc.h ../core/item.h ../core/requesttypes.h @@ -610,7 +610,7 @@ nicedit.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h nicedit.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h nicedit.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h nicedit.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -nicedit.o: ../core/synchro.h +nicedit.o: ../core/threadmanager.h ../core/synchro.h node.o: node.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h node.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h node.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -638,7 +638,7 @@ node.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h node.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h node.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h node.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -node.o: ../core/synchro.h +node.o: ../core/threadmanager.h ../core/synchro.h passwd.o: passwd.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h passwd.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h passwd.o: ../core/misc.h ../core/item.h ../core/requesttypes.h @@ -667,7 +667,8 @@ passwd.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h passwd.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h passwd.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h passwd.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -passwd.o: ../core/synchro.h ../core/slog.h ../functions/functions.h +passwd.o: ../core/threadmanager.h ../core/synchro.h ../core/slog.h +passwd.o: ../functions/functions.h priv.o: priv.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h priv.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h priv.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -695,7 +696,7 @@ priv.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h priv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h priv.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h priv.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -priv.o: ../core/synchro.h +priv.o: ../core/threadmanager.h ../core/synchro.h privchanger.o: privchanger.h ../core/request.h ../core/system.h privchanger.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h privchanger.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h @@ -726,7 +727,7 @@ privchanger.o: ../notify/templatesnotify.h ../core/users.h privchanger.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h privchanger.o: ../core/mountparser.h ../core/crypt.h ../core/users.h privchanger.o: ../core/groups.h ../core/group.h ../core/loadavg.h -privchanger.o: ../core/thumb.h ../core/basethread.h +privchanger.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h reload.o: reload.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h reload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h reload.o: ../core/misc.h ../core/item.h ../core/requesttypes.h @@ -755,11 +756,10 @@ reload.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h reload.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h reload.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h reload.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -reload.o: ../core/synchro.h ../templates/templates.h -reload.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h -reload.o: ../core/httpsimpleparser.h ../core/log.h -reload.o: ../templates/indexpatterns.h ../core/sessionmanager.h -reload.o: ../core/sessioncontainer.h ../core/system.h +reload.o: ../core/threadmanager.h ../core/synchro.h ../templates/templates.h +reload.o: ../templates/patterncacher.h ../templates/indexpatterns.h +reload.o: ../core/sessionmanager.h ../core/sessioncontainer.h +reload.o: ../core/system.h rm.o: rm.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h rm.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h ../core/misc.h rm.o: ../core/item.h ../core/requesttypes.h ../core/error.h @@ -786,13 +786,12 @@ rm.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h rm.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h rm.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h rm.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -rm.o: ../core/basethread.h ../core/synchro.h ../core/plugin.h -rm.o: ../core/pluginmsg.h ../core/system.h ../core/sessionmanager.h -rm.o: ../core/sessioncontainer.h ../functions/functions.h -rm.o: ../templates/templates.h ../templates/patterncacher.h -rm.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h -rm.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h -rm.o: ../core/misc.h +rm.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h +rm.o: ../core/plugin.h ../core/pluginmsg.h ../core/system.h +rm.o: ../core/sessionmanager.h ../core/sessioncontainer.h +rm.o: ../functions/functions.h ../templates/templates.h +rm.o: ../templates/patterncacher.h ../templates/indexpatterns.h +rm.o: ../core/sessionmanager.h ../core/misc.h run.o: run.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h run.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h run.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -819,7 +818,7 @@ run.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h run.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h run.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h run.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -run.o: ../core/basethread.h ../core/synchro.h +run.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h specialdefault.o: specialdefault.h functionbase.h ../core/item.h ../db/db.h specialdefault.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h specialdefault.o: ../core/textstream.h ../core/misc.h ../core/item.h @@ -852,7 +851,7 @@ specialdefault.o: ../core/ugcontainer.h ../core/lastcontainer.h specialdefault.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h specialdefault.o: ../core/users.h ../core/groups.h ../core/group.h specialdefault.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -specialdefault.o: ../core/synchro.h +specialdefault.o: ../core/threadmanager.h ../core/synchro.h stat.o: stat.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h stat.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h stat.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -879,7 +878,8 @@ stat.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h stat.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h stat.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h stat.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -stat.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +stat.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h +stat.o: ../core/synchro.h subject.o: subject.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h subject.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h subject.o: ../core/misc.h ../core/item.h ../core/requesttypes.h @@ -908,7 +908,7 @@ subject.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h subject.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h subject.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h subject.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -subject.o: ../core/synchro.h +subject.o: ../core/threadmanager.h ../core/synchro.h template.o: template.h functionbase.h ../core/item.h ../db/db.h template.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h template.o: ../core/textstream.h ../core/misc.h ../core/item.h @@ -938,7 +938,7 @@ template.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h template.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h template.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h template.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -template.o: ../core/synchro.h ../core/misc.h +template.o: ../core/threadmanager.h ../core/synchro.h ../core/misc.h tinymce.o: tinymce.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h tinymce.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h tinymce.o: ../core/misc.h ../core/item.h ../core/requesttypes.h @@ -967,7 +967,7 @@ tinymce.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h tinymce.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h tinymce.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h tinymce.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -tinymce.o: ../core/synchro.h +tinymce.o: ../core/threadmanager.h ../core/synchro.h uname.o: uname.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h uname.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h uname.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -994,7 +994,8 @@ uname.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h uname.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h uname.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h uname.o: ../core/users.h ../core/groups.h ../core/group.h ../core/loadavg.h -uname.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +uname.o: ../core/thumb.h ../core/basethread.h ../core/threadmanager.h +uname.o: ../core/synchro.h upload.o: upload.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h upload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h upload.o: ../core/misc.h ../core/item.h ../core/requesttypes.h @@ -1023,11 +1024,11 @@ upload.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h upload.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h upload.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h upload.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -upload.o: ../core/synchro.h ../core/misc.h ../functions/functions.h -upload.o: ../templates/templates.h ../templates/patterncacher.h -upload.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h -upload.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h -upload.o: ../core/sessioncontainer.h ../core/system.h +upload.o: ../core/threadmanager.h ../core/synchro.h ../core/misc.h +upload.o: ../functions/functions.h ../templates/templates.h +upload.o: ../templates/patterncacher.h ../templates/indexpatterns.h +upload.o: ../core/sessionmanager.h ../core/sessioncontainer.h +upload.o: ../core/system.h uptime.o: uptime.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h uptime.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h uptime.o: ../core/misc.h ../core/item.h ../core/requesttypes.h @@ -1056,7 +1057,7 @@ uptime.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h uptime.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h uptime.o: ../core/crypt.h ../core/users.h ../core/groups.h ../core/group.h uptime.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -uptime.o: ../core/synchro.h +uptime.o: ../core/threadmanager.h ../core/synchro.h vim.o: vim.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h vim.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h vim.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -1083,7 +1084,7 @@ vim.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h vim.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h vim.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h vim.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -vim.o: ../core/basethread.h ../core/synchro.h +vim.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h who.o: who.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h who.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h who.o: ../core/misc.h ../core/item.h ../core/requesttypes.h ../core/error.h @@ -1110,4 +1111,4 @@ who.o: ../core/basethread.h ../core/synchro.h ../notify/templatesnotify.h who.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h who.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h ../core/users.h who.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h -who.o: ../core/basethread.h ../core/synchro.h +who.o: ../core/basethread.h ../core/threadmanager.h ../core/synchro.h diff --git a/functions/functionparser.cpp b/functions/functionparser.cpp index 1e9c9db..c88571e 100755 --- a/functions/functionparser.cpp +++ b/functions/functionparser.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ @@ -12,138 +12,231 @@ #include "core/item.h" #include "core/error.h" #include "functions.h" +#include "utf8.h" -void FunctionParser::SkipEmptyString(const char * msg) + +FunctionParser::FunctionParser() { - for( ; get_index != get_tab_len && cur->request->get_tab[get_index].empty() ; ++get_index ) - log << log3 << msg << logend; + utf8 = false; +} + + +void FunctionParser::UTF8(bool use_utf8) +{ + utf8 = use_utf8; +} + + +bool FunctionParser::Parse(Cur * pcur, Db * pdb, Functions * pfunctions, System * psystem) +{ + db = pdb; + cur = pcur; + system = psystem; + functions = pfunctions; + last_dir = 0; + path = cur->request->env_request_uri; + + //!! mozna dodac sprawdzanie dlugosci path + // jesli wieksza niz np 2048 to zglosic incorrect url + // i nie parsowac + + ParseDirsItemFunction(); + ParseParams(); + ParseAnchor(); + +return cur->request->status == WINIX_ERR_OK; } - -void FunctionParser::ParseDirectories() +void FunctionParser::ParseDirsItemFunction() { - Item * pdir = system->dirs.GetRootDir(); - - if( !pdir ) + if( !AddRootDir() ) + return; + + ReadName(); + + while( IsDir() ) { - // there is no the root dir - cur->request->status = WINIX_ERR_NO_ROOT_DIR; - return; + AddDir(); + ReadName(); } + if( name.empty() ) + return; - while( true ) - { - cur->request->dir_tab.push_back( pdir ); - log << log3 << "FP: Directory: "; - - if( pdir->parent_id == -1 ) - log << "(root)" << logend; - else - log << pdir->url << logend; + if( CheckAddFunction() ) + return; - SkipEmptyString("FP: Directory: skipped empty string"); - - if( get_index == get_tab_len ) - break; + if( CheckAddItem() ) + { + ReadName(); + CheckAddFunction(); + SkipSlashes(); - pdir = system->dirs.GetDir(cur->request->get_tab[get_index], pdir->id); + if( !cur->request->function && *path && *path!='#' && *path!='?' ) + { + log << log3 << "FP: unknown function: " << name << logend; + cur->request->status = WINIX_ERR_NO_ITEM; + } + } +} + + +bool FunctionParser::AddRootDir() +{ + last_dir = system->dirs.GetRootDir(); + + if( !last_dir ) + { + log << log3 << "FP: there is not a root directory" << logend; + cur->request->status = WINIX_ERR_INTERNAL_ERROR; + return false; + } + + AddDir(); + +return true; +} + + + +bool FunctionParser::IsDir() +{ + // directory names should not be empty + if( name.empty() || !last_dir ) + return false; + + last_dir = system->dirs.GetDir(name, last_dir->id); - if( !pdir ) - break; - - ++get_index; - } +return last_dir != 0; +} + + +bool FunctionParser::CheckAddItem() +{ + // cur->request->dir_tab has at least one element + long parent_id = cur->request->dir_tab.back()->id; + Error status = db->GetItem(parent_id, name, cur->request->item); + + if( status == WINIX_ERR_OK ) + { + log << log3 << "FP: Item: id: " << cur->request->item.id << ", url: " << cur->request->item.url << logend; + cur->request->last_item = &cur->request->item; + cur->request->is_item = true; + return true; + } + + if( status == WINIX_ERR_NO_ITEM ) + { + log << log3 << "FP: No Item: url: " << name << logend; + cur->request->status = WINIX_ERR_NO_ITEM; + return false; + } + + log << log1 << "FP: db error" << logend; + cur->request->status = WINIX_ERR_INTERNAL_ERROR; + +return false; +} + + + +bool FunctionParser::CheckAddFunction() +{ + cur->request->function = functions->Find(name); + + if( cur->request->function ) + { + log << log3 << "FP: Function: " << cur->request->function->fun.url << logend; + return true; + } + +return false; +} + + +void FunctionParser::AddDir() +{ + cur->request->dir_tab.push_back( last_dir ); + log << log3 << "FP: Directory: "; + + if( last_dir->parent_id == -1 ) + log << "(root)" << logend; + else + log << last_dir->url << logend; cur->request->last_item = cur->request->dir_tab.back(); } -void FunctionParser::ParseItem() +void FunctionParser::ParseParams() { - SkipEmptyString("FP: Item: skipped empty string"); - - if( get_index == get_tab_len ) + SkipSlashes(); + + if( *path == '#' ) + { + // there are not any parameters return; - - // cur->request->dir_tab has at least one element - long parent_id = cur->request->dir_tab.back()->id; - const std::wstring & url = cur->request->get_tab[get_index]; - - cur->request->status = db->GetItem(parent_id, url, cur->request->item); - - if( cur->request->status == WINIX_ERR_OK ) - { - cur->request->last_item = &cur->request->item; - - if( cur->request->role == Request::authorizer && cur->request->item.file_type == WINIX_ITEM_FILETYPE_NONE ) - { - log << log1 << "FP: item.url: " << url << " exists but has not a static content (authorizer role)" << logend; - cur->request->status = WINIX_ERR_NO_ITEM; - return; - } - - ++get_index; - cur->request->is_item = true; - log << log3 << "FP: Item: id: " << cur->request->item.id << ", url: " << cur->request->item.url << logend; } + + if( *path == '?' ) + ParseOrdinaryParams(); else - { - log << log3 << "FP: No Item: url: " << url << logend; - } + ParseWinixParams(); } -void FunctionParser::ParseFunction() +void FunctionParser::ParseOrdinaryParams() { - SkipEmptyString("FP: Function: skipped empty string"); - - if( get_index == get_tab_len ) - return; - - cur->request->function = functions->Find(cur->request->get_tab[get_index]); - - - if( cur->request->function ) + if( *path=='?' ) + path += 1; + + do { - ++get_index; - log << log3 << "FP: Function: " << cur->request->function->fun.url << logend; + ReadOrdinaryParName(); + + if( name.empty() ) + break; + + ReadOrdinaryParValue(); + + if( *path == '&' ) + path += 1; + + AddParam(); } + while( true ); } -void FunctionParser::ParseParams(const std::wstring & par) +void FunctionParser::ParseWinixParams() { -Param param; -size_t i; - - if( par.empty() ) - return; - - // looking for the first colon ':' - for(i=0 ; i 0 ) - param.name = par.substr(0, i); + SkipSlashes(); + ReadWinixParName(); - if( i < par.size() - 1 ) - param.value = par.substr(i+1); - } + if( name.empty() ) + break; + ReadWinixParValue(); + + AddParam(); + } + while( true ); +} + + +void FunctionParser::AddParam() +{ + param.name = name; + param.value = value; cur->request->param_tab.push_back(param); log << log3 << "FP: Param: name=" << param.name; @@ -155,81 +248,153 @@ size_t i; } - -void FunctionParser::ParseParams() +void FunctionParser::ParseAnchor() { - for( ; true ; ++get_index ) - { - SkipEmptyString("FP: Params: skipped empty string"); - - if( get_index == get_tab_len ) - break; - - ParseParams(cur->request->get_tab[get_index]); - } -} - - - -void FunctionParser::Parse(Cur * pcur, Db * pdb, Functions * pfunctions, System * psystem) -{ - db = pdb; - cur = pcur; - system = psystem; - functions = pfunctions; - - cur->request->status = WINIX_ERR_OK; - get_index = 0; - get_tab_len = cur->request->get_tab.size(); - cur->request->function = 0; - cur->request->is_item = false; - - ParseDirectories(); - - if( cur->request->status != WINIX_ERR_OK ) + if( *path == 0 ) return; - ParseFunction(); - - if( !cur->request->function ) + if( *path != '#' ) { - ParseItem(); - - if( cur->request->status != WINIX_ERR_OK ) - return; - - ParseFunction(); - - if( !cur->request->function && get_index != get_tab_len ) - { - cur->request->status = WINIX_ERR_NO_FUNCTION; - log << log3 << "FP: Parse: unknown function: \"" << cur->request->get_tab[get_index] << "\"" << logend; - return; - } + cur->request->status = WINIX_ERR_INCORRECT_URI; + return; } - ParseParams(); + path += 1; + name_ascii.clear(); + + while( *path ) + name_ascii += GetChar(); + + ToWide(name_ascii, cur->request->anchor); + + if( !cur->request->anchor.empty() ) + log << log3 << "FP: anchor: " << cur->request->anchor << logend; +} + + +void FunctionParser::SkipSlashes() +{ + while( *path == '/' ) + path += 1; +} + + +int FunctionParser::FromHex(int c) +{ + if( c>='0' && c<='9' ) + return c - '0'; + else + if( c>='a' && c<='f' ) + return c - 'a' + 10; + else + if( c>='A' && c<='F' ) + return c - 'A' + 10; + else + cur->request->status = WINIX_ERR_INCORRECT_URI; + +return 0; +} + + +int FunctionParser::GetChar() +{ +int c; + + if( *path == 0 ) + return 0; + + if( *path == '%' && *(path+1)!=0 && *(path+2)!=0 ) + { + c = (FromHex(*(path+1)) << 4) + FromHex(*(path+2)); + + if( c == 0 ) + cur->request->status = WINIX_ERR_INCORRECT_URI; + + path += 3; + } + else + { + c = *path; + path += 1; + } + +return c; +} + + +void FunctionParser::ToWide(const std::string & src, std::wstring & dst) +{ + dst.clear(); + + if( utf8 ) + Ezc::UTF8ToWide(src, dst, false); + else + AssignString(src, dst, false); +} + + + +void FunctionParser::ReadName() +{ + SkipSlashes(); + name_ascii.clear(); + + while( *path && *path!='/' && *path!='?' && *path!='#' ) + name_ascii += GetChar(); + + ToWide(name_ascii, name); +} + + +void FunctionParser::ReadOrdinaryParName() +{ + name_ascii.clear(); + + while( *path && *path!='=' && *path!='&' && *path!='#' ) + name_ascii += GetChar(); + + ToWide(name_ascii, name); +} + + +void FunctionParser::ReadOrdinaryParValue() +{ + value_ascii.clear(); + + if( *path=='=' ) + path += 1; + + while( *path && *path!='&' && *path!='#' ) + value_ascii += GetChar(); + + ToWide(value_ascii, value); +} + + +void FunctionParser::ReadWinixParName() +{ + name_ascii.clear(); + + while( *path && *path!='/' && *path!=':' && *path!='#' ) + name_ascii += GetChar(); + + ToWide(name_ascii, name); +} + + +void FunctionParser::ReadWinixParValue() +{ + value_ascii.clear(); + + if( *path==':' ) + path += 1; + + while( *path && *path!='/' && *path!='#' ) + value_ascii += GetChar(); + + ToWide(value_ascii, value); } - - - - - - - - - - - - - - - - - - - diff --git a/functions/functionparser.h b/functions/functionparser.h index b1fac31..7cec305 100755 --- a/functions/functionparser.h +++ b/functions/functionparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,7 @@ #ifndef headerfile_winix_functions_functionparser #define headerfile_winix_functions_functionparser +#include #include "db/db.h" #include "core/cur.h" #include "core/system.h" @@ -18,31 +19,57 @@ class Functions; - class FunctionParser { +public: + + FunctionParser(); + bool Parse(Cur * pcur, Db * pdb, Functions * pfunctions, System * psystem); + void UTF8(bool use_utf8); + +private: + Db * db; Cur * cur; System * system; Functions * functions; - GetTab::size_type get_index; - GetTab::size_type get_tab_len; - - void SkipEmptyString(const char * msg); - - void ParseDirectories(); - void ParseItem(); - bool IsAppFunction(); - void ParseFunction(); - void ParseParams(const std::wstring & par); + const char * path; + std::string name_ascii, value_ascii; + std::wstring name, value; + Item * last_dir; + Param param; + bool utf8; + + void SkipSlashes(); + + void ParseDirsItemFunction(); void ParseParams(); + void ParseAnchor(); -public: + bool IsDir(); + bool CheckAddItem(); + bool CheckAddFunction(); + bool AddRootDir(); + void AddDir(); + void AddParam(); + void ParseOrdinaryParams(); + void ParseWinixParams(); + + void ToWide(const std::string & src, std::wstring & dst); + + int FromHex(int c); + int GetChar(); + void ReadName(); + void ReadOrdinaryParName(); + void ReadOrdinaryParValue(); + void ReadWinixParName(); + void ReadWinixParValue(); - void Parse(Cur * pcur, Db * pdb, Functions * pfunctions, System * psystem); }; + #endif + diff --git a/functions/functions.cpp b/functions/functions.cpp index f5503d2..3a77082 100755 --- a/functions/functions.cpp +++ b/functions/functions.cpp @@ -228,6 +228,7 @@ void Functions::Init() void Functions::Parse() { + function_parser.UTF8(config->utf8); function_parser.Parse(cur, db, this, system); } diff --git a/html/fun_ckeditor.html b/html/fun_ckeditor.html index 705d529..79f7149 100755 --- a/html/fun_ckeditor.html +++ b/html/fun_ckeditor.html @@ -31,9 +31,9 @@ [if winix_function_param_is "full"] - + [else] - + [end] diff --git a/main/Makefile.dep b/main/Makefile.dep index a87f683..f899aa9 100755 --- a/main/Makefile.dep +++ b/main/Makefile.dep @@ -23,7 +23,7 @@ main.o: ../core/config.h ../core/users.h ../core/ugcontainer.h main.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h main.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h main.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -main.o: ../core/basethread.h ../core/sessionmanager.h +main.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h main.o: ../core/sessioncontainer.h ../functions/functions.h main.o: ../functions/functionbase.h ../core/request.h ../core/system.h main.o: ../core/synchro.h ../functions/functionparser.h ../core/cur.h @@ -40,9 +40,8 @@ main.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h main.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h main.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h main.o: ../templates/templates.h ../templates/patterncacher.h -main.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h -main.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h -main.o: ../core/compress.h ../core/getparser.h ../core/httpsimpleparser.h -main.o: ../core/postparser.h ../core/cookieparser.h ../core/postmultiparser.h +main.o: ../templates/indexpatterns.h ../core/sessionmanager.h +main.o: ../core/compress.h ../core/postparser.h ../core/httpsimpleparser.h +main.o: ../core/cookieparser.h ../core/postmultiparser.h main.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h main.o: ../core/plugin.h ../core/pluginmsg.h diff --git a/main/main.cpp b/main/main.cpp index e3ffc17..1b31e55 100755 --- a/main/main.cpp +++ b/main/main.cpp @@ -127,11 +127,16 @@ int main(int argv, char ** argc) return 1; log.PutDate(log1); - log << "winix started" << logend << logsave; + log << "winix started" << logend; app.StartThreads(); // now we have more threads, we should use Lock() and Unlock() + // saving all starting logs + app.Lock(); + log << logsave; + app.Unlock(); + // main loop app.Start(); diff --git a/notify/Makefile.dep b/notify/Makefile.dep index 9b2ad62..6f2925d 100755 --- a/notify/Makefile.dep +++ b/notify/Makefile.dep @@ -20,13 +20,12 @@ notify.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h notify.o: ../core/item.h ../db/dbitemcolumns.h ../core/group.h notify.o: ../core/dircontainer.h ../core/ugcontainer.h notify.o: ../templates/templates.h ../templates/patterncacher.h -notify.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h -notify.o: ../core/log.h ../templates/indexpatterns.h ../core/cur.h -notify.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h -notify.o: ../notify/notify.h ../core/mounts.h ../core/mountparser.h -notify.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -notify.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -notify.o: ../core/basethread.h ../core/sessionmanager.h +notify.o: ../templates/indexpatterns.h ../core/cur.h ../core/system.h +notify.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h +notify.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h +notify.o: ../core/run.h ../core/users.h ../core/groups.h ../core/group.h +notify.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h +notify.o: ../core/threadmanager.h ../core/sessionmanager.h notify.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h notify.o: ../core/request.h ../core/dirs.h ../core/synchro.h ../core/plugin.h notify.o: ../core/pluginmsg.h ../core/sessionmanager.h @@ -88,7 +87,8 @@ templatesnotify.o: ../core/dirs.h ../core/dircontainer.h ../notify/notify.h templatesnotify.o: ../core/mounts.h ../core/mountparser.h ../core/crypt.h templatesnotify.o: ../core/run.h ../core/users.h ../core/groups.h templatesnotify.o: ../core/group.h ../core/ugcontainer.h ../core/loadavg.h -templatesnotify.o: ../core/thumb.h ../core/basethread.h ../core/synchro.h +templatesnotify.o: ../core/thumb.h ../core/basethread.h +templatesnotify.o: ../core/threadmanager.h ../core/synchro.h templatesnotify.o: ../functions/functionparser.h ../core/cur.h templatesnotify.o: ../functions/adduser.h ../functions/cat.h templatesnotify.o: ../functions/chmod.h ../functions/privchanger.h @@ -107,8 +107,6 @@ templatesnotify.o: ../functions/tinymce.h ../functions/uname.h templatesnotify.o: ../functions/upload.h ../functions/uptime.h templatesnotify.o: ../functions/who.h ../functions/vim.h ../core/htmlfilter.h templatesnotify.o: ../templates/templates.h ../templates/patterncacher.h -templatesnotify.o: ../templates/ckeditorgetparser.h -templatesnotify.o: ../core/httpsimpleparser.h ../core/log.h templatesnotify.o: ../templates/indexpatterns.h ../templates/localefilter.h templatesnotify.o: ../templates/locale.h ../templates/htmltextstream.h templatesnotify.o: ../core/sessionmanager.h ../core/sessioncontainer.h diff --git a/notify/notify.cpp b/notify/notify.cpp index 56de037..361571b 100755 --- a/notify/notify.cpp +++ b/notify/notify.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ @@ -54,6 +54,10 @@ void Notify::SetDirs(Dirs * pdirs) dirs = pdirs; } +void Notify::SetThreadManager(ThreadManager * pmanager) +{ + thread_manager = pmanager; +} void Notify::Init() @@ -63,8 +67,9 @@ void Notify::Init() notify_thread.SetNotifyPool(¬ify_pool); notify_thread.SetPatterns(&patterns); notify_thread.SetSynchro(synchro); + thread_manager->Add(¬ify_thread); - notify_template_cms = AddTemplate(L"notify_email_cms.txt"); + notify_template_cms = AddTemplate(L"notify_email_cms.txt"); plugin.Call(WINIX_NOTIFY_ADD_TEMPLATE); } @@ -125,26 +130,6 @@ void Notify::ItemChanged(const NotifyMsg & msg) -void Notify::StartThread() -{ - if( !notify_thread.StartThread() ) - log << log1 << "Notify: I can't create a thread for sending emails" << logend; -} - - -void Notify::PrepareToStopThread() -{ - // synchro->was_stop_signal is true - notify_thread.WakeUpThread(); -} - - -void Notify::WaitForThread() -{ - notify_thread.WaitForThread(); -} - - size_t Notify::AddTemplate(const std::wstring & file_name) { size_t index = templates_names.size(); diff --git a/notify/notify.h b/notify/notify.h index 52fe8cc..9b3818c 100755 --- a/notify/notify.h +++ b/notify/notify.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2011, Tomasz Sowa * All rights reserved. * */ @@ -22,6 +22,7 @@ class Config; class Users; class Dirs; class Synchro; +class ThreadManager; class Notify @@ -35,13 +36,10 @@ public: void SetConfig(Config * pconfig); void SetUsers(Users * pusers); void SetDirs(Dirs * pdirs); + void SetThreadManager(ThreadManager * pmanager); void Init(); - void StartThread(); - void PrepareToStopThread(); - void WaitForThread(); - size_t AddTemplate(const std::wstring & file_name); void ReadTemplates(); @@ -55,6 +53,7 @@ private: Dirs * dirs; Users * users; Synchro * synchro; + ThreadManager * thread_manager; NotifyThread notify_thread; NotifyMsg msg; diff --git a/plugins/export/Makefile b/plugins/export/Makefile new file mode 100755 index 0000000..9178cbc --- /dev/null +++ b/plugins/export/Makefile @@ -0,0 +1,27 @@ +include Makefile.o.dep + +name = export.so + + +all: $(name) + +$(name): $(o) + $(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) *.o + + + +%.o: %.cpp + $(CXX) -c $(CXXFLAGS) $< + + + +depend: + makedepend -Y. -I../.. -I../../../ezc/src -f- *.cpp > Makefile.dep + echo -n "o = " > Makefile.o.dep + ls -1 *.cpp | xargs -I foo echo -n foo " " | sed -E "s/([^\.]*)\.cpp[ ]/\1\.o/g" >> Makefile.o.dep + +clean: + rm -f *.o + rm -f $(name) + +include Makefile.dep diff --git a/plugins/export/Makefile.dep b/plugins/export/Makefile.dep new file mode 100755 index 0000000..d800909 --- /dev/null +++ b/plugins/export/Makefile.dep @@ -0,0 +1,56 @@ +# DO NOT DELETE + +exportthread.o: exportthread.h ../../core/basethread.h ../../core/synchro.h +exportthread.o: message.h +init.o: ../../core/log.h ../../core/textstream.h ../../core/misc.h +init.o: ../../core/item.h ../../core/requesttypes.h +init.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h +init.o: ../../core/request.h ../../core/error.h ../../core/config.h +init.o: ../../core/confparser.h ../../core/htmlfilter.h +init.o: ../../templates/htmltextstream.h ../../core/textstream.h +init.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h +init.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h +init.o: ../../core/confparser.h ../../core/plugin.h ../../core/pluginmsg.h +init.o: ../../core/log.h ../../core/system.h ../../core/dirs.h +init.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h +init.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h +init.o: ../../db/dbitemquery.h ../../core/item.h ../../db/dbitemcolumns.h +init.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h +init.o: ../../core/ugcontainer.h ../../notify/notify.h +init.o: ../../notify/notifypool.h ../../templates/misc.h +init.o: ../../templates/localefilter.h ../../templates/locale.h +init.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h +init.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h +init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h +init.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h +init.o: ../../notify/notifythread.h ../../core/basethread.h +init.o: ../../core/synchro.h ../../notify/templatesnotify.h +init.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h +init.o: ../../core/lastcontainer.h ../../core/mounts.h +init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h +init.o: ../../core/users.h ../../core/groups.h ../../core/group.h +init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h +init.o: ../../core/threadmanager.h ../../core/sessionmanager.h +init.o: ../../core/sessioncontainer.h ../../functions/functions.h +init.o: ../../functions/functionbase.h ../../core/request.h +init.o: ../../core/system.h ../../core/synchro.h +init.o: ../../functions/functionparser.h ../../core/cur.h +init.o: ../../functions/adduser.h ../../functions/cat.h +init.o: ../../functions/chmod.h ../../functions/privchanger.h +init.o: ../../functions/chown.h ../../functions/ckeditor.h +init.o: ../../functions/cp.h ../../functions/default.h +init.o: ../../functions/download.h ../../functions/emacs.h +init.o: ../../functions/last.h ../../functions/login.h +init.o: ../../functions/logout.h ../../functions/ln.h ../../functions/ls.h +init.o: ../../functions/mkdir.h ../../functions/mv.h +init.o: ../../functions/nicedit.h ../../functions/node.h +init.o: ../../functions/passwd.h ../../functions/priv.h +init.o: ../../functions/reload.h ../../functions/rm.h +init.o: ../../functions/specialdefault.h ../../functions/stat.h +init.o: ../../functions/subject.h ../../functions/template.h +init.o: ../../functions/tinymce.h ../../functions/uname.h +init.o: ../../functions/upload.h ../../functions/uptime.h +init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h +init.o: ../../templates/templates.h ../../templates/patterncacher.h +init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h +init.o: exportthread.h message.h diff --git a/plugins/export/Makefile.o.dep b/plugins/export/Makefile.o.dep new file mode 100755 index 0000000..9ac61ba --- /dev/null +++ b/plugins/export/Makefile.o.dep @@ -0,0 +1 @@ +o = exportthread.o init.o diff --git a/plugins/export/exportthread.cpp b/plugins/export/exportthread.cpp new file mode 100755 index 0000000..ed93d07 --- /dev/null +++ b/plugins/export/exportthread.cpp @@ -0,0 +1,43 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2011, Tomasz Sowa + * All rights reserved. + * + */ + +#include "exportthread.h" + + +namespace Export +{ + + +void ExportThread::AddMessage(const Message & message) +{ + message_tab.insert(message_tab.end(), message); +} + + +void ExportThread::AddMessage(int type, const std::wstring & url, const std::wstring & path) +{ + message_add_temp.type = type; + message_add_temp.url = url; + message_add_temp.path = path; + + AddMessage(message_add_temp); +} + + + + + + + + + + + + +} // namespace diff --git a/plugins/export/exportthread.h b/plugins/export/exportthread.h new file mode 100755 index 0000000..7381f4a --- /dev/null +++ b/plugins/export/exportthread.h @@ -0,0 +1,43 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2011, Tomasz Sowa + * All rights reserved. + * + */ + +#ifndef headerfile_winix_plugins_export_exportthread +#define headerfile_winix_plugins_export_exportthread + +#include +#include "core/basethread.h" +#include "message.h" + + + +namespace Export +{ + + +class ExportThread : public BaseThread +{ +public: + + + void AddMessage(const Message & message); + void AddMessage(int type, const std::wstring & url, const std::wstring & path); + + +private: + + typedef std::list MessageTab; + MessageTab message_tab; + Message message_add_temp; + + +}; + +} // namespace + +#endif diff --git a/plugins/export/init.cpp b/plugins/export/init.cpp new file mode 100755 index 0000000..aaf4407 --- /dev/null +++ b/plugins/export/init.cpp @@ -0,0 +1,81 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2011, Tomasz Sowa + * All rights reserved. + * + */ + + +#include "core/log.h" +#include "core/plugin.h" +#include "exportthread.h" + + +extern "C" void Init(PluginInfo &); + + + + +namespace Export +{ + + +const wchar_t plugin_name[] = L"export"; +int mount_par_export_conf = -1; +ExportThread export_thread; + + + + + + + +void AddMountParams(PluginInfo & info) +{ +using TemplatesFunctions::system; + + mount_par_export_conf = system->mounts.AddMountPar(L"export_conf"); +} + + + +void FstabChanged(PluginInfo & info) +{ +} + + +void SendFile(PluginInfo & info) +{ + Item & item = *reinterpret_cast(info.p1); + + log << log1 << "bedziemy wysylac strone o tytule: " << item.subject << ", url: " << item.url << logend; +} + + + +void AddEzcFunctions(PluginInfo & info); + +} // namespace + + + + + +void Init(PluginInfo & info) +{ +using namespace Export; + +// plugin.Assign(WINIX_TEMPLATES_CREATEFUNCTIONS, AddEzcFunctions); + plugin.Assign(WINIX_ADD_MOUNTS, AddMountParams); +// plugin.Assign(WINIX_FSTAB_CHANGED, FstabChanged); + + + plugin.Assign(WINIX_FILE_ADDED, SendFile); + plugin.Assign(WINIX_FILE_CHANGED, SendFile); + + info.p1 = (void*)(plugin_name); +} + + diff --git a/plugins/export/message.h b/plugins/export/message.h new file mode 100755 index 0000000..1a4f729 --- /dev/null +++ b/plugins/export/message.h @@ -0,0 +1,37 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2011, Tomasz Sowa + * All rights reserved. + * + */ + +#ifndef headerfile_winix_plugins_export_message +#define headerfile_winix_plugins_export_message + +#include + + + +// message types +#define WINIX_PL_EXPORT_TYPE_CREATE_FILE 1 +#define WINIX_PL_EXPORT_TYPE_CREATE_DIR 2 + + + +struct Message +{ + // message type + int type; + + // original (source) url + std::wstring url; + + // output file (directory) name + // relative path + std::wstring path; + +}; + +#endif diff --git a/plugins/gallery/Makefile.dep b/plugins/gallery/Makefile.dep index 868f10b..bf1dcb9 100755 --- a/plugins/gallery/Makefile.dep +++ b/plugins/gallery/Makefile.dep @@ -28,7 +28,8 @@ gallery.o: ../../core/ugcontainer.h ../../core/lastcontainer.h gallery.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h gallery.o: ../../core/run.h ../../core/users.h ../../core/groups.h gallery.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h -gallery.o: ../../core/basethread.h ../../core/synchro.h galleryinfo.h +gallery.o: ../../core/basethread.h ../../core/threadmanager.h +gallery.o: ../../core/synchro.h galleryinfo.h galleryinfo.o: galleryinfo.h ../../core/item.h init.o: gallery.h ../../functions/functionbase.h ../../core/item.h init.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h @@ -57,12 +58,13 @@ init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h init.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h init.o: ../../core/run.h ../../core/users.h ../../core/groups.h init.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h -init.o: ../../core/basethread.h ../../core/synchro.h galleryinfo.h -init.o: ../../core/log.h ../../core/plugin.h ../../core/pluginmsg.h -init.o: ../../core/system.h ../../core/sessionmanager.h -init.o: ../../core/sessioncontainer.h ../../functions/functions.h -init.o: ../../functions/functionbase.h ../../functions/functionparser.h -init.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h +init.o: ../../core/basethread.h ../../core/threadmanager.h +init.o: ../../core/synchro.h galleryinfo.h ../../core/log.h +init.o: ../../core/plugin.h ../../core/pluginmsg.h ../../core/system.h +init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h +init.o: ../../functions/functions.h ../../functions/functionbase.h +init.o: ../../functions/functionparser.h ../../core/cur.h +init.o: ../../functions/adduser.h ../../functions/cat.h init.o: ../../functions/chmod.h ../../functions/privchanger.h init.o: ../../functions/chown.h ../../functions/ckeditor.h init.o: ../../functions/cp.h ../../functions/default.h @@ -79,9 +81,7 @@ init.o: ../../functions/tinymce.h ../../functions/uname.h init.o: ../../functions/upload.h ../../functions/uptime.h init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h init.o: ../../templates/templates.h ../../templates/patterncacher.h -init.o: ../../templates/ckeditorgetparser.h ../../core/httpsimpleparser.h -init.o: ../../core/log.h ../../templates/indexpatterns.h -init.o: ../../core/sessionmanager.h +init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h templates.o: gallery.h ../../functions/functionbase.h ../../core/item.h templates.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h templates.o: ../../db/dbtextstream.h ../../core/textstream.h @@ -111,12 +111,13 @@ templates.o: ../../core/ugcontainer.h ../../core/lastcontainer.h templates.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h templates.o: ../../core/run.h ../../core/users.h ../../core/groups.h templates.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h -templates.o: ../../core/basethread.h ../../core/synchro.h galleryinfo.h -templates.o: ../../core/misc.h ../../core/plugin.h ../../core/pluginmsg.h -templates.o: ../../core/system.h ../../core/sessionmanager.h -templates.o: ../../core/sessioncontainer.h ../../functions/functions.h -templates.o: ../../functions/functionbase.h ../../functions/functionparser.h -templates.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h +templates.o: ../../core/basethread.h ../../core/threadmanager.h +templates.o: ../../core/synchro.h galleryinfo.h ../../core/misc.h +templates.o: ../../core/plugin.h ../../core/pluginmsg.h ../../core/system.h +templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h +templates.o: ../../functions/functions.h ../../functions/functionbase.h +templates.o: ../../functions/functionparser.h ../../core/cur.h +templates.o: ../../functions/adduser.h ../../functions/cat.h templates.o: ../../functions/chmod.h ../../functions/privchanger.h templates.o: ../../functions/chown.h ../../functions/ckeditor.h templates.o: ../../functions/cp.h ../../functions/default.h @@ -134,6 +135,4 @@ templates.o: ../../functions/uname.h ../../functions/upload.h templates.o: ../../functions/uptime.h ../../functions/who.h templates.o: ../../functions/vim.h ../../core/htmlfilter.h templates.o: ../../templates/templates.h ../../templates/patterncacher.h -templates.o: ../../templates/ckeditorgetparser.h -templates.o: ../../core/httpsimpleparser.h ../../core/log.h templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h diff --git a/plugins/groupitem/Makefile.dep b/plugins/groupitem/Makefile.dep index 881db03..f37b7c1 100755 --- a/plugins/groupitem/Makefile.dep +++ b/plugins/groupitem/Makefile.dep @@ -28,9 +28,10 @@ init.o: ../../core/lastcontainer.h ../../core/mounts.h init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h init.o: ../../core/users.h ../../core/groups.h ../../core/group.h init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h -init.o: ../../functions/functions.h ../../functions/functionbase.h -init.o: ../../core/request.h ../../core/system.h ../../core/synchro.h +init.o: ../../core/threadmanager.h ../../core/sessionmanager.h +init.o: ../../core/sessioncontainer.h ../../functions/functions.h +init.o: ../../functions/functionbase.h ../../core/request.h +init.o: ../../core/system.h ../../core/synchro.h init.o: ../../functions/functionparser.h ../../core/cur.h init.o: ../../functions/adduser.h ../../functions/cat.h init.o: ../../functions/chmod.h ../../functions/privchanger.h @@ -49,21 +50,17 @@ init.o: ../../functions/tinymce.h ../../functions/uname.h init.o: ../../functions/upload.h ../../functions/uptime.h init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h init.o: ../../templates/templates.h ../../templates/patterncacher.h -init.o: ../../templates/ckeditorgetparser.h ../../core/httpsimpleparser.h -init.o: ../../core/log.h ../../templates/indexpatterns.h -init.o: ../../core/sessionmanager.h +init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h templates.o: ../../templates/templates.h ../../../ezc/src/ezc.h templates.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h templates.o: ../../../ezc/src/pattern.h ../../core/item.h templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h templates.o: ../../../ezc/src/stringconv.h ../../core/misc.h templates.o: ../../core/requesttypes.h ../../templates/patterncacher.h -templates.o: ../../core/item.h ../../templates/ckeditorgetparser.h -templates.o: ../../core/httpsimpleparser.h ../../core/log.h -templates.o: ../../templates/indexpatterns.h ../../templates/localefilter.h -templates.o: ../../templates/locale.h ../../core/config.h -templates.o: ../../templates/htmltextstream.h ../../core/cur.h -templates.o: ../../core/system.h ../../core/sessionmanager.h +templates.o: ../../core/item.h ../../templates/indexpatterns.h +templates.o: ../../templates/localefilter.h ../../templates/locale.h +templates.o: ../../core/config.h ../../templates/htmltextstream.h +templates.o: ../../core/cur.h ../../core/system.h ../../core/sessionmanager.h templates.o: ../../core/htmlfilter.h ../../db/db.h ../../db/dbbase.h templates.o: ../../db/dbconn.h ../../db/dbtextstream.h templates.o: ../../core/textstream.h ../../core/error.h @@ -86,23 +83,24 @@ templates.o: ../../core/rebus.h ../../core/mount.h ../../core/mounts.h templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h -templates.o: ../../functions/functions.h ../../functions/functionbase.h -templates.o: ../../core/request.h ../../core/synchro.h -templates.o: ../../functions/functionparser.h ../../functions/adduser.h -templates.o: ../../functions/cat.h ../../functions/chmod.h -templates.o: ../../functions/privchanger.h ../../functions/chown.h -templates.o: ../../functions/ckeditor.h ../../functions/cp.h -templates.o: ../../functions/default.h ../../functions/download.h -templates.o: ../../functions/emacs.h ../../functions/last.h -templates.o: ../../functions/login.h ../../functions/logout.h -templates.o: ../../functions/ln.h ../../functions/ls.h -templates.o: ../../functions/mkdir.h ../../functions/mv.h -templates.o: ../../functions/nicedit.h ../../functions/node.h -templates.o: ../../functions/passwd.h ../../functions/priv.h -templates.o: ../../functions/reload.h ../../functions/rm.h -templates.o: ../../functions/specialdefault.h ../../functions/stat.h -templates.o: ../../functions/subject.h ../../functions/template.h -templates.o: ../../functions/tinymce.h ../../functions/uname.h -templates.o: ../../functions/upload.h ../../functions/uptime.h -templates.o: ../../functions/who.h ../../functions/vim.h +templates.o: ../../core/threadmanager.h ../../core/sessionmanager.h +templates.o: ../../core/sessioncontainer.h ../../functions/functions.h +templates.o: ../../functions/functionbase.h ../../core/request.h +templates.o: ../../core/synchro.h ../../functions/functionparser.h +templates.o: ../../functions/adduser.h ../../functions/cat.h +templates.o: ../../functions/chmod.h ../../functions/privchanger.h +templates.o: ../../functions/chown.h ../../functions/ckeditor.h +templates.o: ../../functions/cp.h ../../functions/default.h +templates.o: ../../functions/download.h ../../functions/emacs.h +templates.o: ../../functions/last.h ../../functions/login.h +templates.o: ../../functions/logout.h ../../functions/ln.h +templates.o: ../../functions/ls.h ../../functions/mkdir.h +templates.o: ../../functions/mv.h ../../functions/nicedit.h +templates.o: ../../functions/node.h ../../functions/passwd.h +templates.o: ../../functions/priv.h ../../functions/reload.h +templates.o: ../../functions/rm.h ../../functions/specialdefault.h +templates.o: ../../functions/stat.h ../../functions/subject.h +templates.o: ../../functions/template.h ../../functions/tinymce.h +templates.o: ../../functions/uname.h ../../functions/upload.h +templates.o: ../../functions/uptime.h ../../functions/who.h +templates.o: ../../functions/vim.h diff --git a/plugins/menu/Makefile.dep b/plugins/menu/Makefile.dep index 575bc6b..856679b 100755 --- a/plugins/menu/Makefile.dep +++ b/plugins/menu/Makefile.dep @@ -28,9 +28,10 @@ init.o: ../../core/lastcontainer.h ../../core/mounts.h init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h init.o: ../../core/users.h ../../core/groups.h ../../core/group.h init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h -init.o: ../../functions/functions.h ../../functions/functionbase.h -init.o: ../../core/request.h ../../core/system.h ../../core/synchro.h +init.o: ../../core/threadmanager.h ../../core/sessionmanager.h +init.o: ../../core/sessioncontainer.h ../../functions/functions.h +init.o: ../../functions/functionbase.h ../../core/request.h +init.o: ../../core/system.h ../../core/synchro.h init.o: ../../functions/functionparser.h ../../core/cur.h init.o: ../../functions/adduser.h ../../functions/cat.h init.o: ../../functions/chmod.h ../../functions/privchanger.h @@ -49,21 +50,17 @@ init.o: ../../functions/tinymce.h ../../functions/uname.h init.o: ../../functions/upload.h ../../functions/uptime.h init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h init.o: ../../templates/templates.h ../../templates/patterncacher.h -init.o: ../../templates/ckeditorgetparser.h ../../core/httpsimpleparser.h -init.o: ../../core/log.h ../../templates/indexpatterns.h -init.o: ../../core/sessionmanager.h +init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h templates.o: ../../templates/templates.h ../../../ezc/src/ezc.h templates.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h templates.o: ../../../ezc/src/pattern.h ../../core/item.h templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h templates.o: ../../../ezc/src/stringconv.h ../../core/misc.h templates.o: ../../core/requesttypes.h ../../templates/patterncacher.h -templates.o: ../../core/item.h ../../templates/ckeditorgetparser.h -templates.o: ../../core/httpsimpleparser.h ../../core/log.h -templates.o: ../../templates/indexpatterns.h ../../templates/localefilter.h -templates.o: ../../templates/locale.h ../../core/config.h -templates.o: ../../templates/htmltextstream.h ../../core/cur.h -templates.o: ../../core/system.h ../../core/sessionmanager.h +templates.o: ../../core/item.h ../../templates/indexpatterns.h +templates.o: ../../templates/localefilter.h ../../templates/locale.h +templates.o: ../../core/config.h ../../templates/htmltextstream.h +templates.o: ../../core/cur.h ../../core/system.h ../../core/sessionmanager.h templates.o: ../../core/htmlfilter.h ../../db/db.h ../../db/dbbase.h templates.o: ../../db/dbconn.h ../../db/dbtextstream.h templates.o: ../../core/textstream.h ../../core/error.h @@ -86,24 +83,25 @@ templates.o: ../../core/rebus.h ../../core/mount.h ../../core/mounts.h templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h -templates.o: ../../functions/functions.h ../../functions/functionbase.h -templates.o: ../../core/request.h ../../core/synchro.h -templates.o: ../../functions/functionparser.h ../../functions/adduser.h -templates.o: ../../functions/cat.h ../../functions/chmod.h -templates.o: ../../functions/privchanger.h ../../functions/chown.h -templates.o: ../../functions/ckeditor.h ../../functions/cp.h -templates.o: ../../functions/default.h ../../functions/download.h -templates.o: ../../functions/emacs.h ../../functions/last.h -templates.o: ../../functions/login.h ../../functions/logout.h -templates.o: ../../functions/ln.h ../../functions/ls.h -templates.o: ../../functions/mkdir.h ../../functions/mv.h -templates.o: ../../functions/nicedit.h ../../functions/node.h -templates.o: ../../functions/passwd.h ../../functions/priv.h -templates.o: ../../functions/reload.h ../../functions/rm.h -templates.o: ../../functions/specialdefault.h ../../functions/stat.h -templates.o: ../../functions/subject.h ../../functions/template.h -templates.o: ../../functions/tinymce.h ../../functions/uname.h -templates.o: ../../functions/upload.h ../../functions/uptime.h -templates.o: ../../functions/who.h ../../functions/vim.h ../../core/log.h +templates.o: ../../core/threadmanager.h ../../core/sessionmanager.h +templates.o: ../../core/sessioncontainer.h ../../functions/functions.h +templates.o: ../../functions/functionbase.h ../../core/request.h +templates.o: ../../core/synchro.h ../../functions/functionparser.h +templates.o: ../../functions/adduser.h ../../functions/cat.h +templates.o: ../../functions/chmod.h ../../functions/privchanger.h +templates.o: ../../functions/chown.h ../../functions/ckeditor.h +templates.o: ../../functions/cp.h ../../functions/default.h +templates.o: ../../functions/download.h ../../functions/emacs.h +templates.o: ../../functions/last.h ../../functions/login.h +templates.o: ../../functions/logout.h ../../functions/ln.h +templates.o: ../../functions/ls.h ../../functions/mkdir.h +templates.o: ../../functions/mv.h ../../functions/nicedit.h +templates.o: ../../functions/node.h ../../functions/passwd.h +templates.o: ../../functions/priv.h ../../functions/reload.h +templates.o: ../../functions/rm.h ../../functions/specialdefault.h +templates.o: ../../functions/stat.h ../../functions/subject.h +templates.o: ../../functions/template.h ../../functions/tinymce.h +templates.o: ../../functions/uname.h ../../functions/upload.h +templates.o: ../../functions/uptime.h ../../functions/who.h +templates.o: ../../functions/vim.h ../../core/log.h templates.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/misc.h diff --git a/plugins/stats/Makefile.dep b/plugins/stats/Makefile.dep index 4985d73..7f163af 100755 --- a/plugins/stats/Makefile.dep +++ b/plugins/stats/Makefile.dep @@ -30,11 +30,11 @@ init.o: ../../core/lastcontainer.h ../../core/mounts.h init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h init.o: ../../core/users.h ../../core/groups.h ../../core/group.h init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -init.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h -init.o: ../../functions/functions.h ../../functions/functionbase.h -init.o: ../../core/system.h ../../core/synchro.h -init.o: ../../functions/functionparser.h ../../core/cur.h -init.o: ../../functions/adduser.h ../../functions/cat.h +init.o: ../../core/threadmanager.h ../../core/sessionmanager.h +init.o: ../../core/sessioncontainer.h ../../functions/functions.h +init.o: ../../functions/functionbase.h ../../core/system.h +init.o: ../../core/synchro.h ../../functions/functionparser.h +init.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h init.o: ../../functions/chmod.h ../../functions/privchanger.h init.o: ../../functions/chown.h ../../functions/ckeditor.h init.o: ../../functions/cp.h ../../functions/default.h @@ -51,9 +51,8 @@ init.o: ../../functions/tinymce.h ../../functions/uname.h init.o: ../../functions/upload.h ../../functions/uptime.h init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h init.o: ../../templates/templates.h ../../templates/patterncacher.h -init.o: ../../templates/ckeditorgetparser.h ../../core/httpsimpleparser.h -init.o: ../../core/log.h ../../templates/indexpatterns.h -init.o: ../../core/sessionmanager.h statssession.h ../../core/plugindata.h +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 ../../core/textstream.h stats.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h stats.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h @@ -91,9 +90,10 @@ templates.o: ../../core/rebus.h ../../core/mount.h ../../core/mounts.h templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h -templates.o: ../../functions/functions.h ../../functions/functionbase.h -templates.o: ../../core/request.h ../../core/system.h ../../core/synchro.h +templates.o: ../../core/threadmanager.h ../../core/sessionmanager.h +templates.o: ../../core/sessioncontainer.h ../../functions/functions.h +templates.o: ../../functions/functionbase.h ../../core/request.h +templates.o: ../../core/system.h ../../core/synchro.h templates.o: ../../functions/functionparser.h ../../core/cur.h templates.o: ../../functions/adduser.h ../../functions/cat.h templates.o: ../../functions/chmod.h ../../functions/privchanger.h @@ -113,7 +113,5 @@ templates.o: ../../functions/uname.h ../../functions/upload.h templates.o: ../../functions/uptime.h ../../functions/who.h templates.o: ../../functions/vim.h ../../core/htmlfilter.h templates.o: ../../templates/templates.h ../../templates/patterncacher.h -templates.o: ../../templates/ckeditorgetparser.h -templates.o: ../../core/httpsimpleparser.h ../../core/log.h templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h templates.o: ../../core/misc.h stats.h diff --git a/plugins/thread/Makefile.dep b/plugins/thread/Makefile.dep index 22f719a..02e691d 100755 --- a/plugins/thread/Makefile.dep +++ b/plugins/thread/Makefile.dep @@ -32,9 +32,9 @@ createthread.o: ../../core/mounts.h ../../core/mountparser.h createthread.o: ../../core/crypt.h ../../core/run.h ../../core/users.h createthread.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h createthread.o: ../../core/thumb.h ../../core/basethread.h -createthread.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h -createthread.o: threadinfo.h ../../functions/functions.h -createthread.o: ../../functions/functionbase.h +createthread.o: ../../core/threadmanager.h ../../core/synchro.h tdb.h +createthread.o: thread.h ../../db/dbbase.h threadinfo.h +createthread.o: ../../functions/functions.h ../../functions/functionbase.h createthread.o: ../../functions/functionparser.h ../../core/cur.h createthread.o: ../../functions/adduser.h ../../functions/cat.h createthread.o: ../../functions/chmod.h ../../functions/privchanger.h @@ -82,8 +82,9 @@ funthread.o: ../../core/ugcontainer.h ../../core/lastcontainer.h funthread.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h funthread.o: ../../core/run.h ../../core/users.h ../../core/groups.h funthread.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h -funthread.o: ../../core/basethread.h ../../core/synchro.h tdb.h thread.h -funthread.o: ../../db/dbbase.h threadinfo.h +funthread.o: ../../core/basethread.h ../../core/threadmanager.h +funthread.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h +funthread.o: threadinfo.h init.o: tdb.h thread.h ../../db/dbbase.h ../../core/error.h reply.h init.o: ../../functions/functionbase.h ../../core/item.h ../../db/db.h init.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h @@ -112,9 +113,10 @@ init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h init.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h init.o: ../../core/run.h ../../core/users.h ../../core/groups.h init.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h -init.o: ../../core/basethread.h ../../core/synchro.h threadinfo.h funthread.h -init.o: createthread.h showthreads.h ../../core/log.h ../../core/plugin.h -init.o: pluginmsg.h ../../core/system.h ../../core/sessionmanager.h +init.o: ../../core/basethread.h ../../core/threadmanager.h +init.o: ../../core/synchro.h threadinfo.h funthread.h createthread.h +init.o: showthreads.h ../../core/log.h ../../core/plugin.h pluginmsg.h +init.o: ../../core/system.h ../../core/sessionmanager.h init.o: ../../core/sessioncontainer.h ../../functions/functions.h init.o: ../../functions/functionbase.h ../../functions/functionparser.h init.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h @@ -134,9 +136,8 @@ init.o: ../../functions/tinymce.h ../../functions/uname.h init.o: ../../functions/upload.h ../../functions/uptime.h init.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h init.o: ../../templates/templates.h ../../templates/patterncacher.h -init.o: ../../templates/ckeditorgetparser.h ../../core/httpsimpleparser.h -init.o: ../../core/log.h ../../templates/indexpatterns.h -init.o: ../../core/sessionmanager.h templates.h +init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h +init.o: templates.h reply.o: reply.h ../../functions/functionbase.h ../../core/item.h reply.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h reply.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h @@ -165,10 +166,10 @@ reply.o: ../../core/lastcontainer.h ../../core/mounts.h reply.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h reply.o: ../../core/users.h ../../core/groups.h ../../core/group.h reply.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -reply.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h threadinfo.h -reply.o: ../../functions/functions.h ../../functions/functionbase.h -reply.o: ../../functions/functionparser.h ../../core/cur.h -reply.o: ../../functions/adduser.h ../../functions/cat.h +reply.o: ../../core/threadmanager.h ../../core/synchro.h tdb.h thread.h +reply.o: ../../db/dbbase.h threadinfo.h ../../functions/functions.h +reply.o: ../../functions/functionbase.h ../../functions/functionparser.h +reply.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h reply.o: ../../functions/chmod.h ../../functions/privchanger.h reply.o: ../../functions/chown.h ../../functions/ckeditor.h reply.o: ../../functions/cp.h ../../functions/default.h @@ -187,9 +188,8 @@ reply.o: ../../functions/who.h ../../functions/vim.h ../../core/htmlfilter.h reply.o: ../../core/misc.h ../../core/plugin.h pluginmsg.h reply.o: ../../core/system.h ../../core/sessionmanager.h reply.o: ../../core/sessioncontainer.h ../../templates/templates.h -reply.o: ../../templates/patterncacher.h ../../templates/ckeditorgetparser.h -reply.o: ../../core/httpsimpleparser.h ../../core/log.h -reply.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h +reply.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h +reply.o: ../../core/sessionmanager.h showthreads.o: showthreads.h ../../functions/functionbase.h ../../core/item.h showthreads.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h showthreads.o: ../../db/dbtextstream.h ../../core/textstream.h @@ -220,8 +220,9 @@ showthreads.o: ../../core/lastcontainer.h ../../core/mounts.h showthreads.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h showthreads.o: ../../core/users.h ../../core/groups.h ../../core/group.h showthreads.o: ../../core/loadavg.h ../../core/thumb.h -showthreads.o: ../../core/basethread.h ../../core/synchro.h tdb.h thread.h -showthreads.o: ../../db/dbbase.h threadinfo.h +showthreads.o: ../../core/basethread.h ../../core/threadmanager.h +showthreads.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h +showthreads.o: threadinfo.h tdb.o: tdb.h thread.h ../../db/dbbase.h ../../core/error.h ../../core/log.h templates.o: threadinfo.h ../../core/item.h ../../core/system.h templates.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h @@ -251,8 +252,8 @@ templates.o: ../../core/lastcontainer.h ../../core/mounts.h templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -templates.o: thread.h tdb.h ../../db/dbbase.h reply.h -templates.o: ../../functions/functionbase.h ../../core/request.h +templates.o: ../../core/threadmanager.h thread.h tdb.h ../../db/dbbase.h +templates.o: reply.h ../../functions/functionbase.h ../../core/request.h templates.o: ../../core/synchro.h funthread.h createthread.h showthreads.h templates.o: ../../core/misc.h ../../core/plugin.h pluginmsg.h templates.o: ../../core/system.h ../../core/sessionmanager.h @@ -276,8 +277,6 @@ templates.o: ../../functions/uname.h ../../functions/upload.h templates.o: ../../functions/uptime.h ../../functions/who.h templates.o: ../../functions/vim.h ../../core/htmlfilter.h templates.o: ../../templates/templates.h ../../templates/patterncacher.h -templates.o: ../../templates/ckeditorgetparser.h -templates.o: ../../core/httpsimpleparser.h ../../core/log.h templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h threadinfo.o: threadinfo.h ../../core/item.h ../../core/system.h threadinfo.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h @@ -307,4 +306,4 @@ threadinfo.o: ../../core/lastcontainer.h ../../core/mounts.h threadinfo.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h threadinfo.o: ../../core/users.h ../../core/groups.h ../../core/group.h threadinfo.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -threadinfo.o: thread.h tdb.h ../../db/dbbase.h +threadinfo.o: ../../core/threadmanager.h thread.h tdb.h ../../db/dbbase.h diff --git a/plugins/ticket/Makefile.dep b/plugins/ticket/Makefile.dep index b76a0b5..1ca2cb7 100755 --- a/plugins/ticket/Makefile.dep +++ b/plugins/ticket/Makefile.dep @@ -32,8 +32,9 @@ createticket.o: ../../core/mounts.h ../../core/mountparser.h createticket.o: ../../core/crypt.h ../../core/run.h ../../core/users.h createticket.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h createticket.o: ../../core/thumb.h ../../core/basethread.h -createticket.o: ../../core/synchro.h ticketinfo.h ticketparser.h ticketconf.h -createticket.o: ../../functions/functions.h ../../functions/functionbase.h +createticket.o: ../../core/threadmanager.h ../../core/synchro.h ticketinfo.h +createticket.o: ticketparser.h ticketconf.h ../../functions/functions.h +createticket.o: ../../functions/functionbase.h createticket.o: ../../functions/functionparser.h ../../core/cur.h createticket.o: ../../functions/adduser.h ../../functions/cat.h createticket.o: ../../functions/chmod.h ../../functions/privchanger.h @@ -82,28 +83,28 @@ editticket.o: ../../core/lastcontainer.h ../../core/mounts.h editticket.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h editticket.o: ../../core/users.h ../../core/groups.h ../../core/group.h editticket.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -editticket.o: ../../functions/functions.h ../../functions/functionbase.h -editticket.o: ../../functions/functionparser.h ../../core/cur.h -editticket.o: ../../functions/adduser.h ../../functions/cat.h -editticket.o: ../../functions/chmod.h ../../functions/privchanger.h -editticket.o: ../../core/request.h ../../functions/chown.h -editticket.o: ../../functions/ckeditor.h ../../functions/cp.h -editticket.o: ../../functions/default.h ../../functions/download.h -editticket.o: ../../functions/emacs.h ../../functions/last.h -editticket.o: ../../functions/login.h ../../functions/logout.h -editticket.o: ../../functions/ln.h ../../functions/ls.h -editticket.o: ../../functions/mkdir.h ../../functions/mv.h -editticket.o: ../../functions/nicedit.h ../../functions/node.h -editticket.o: ../../functions/passwd.h ../../functions/priv.h -editticket.o: ../../functions/reload.h ../../functions/rm.h -editticket.o: ../../functions/specialdefault.h ../../functions/stat.h -editticket.o: ../../functions/subject.h ../../functions/template.h -editticket.o: ../../functions/tinymce.h ../../functions/uname.h -editticket.o: ../../functions/upload.h ../../functions/uptime.h -editticket.o: ../../functions/who.h ../../functions/vim.h -editticket.o: ../../core/htmlfilter.h ../../functions/functionbase.h -editticket.o: ../../core/synchro.h sessiondata.h ../../core/plugindata.h -editticket.o: ../../functions/rm.h +editticket.o: ../../core/threadmanager.h ../../functions/functions.h +editticket.o: ../../functions/functionbase.h ../../functions/functionparser.h +editticket.o: ../../core/cur.h ../../functions/adduser.h +editticket.o: ../../functions/cat.h ../../functions/chmod.h +editticket.o: ../../functions/privchanger.h ../../core/request.h +editticket.o: ../../functions/chown.h ../../functions/ckeditor.h +editticket.o: ../../functions/cp.h ../../functions/default.h +editticket.o: ../../functions/download.h ../../functions/emacs.h +editticket.o: ../../functions/last.h ../../functions/login.h +editticket.o: ../../functions/logout.h ../../functions/ln.h +editticket.o: ../../functions/ls.h ../../functions/mkdir.h +editticket.o: ../../functions/mv.h ../../functions/nicedit.h +editticket.o: ../../functions/node.h ../../functions/passwd.h +editticket.o: ../../functions/priv.h ../../functions/reload.h +editticket.o: ../../functions/rm.h ../../functions/specialdefault.h +editticket.o: ../../functions/stat.h ../../functions/subject.h +editticket.o: ../../functions/template.h ../../functions/tinymce.h +editticket.o: ../../functions/uname.h ../../functions/upload.h +editticket.o: ../../functions/uptime.h ../../functions/who.h +editticket.o: ../../functions/vim.h ../../core/htmlfilter.h +editticket.o: ../../functions/functionbase.h ../../core/synchro.h +editticket.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h funticket.o: funticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h funticket.o: ../../db/dbtextstream.h ../../core/textstream.h funticket.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h @@ -133,9 +134,9 @@ funticket.o: ../../core/lastcontainer.h ../../core/mounts.h funticket.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h funticket.o: ../../core/users.h ../../core/groups.h ../../core/group.h funticket.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -funticket.o: ../../functions/functions.h ../../functions/functionbase.h -funticket.o: ../../functions/functionparser.h ../../core/cur.h -funticket.o: ../../functions/adduser.h ../../functions/cat.h +funticket.o: ../../core/threadmanager.h ../../functions/functions.h +funticket.o: ../../functions/functionbase.h ../../functions/functionparser.h +funticket.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h funticket.o: ../../functions/chmod.h ../../functions/privchanger.h funticket.o: ../../core/request.h ../../functions/chown.h funticket.o: ../../functions/ckeditor.h ../../functions/cp.h @@ -156,11 +157,8 @@ funticket.o: ../../core/htmlfilter.h ../../functions/functionbase.h funticket.o: ../../core/synchro.h ../../core/plugin.h pluginmsg.h funticket.o: ../../core/system.h ../../core/sessionmanager.h funticket.o: ../../core/sessioncontainer.h ../../templates/templates.h -funticket.o: ../../templates/patterncacher.h -funticket.o: ../../templates/ckeditorgetparser.h -funticket.o: ../../core/httpsimpleparser.h ../../core/log.h -funticket.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h -funticket.o: ../../plugins/thread/pluginmsg.h +funticket.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h +funticket.o: ../../core/sessionmanager.h ../../plugins/thread/pluginmsg.h init.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h init.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h init.o: ../../core/item.h ../../core/requesttypes.h ../../core/error.h @@ -189,9 +187,9 @@ init.o: ../../core/lastcontainer.h ../../core/mounts.h init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h init.o: ../../core/users.h ../../core/groups.h ../../core/group.h init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -init.o: ../../functions/functions.h ../../functions/functionbase.h -init.o: ../../functions/functionparser.h ../../core/cur.h -init.o: ../../functions/adduser.h ../../functions/cat.h +init.o: ../../core/threadmanager.h ../../functions/functions.h +init.o: ../../functions/functionbase.h ../../functions/functionparser.h +init.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h init.o: ../../functions/chmod.h ../../functions/privchanger.h init.o: ../../core/request.h ../../functions/chown.h init.o: ../../functions/ckeditor.h ../../functions/cp.h @@ -211,12 +209,11 @@ init.o: ../../functions/functionbase.h ../../core/synchro.h editticket.h init.o: createticket.h showtickets.h ../../core/log.h ../../core/plugin.h init.o: pluginmsg.h ../../core/system.h ../../core/sessionmanager.h init.o: ../../core/sessioncontainer.h ../../templates/templates.h -init.o: ../../templates/patterncacher.h ../../templates/ckeditorgetparser.h -init.o: ../../core/httpsimpleparser.h ../../core/log.h -init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h -init.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h -init.o: ../../plugins/thread/showthreads.h ../../plugins/thread/threadinfo.h -init.o: ../../plugins/thread/thread.h ../../plugins/thread/pluginmsg.h +init.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h +init.o: ../../core/sessionmanager.h sessiondata.h ../../core/plugindata.h +init.o: ../../functions/rm.h ../../plugins/thread/showthreads.h +init.o: ../../plugins/thread/threadinfo.h ../../plugins/thread/thread.h +init.o: ../../plugins/thread/pluginmsg.h sessiondata.o: sessiondata.h ../../core/plugindata.h ticket.h sessiondata.o: ../../functions/rm.h showtickets.o: showtickets.h tdb.h ticket.h ../../db/dbbase.h @@ -250,7 +247,8 @@ showtickets.o: ../../core/mounts.h ../../core/mountparser.h showtickets.o: ../../core/crypt.h ../../core/run.h ../../core/users.h showtickets.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h showtickets.o: ../../core/thumb.h ../../core/basethread.h -showtickets.o: ../../functions/functions.h ../../functions/functionbase.h +showtickets.o: ../../core/threadmanager.h ../../functions/functions.h +showtickets.o: ../../functions/functionbase.h showtickets.o: ../../functions/functionparser.h ../../core/cur.h showtickets.o: ../../functions/adduser.h ../../functions/cat.h showtickets.o: ../../functions/chmod.h ../../functions/privchanger.h @@ -275,8 +273,6 @@ showtickets.o: ../../plugins/thread/pluginmsg.h ../../core/plugin.h showtickets.o: ../../core/system.h ../../core/sessionmanager.h showtickets.o: ../../core/sessioncontainer.h ../../templates/templates.h showtickets.o: ../../templates/patterncacher.h -showtickets.o: ../../templates/ckeditorgetparser.h -showtickets.o: ../../core/httpsimpleparser.h ../../core/log.h showtickets.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h tdb.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h tdb.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h @@ -310,9 +306,9 @@ templates.o: ../../core/lastcontainer.h ../../core/mounts.h templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -templates.o: ../../functions/functions.h ../../functions/functionbase.h -templates.o: ../../functions/functionparser.h ../../core/cur.h -templates.o: ../../functions/adduser.h ../../functions/cat.h +templates.o: ../../core/threadmanager.h ../../functions/functions.h +templates.o: ../../functions/functionbase.h ../../functions/functionparser.h +templates.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h templates.o: ../../functions/chmod.h ../../functions/privchanger.h templates.o: ../../core/request.h ../../functions/chown.h templates.o: ../../functions/ckeditor.h ../../functions/cp.h @@ -335,11 +331,9 @@ templates.o: editticket.h ../../functions/functionbase.h ../../core/synchro.h templates.o: createticket.h ../../core/misc.h ../../core/plugin.h pluginmsg.h templates.o: ../../core/system.h ../../core/sessionmanager.h templates.o: ../../core/sessioncontainer.h ../../templates/templates.h -templates.o: ../../templates/patterncacher.h -templates.o: ../../templates/ckeditorgetparser.h -templates.o: ../../core/httpsimpleparser.h ../../core/log.h -templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h -templates.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h +templates.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h +templates.o: ../../core/sessionmanager.h sessiondata.h +templates.o: ../../core/plugindata.h ../../functions/rm.h templates.o: ../../plugins/thread/pluginmsg.h ticketconf.o: ticketconf.h ticketinfo.o: ticketinfo.h ticket.h ticketparser.h ticketconf.h @@ -370,28 +364,28 @@ ticketinfo.o: ../../core/lastcontainer.h ../../core/mounts.h ticketinfo.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h ticketinfo.o: ../../core/users.h ../../core/groups.h ../../core/group.h ticketinfo.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h -ticketinfo.o: ../../functions/functions.h ../../functions/functionbase.h -ticketinfo.o: ../../functions/functionparser.h ../../core/cur.h -ticketinfo.o: ../../functions/adduser.h ../../functions/cat.h -ticketinfo.o: ../../functions/chmod.h ../../functions/privchanger.h -ticketinfo.o: ../../core/request.h ../../functions/chown.h -ticketinfo.o: ../../functions/ckeditor.h ../../functions/cp.h -ticketinfo.o: ../../functions/default.h ../../functions/download.h -ticketinfo.o: ../../functions/emacs.h ../../functions/last.h -ticketinfo.o: ../../functions/login.h ../../functions/logout.h -ticketinfo.o: ../../functions/ln.h ../../functions/ls.h -ticketinfo.o: ../../functions/mkdir.h ../../functions/mv.h -ticketinfo.o: ../../functions/nicedit.h ../../functions/node.h -ticketinfo.o: ../../functions/passwd.h ../../functions/priv.h -ticketinfo.o: ../../functions/reload.h ../../functions/rm.h -ticketinfo.o: ../../functions/specialdefault.h ../../functions/stat.h -ticketinfo.o: ../../functions/subject.h ../../functions/template.h -ticketinfo.o: ../../functions/tinymce.h ../../functions/uname.h -ticketinfo.o: ../../functions/upload.h ../../functions/uptime.h -ticketinfo.o: ../../functions/who.h ../../functions/vim.h -ticketinfo.o: ../../core/htmlfilter.h tdb.h ../../db/dbbase.h -ticketinfo.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h -ticketinfo.o: ../../core/log.h ../../core/misc.h sessiondata.h -ticketinfo.o: ../../core/plugindata.h ../../functions/rm.h +ticketinfo.o: ../../core/threadmanager.h ../../functions/functions.h +ticketinfo.o: ../../functions/functionbase.h ../../functions/functionparser.h +ticketinfo.o: ../../core/cur.h ../../functions/adduser.h +ticketinfo.o: ../../functions/cat.h ../../functions/chmod.h +ticketinfo.o: ../../functions/privchanger.h ../../core/request.h +ticketinfo.o: ../../functions/chown.h ../../functions/ckeditor.h +ticketinfo.o: ../../functions/cp.h ../../functions/default.h +ticketinfo.o: ../../functions/download.h ../../functions/emacs.h +ticketinfo.o: ../../functions/last.h ../../functions/login.h +ticketinfo.o: ../../functions/logout.h ../../functions/ln.h +ticketinfo.o: ../../functions/ls.h ../../functions/mkdir.h +ticketinfo.o: ../../functions/mv.h ../../functions/nicedit.h +ticketinfo.o: ../../functions/node.h ../../functions/passwd.h +ticketinfo.o: ../../functions/priv.h ../../functions/reload.h +ticketinfo.o: ../../functions/rm.h ../../functions/specialdefault.h +ticketinfo.o: ../../functions/stat.h ../../functions/subject.h +ticketinfo.o: ../../functions/template.h ../../functions/tinymce.h +ticketinfo.o: ../../functions/uname.h ../../functions/upload.h +ticketinfo.o: ../../functions/uptime.h ../../functions/who.h +ticketinfo.o: ../../functions/vim.h ../../core/htmlfilter.h tdb.h +ticketinfo.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h +ticketinfo.o: ../../core/error.h ../../core/log.h ../../core/misc.h +ticketinfo.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h ticketparser.o: ticketparser.h ticketconf.h ../../core/log.h ticketparser.o: ../../core/misc.h diff --git a/templates/Makefile.dep b/templates/Makefile.dep index 07924b1..0989949 100755 --- a/templates/Makefile.dep +++ b/templates/Makefile.dep @@ -6,62 +6,60 @@ adduser.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h adduser.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.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 ../core/logmanipulators.h ../core/slog.h -adduser.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -adduser.o: ../core/error.h ../core/config.h ../core/confparser.h -adduser.o: ../core/htmlfilter.h ../templates/htmltextstream.h +adduser.o: indexpatterns.h ../core/config.h ../core/confparser.h +adduser.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h +adduser.o: ../core/requesttypes.h ../core/error.h ../core/config.h +adduser.o: ../core/textstream.h ../templates/htmltextstream.h adduser.o: ../core/session.h ../core/user.h ../core/plugindata.h -adduser.o: ../core/rebus.h ../core/mount.h ../templates/locale.h -adduser.o: indexpatterns.h ../core/config.h ../core/cur.h ../core/system.h -adduser.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h -adduser.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h -adduser.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h -adduser.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h +adduser.o: ../core/rebus.h ../core/mount.h ../core/system.h ../core/dirs.h +adduser.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +adduser.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h +adduser.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h +adduser.o: ../core/ugcontainer.h ../core/log.h ../core/logmanipulators.h +adduser.o: ../core/slog.h ../core/cur.h ../templates/locale.h adduser.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h adduser.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h adduser.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h adduser.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h adduser.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h adduser.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -adduser.o: ../core/basethread.h ../core/sessionmanager.h -adduser.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -adduser.o: ../core/request.h +adduser.o: ../core/basethread.h ../core/threadmanager.h +adduser.o: ../core/sessionmanager.h ../core/sessioncontainer.h +adduser.o: ../core/system.h ../core/htmlfilter.h ../core/request.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/funinfo.h ../../ezc/src/functions.h dir.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.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: ../core/logmanipulators.h ../core/slog.h ../core/cur.h -dir.o: ../core/request.h ../core/requesttypes.h ../core/error.h +dir.o: ../core/user.h patterncacher.h ../core/item.h indexpatterns.h dir.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h -dir.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -dir.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h -dir.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h -dir.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h -dir.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h -dir.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h -dir.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -dir.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -dir.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -dir.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -dir.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -dir.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -dir.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h -dir.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -dir.o: ../core/htmlfilter.h ../core/misc.h ../functions/functions.h -dir.o: ../functions/functionbase.h ../core/request.h ../core/synchro.h -dir.o: ../functions/functionparser.h ../functions/adduser.h -dir.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h -dir.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h -dir.o: ../functions/default.h ../functions/download.h ../functions/emacs.h -dir.o: ../functions/last.h ../functions/login.h ../functions/logout.h -dir.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h -dir.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h -dir.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h -dir.o: ../functions/rm.h ../functions/specialdefault.h ../functions/stat.h +dir.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h +dir.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h +dir.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h +dir.o: ../core/mount.h ../core/system.h ../core/dirs.h ../core/dircontainer.h +dir.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h +dir.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h +dir.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +dir.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h +dir.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h +dir.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h +dir.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h +dir.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +dir.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +dir.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +dir.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h +dir.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h +dir.o: ../core/misc.h ../functions/functions.h ../functions/functionbase.h +dir.o: ../core/request.h ../core/synchro.h ../functions/functionparser.h +dir.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h +dir.o: ../functions/privchanger.h ../functions/chown.h +dir.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h +dir.o: ../functions/download.h ../functions/emacs.h ../functions/last.h +dir.o: ../functions/login.h ../functions/logout.h ../functions/ln.h +dir.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h +dir.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h +dir.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h +dir.o: ../functions/specialdefault.h ../functions/stat.h dir.o: ../functions/subject.h ../functions/template.h ../functions/tinymce.h dir.o: ../functions/uname.h ../functions/upload.h ../functions/uptime.h dir.o: ../functions/who.h ../functions/vim.h @@ -70,53 +68,51 @@ doc.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h doc.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h doc.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.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: ../core/logmanipulators.h ../core/slog.h ../core/cur.h -doc.o: ../core/request.h ../core/requesttypes.h ../core/error.h +doc.o: ../core/user.h patterncacher.h ../core/item.h indexpatterns.h doc.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h -doc.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -doc.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h -doc.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h -doc.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h -doc.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h -doc.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h -doc.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -doc.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -doc.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -doc.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -doc.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -doc.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -doc.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h -doc.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -doc.o: ../core/htmlfilter.h ../core/request.h ../core/misc.h +doc.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h +doc.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h +doc.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h +doc.o: ../core/mount.h ../core/system.h ../core/dirs.h ../core/dircontainer.h +doc.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h +doc.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h +doc.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +doc.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h +doc.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h +doc.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h +doc.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h +doc.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +doc.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +doc.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +doc.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h +doc.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h +doc.o: ../core/request.h ../core/misc.h filters.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h filters.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h filters.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h filters.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h filters.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h filters.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h -filters.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h -filters.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -filters.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -filters.o: ../core/error.h ../core/config.h ../core/confparser.h -filters.o: ../core/htmlfilter.h ../templates/htmltextstream.h +filters.o: indexpatterns.h ../core/config.h ../core/confparser.h +filters.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h +filters.o: ../core/requesttypes.h ../core/error.h ../core/config.h +filters.o: ../core/textstream.h ../templates/htmltextstream.h filters.o: ../core/session.h ../core/user.h ../core/plugindata.h -filters.o: ../core/rebus.h ../core/mount.h ../templates/locale.h -filters.o: indexpatterns.h ../core/config.h ../core/cur.h ../core/system.h -filters.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h -filters.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h -filters.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h -filters.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h +filters.o: ../core/rebus.h ../core/mount.h ../core/system.h ../core/dirs.h +filters.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +filters.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h +filters.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h +filters.o: ../core/ugcontainer.h ../core/log.h ../core/logmanipulators.h +filters.o: ../core/slog.h ../core/cur.h ../templates/locale.h filters.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h filters.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h filters.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h filters.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h filters.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h filters.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -filters.o: ../core/basethread.h ../core/sessionmanager.h -filters.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -filters.o: ../core/misc.h +filters.o: ../core/basethread.h ../core/threadmanager.h +filters.o: ../core/sessionmanager.h ../core/sessioncontainer.h +filters.o: ../core/system.h ../core/htmlfilter.h ../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 @@ -129,64 +125,59 @@ indexpatterns.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h indexpatterns.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h indexpatterns.o: localefilter.h locale.h ../core/confparser.h indexpatterns.o: htmltextstream.h ../core/textstream.h ../core/user.h -indexpatterns.o: ../core/config.h ../core/log.h ../core/textstream.h -indexpatterns.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h -indexpatterns.o: ../core/request.h ../core/requesttypes.h ../core/error.h indexpatterns.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h -indexpatterns.o: ../templates/htmltextstream.h ../core/session.h -indexpatterns.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -indexpatterns.o: ../core/mount.h ../templates/locale.h +indexpatterns.o: ../core/log.h ../core/textstream.h ../core/logmanipulators.h +indexpatterns.o: ../core/slog.h ../core/cur.h ../templates/locale.h insert.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h insert.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h insert.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h insert.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h insert.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h insert.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h -insert.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h -insert.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -insert.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -insert.o: ../core/error.h ../core/config.h ../core/confparser.h -insert.o: ../core/htmlfilter.h ../templates/htmltextstream.h +insert.o: indexpatterns.h ../core/config.h ../core/confparser.h +insert.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h +insert.o: ../core/requesttypes.h ../core/error.h ../core/config.h +insert.o: ../core/textstream.h ../templates/htmltextstream.h insert.o: ../core/session.h ../core/user.h ../core/plugindata.h -insert.o: ../core/rebus.h ../core/mount.h ../templates/locale.h -insert.o: indexpatterns.h ../core/config.h ../core/cur.h ../core/system.h -insert.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h -insert.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h -insert.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h -insert.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h +insert.o: ../core/rebus.h ../core/mount.h ../core/system.h ../core/dirs.h +insert.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +insert.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h +insert.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h +insert.o: ../core/ugcontainer.h ../core/log.h ../core/logmanipulators.h +insert.o: ../core/slog.h ../core/cur.h ../templates/locale.h insert.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h insert.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h insert.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h insert.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h insert.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h insert.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -insert.o: ../core/basethread.h ../core/sessionmanager.h -insert.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -insert.o: ../core/request.h ../core/misc.h +insert.o: ../core/basethread.h ../core/threadmanager.h +insert.o: ../core/sessionmanager.h ../core/sessioncontainer.h +insert.o: ../core/system.h ../core/htmlfilter.h ../core/request.h +insert.o: ../core/misc.h 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/funinfo.h item.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.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 ../core/logmanipulators.h ../core/slog.h -item.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -item.o: ../core/error.h ../core/config.h ../core/confparser.h -item.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h +item.o: indexpatterns.h ../core/config.h ../core/confparser.h +item.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h +item.o: ../core/requesttypes.h ../core/error.h ../core/config.h +item.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h item.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h -item.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h item.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h item.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h item.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h item.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -item.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -item.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -item.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -item.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -item.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -item.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -item.o: ../core/basethread.h ../core/sessionmanager.h +item.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +item.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h +item.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h +item.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h +item.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +item.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +item.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +item.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h item.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h item.o: ../core/request.h ../core/misc.h ../core/bbcodeparser.h last.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h @@ -195,33 +186,27 @@ last.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h last.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.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 ../core/logmanipulators.h ../core/slog.h -last.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -last.o: ../core/error.h ../core/config.h ../core/confparser.h -last.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h +last.o: indexpatterns.h ../core/config.h ../core/confparser.h +last.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h +last.o: ../core/requesttypes.h ../core/error.h ../core/config.h +last.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h last.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h -last.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h last.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h last.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h last.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h last.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -last.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -last.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -last.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -last.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -last.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -last.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -last.o: ../core/basethread.h ../core/sessionmanager.h +last.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +last.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h +last.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h +last.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h +last.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +last.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +last.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +last.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h last.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.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 locale.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h -locale.o: ../core/request.h ../core/requesttypes.h ../../ezc/src/item.h -locale.o: ../../ezc/src/funinfo.h ../core/error.h ../core/config.h -locale.o: ../core/confparser.h ../core/htmlfilter.h -locale.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -locale.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h locale.o: ../templates/locale.h ../../ezc/src/utf8.h localefilter.o: localefilter.h locale.h ../core/confparser.h localefilter.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h @@ -234,50 +219,48 @@ ls.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h ls.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h ls.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.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: ../core/logmanipulators.h ../core/slog.h ../core/cur.h -ls.o: ../core/request.h ../core/requesttypes.h ../core/error.h +ls.o: ../core/user.h patterncacher.h ../core/item.h indexpatterns.h ls.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h -ls.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -ls.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h -ls.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h -ls.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h -ls.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h -ls.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h -ls.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -ls.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -ls.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -ls.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -ls.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -ls.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -ls.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h -ls.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -ls.o: ../core/htmlfilter.h ../core/request.h +ls.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h +ls.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h +ls.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h +ls.o: ../core/mount.h ../core/system.h ../core/dirs.h ../core/dircontainer.h +ls.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h +ls.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h +ls.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +ls.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h +ls.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h +ls.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h +ls.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h +ls.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +ls.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +ls.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +ls.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h +ls.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h +ls.o: ../core/request.h 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/funinfo.h misc.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.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 ../core/logmanipulators.h ../core/slog.h -misc.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -misc.o: ../core/error.h ../core/config.h ../core/confparser.h -misc.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h +misc.o: indexpatterns.h ../core/config.h ../core/confparser.h +misc.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h +misc.o: ../core/requesttypes.h ../core/error.h ../core/config.h +misc.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h misc.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h -misc.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h misc.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h misc.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h misc.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h misc.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -misc.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -misc.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -misc.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -misc.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -misc.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -misc.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -misc.o: ../core/basethread.h ../core/sessionmanager.h +misc.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +misc.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h +misc.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h +misc.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h +misc.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +misc.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +misc.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +misc.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h misc.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h misc.o: ../core/misc.h ../core/request.h mount.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h @@ -286,26 +269,25 @@ mount.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h mount.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.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 ../core/logmanipulators.h ../core/slog.h -mount.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -mount.o: ../core/error.h ../core/config.h ../core/confparser.h -mount.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h +mount.o: indexpatterns.h ../core/config.h ../core/confparser.h +mount.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h +mount.o: ../core/requesttypes.h ../core/error.h ../core/config.h +mount.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h mount.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h -mount.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h mount.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h mount.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h mount.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h mount.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -mount.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -mount.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -mount.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -mount.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -mount.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -mount.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -mount.o: ../core/basethread.h ../core/sessionmanager.h -mount.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -mount.o: ../core/misc.h ../core/mounts.h +mount.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +mount.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h +mount.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h +mount.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h +mount.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +mount.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +mount.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +mount.o: ../core/basethread.h ../core/threadmanager.h +mount.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h +mount.o: ../core/htmlfilter.h ../core/misc.h ../core/mounts.h patterncacher.o: patterncacher.h ../core/item.h misc.h localefilter.h patterncacher.o: locale.h ../core/confparser.h ../../ezc/src/ezc.h patterncacher.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h @@ -314,36 +296,30 @@ patterncacher.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h patterncacher.o: ../../ezc/src/stringconv.h htmltextstream.h patterncacher.o: ../core/textstream.h ../core/user.h ../core/log.h patterncacher.o: ../core/textstream.h ../core/logmanipulators.h -patterncacher.o: ../core/slog.h ../core/cur.h ../core/request.h -patterncacher.o: ../core/requesttypes.h ../core/error.h ../core/config.h -patterncacher.o: ../core/confparser.h ../core/htmlfilter.h -patterncacher.o: ../templates/htmltextstream.h ../core/session.h -patterncacher.o: ../core/user.h ../core/plugindata.h ../core/rebus.h -patterncacher.o: ../core/mount.h ../templates/locale.h +patterncacher.o: ../core/slog.h ../core/cur.h ../templates/locale.h 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/funinfo.h priv.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.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 ../core/logmanipulators.h ../core/slog.h -priv.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -priv.o: ../core/error.h ../core/config.h ../core/confparser.h -priv.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h +priv.o: indexpatterns.h ../core/config.h ../core/confparser.h +priv.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h +priv.o: ../core/requesttypes.h ../core/error.h ../core/config.h +priv.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h priv.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h -priv.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h priv.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h priv.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h priv.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h priv.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -priv.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -priv.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -priv.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -priv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -priv.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -priv.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -priv.o: ../core/basethread.h ../core/sessionmanager.h +priv.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +priv.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h +priv.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h +priv.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h +priv.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +priv.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +priv.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +priv.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h priv.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h priv.o: ../core/request.h ../core/misc.h ../functions/functions.h priv.o: ../functions/functionbase.h ../core/synchro.h @@ -365,49 +341,48 @@ rebus.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h rebus.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h rebus.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h rebus.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h -rebus.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h -rebus.o: ../core/textstream.h ../core/logmanipulators.h ../core/slog.h -rebus.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -rebus.o: ../core/error.h ../core/config.h ../core/confparser.h -rebus.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h +rebus.o: indexpatterns.h ../core/config.h ../core/confparser.h +rebus.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h +rebus.o: ../core/requesttypes.h ../core/error.h ../core/config.h +rebus.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h rebus.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h -rebus.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h rebus.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h rebus.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h rebus.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h rebus.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -rebus.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -rebus.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -rebus.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -rebus.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -rebus.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -rebus.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -rebus.o: ../core/basethread.h ../core/sessionmanager.h -rebus.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -slog.o: ../core/slog.h ../core/cur.h ../core/request.h ../core/requesttypes.h -slog.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h ../core/error.h -slog.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h +rebus.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +rebus.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h +rebus.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h +rebus.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h +rebus.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +rebus.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +rebus.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +rebus.o: ../core/basethread.h ../core/threadmanager.h +rebus.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h +rebus.o: ../core/htmlfilter.h +slog.o: ../core/slog.h ../core/cur.h ../core/logmanipulators.h +slog.o: ../templates/locale.h templates.h ../../ezc/src/ezc.h +slog.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h +slog.o: ../../ezc/src/pattern.h ../../ezc/src/item.h ../../ezc/src/funinfo.h +slog.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.h +slog.o: localefilter.h locale.h ../core/confparser.h htmltextstream.h +slog.o: ../core/textstream.h ../core/user.h patterncacher.h ../core/item.h +slog.o: indexpatterns.h ../core/config.h ../core/confparser.h +slog.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h +slog.o: ../core/requesttypes.h ../core/error.h ../core/config.h slog.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h slog.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h -slog.o: ../core/logmanipulators.h ../templates/locale.h templates.h -slog.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h -slog.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h -slog.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h -slog.o: ../core/confparser.h htmltextstream.h ../core/textstream.h -slog.o: ../core/user.h patterncacher.h ../core/item.h ckeditorgetparser.h -slog.o: ../core/httpsimpleparser.h ../core/log.h ../core/slog.h -slog.o: indexpatterns.h ../core/config.h ../core/cur.h ../core/system.h -slog.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h -slog.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h +slog.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h +slog.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h slog.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h slog.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -slog.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -slog.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -slog.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -slog.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -slog.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -slog.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -slog.o: ../core/basethread.h ../core/sessionmanager.h +slog.o: ../core/slog.h ../notify/notify.h ../notify/notifypool.h +slog.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h +slog.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h +slog.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +slog.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +slog.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +slog.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h slog.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h stat.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h stat.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h @@ -415,24 +390,23 @@ stat.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h stat.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.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 ../core/logmanipulators.h ../core/slog.h -stat.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -stat.o: ../core/error.h ../core/config.h ../core/confparser.h -stat.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h +stat.o: indexpatterns.h ../core/config.h ../core/confparser.h +stat.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h +stat.o: ../core/requesttypes.h ../core/error.h ../core/config.h +stat.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h stat.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h -stat.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h stat.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h stat.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h stat.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h stat.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -stat.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -stat.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -stat.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -stat.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -stat.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -stat.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -stat.o: ../core/basethread.h ../core/sessionmanager.h +stat.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +stat.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h +stat.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h +stat.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h +stat.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +stat.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +stat.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +stat.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h stat.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h stat.o: ../core/request.h ../core/misc.h sys.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h @@ -440,28 +414,27 @@ sys.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h sys.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h sys.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.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: ../core/logmanipulators.h ../core/slog.h ../core/cur.h -sys.o: ../core/request.h ../core/requesttypes.h ../core/error.h +sys.o: ../core/user.h patterncacher.h ../core/item.h indexpatterns.h sys.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h -sys.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -sys.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h -sys.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h -sys.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h -sys.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h -sys.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h -sys.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -sys.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -sys.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -sys.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -sys.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -sys.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -sys.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h -sys.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -sys.o: ../core/htmlfilter.h ../core/request.h ../core/version.h -sys.o: ../core/plugin.h ../core/pluginmsg.h ../core/sessionmanager.h -sys.o: ../functions/functions.h ../functions/functionbase.h ../core/synchro.h +sys.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h +sys.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h +sys.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h +sys.o: ../core/mount.h ../core/system.h ../core/dirs.h ../core/dircontainer.h +sys.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h +sys.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h +sys.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +sys.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h +sys.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h +sys.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h +sys.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h +sys.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +sys.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +sys.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +sys.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h +sys.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h +sys.o: ../core/request.h ../core/version.h ../core/plugin.h +sys.o: ../core/pluginmsg.h ../core/sessionmanager.h ../functions/functions.h +sys.o: ../functions/functionbase.h ../core/synchro.h sys.o: ../functions/functionparser.h ../functions/adduser.h sys.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h sys.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h @@ -480,47 +453,45 @@ template.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h template.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.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 ../core/logmanipulators.h -template.o: ../core/slog.h ../core/cur.h ../core/request.h -template.o: ../core/requesttypes.h ../core/error.h ../core/config.h -template.o: ../core/confparser.h ../core/htmlfilter.h +template.o: ../core/item.h indexpatterns.h ../core/config.h +template.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h +template.o: ../core/request.h ../core/requesttypes.h ../core/error.h +template.o: ../core/config.h ../core/textstream.h template.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h template.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h -template.o: ../templates/locale.h indexpatterns.h ../core/config.h -template.o: ../core/cur.h ../core/system.h ../core/dirs.h -template.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h -template.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h -template.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h -template.o: ../core/ugcontainer.h ../core/log.h ../notify/notify.h +template.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h +template.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h +template.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h +template.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +template.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h +template.o: ../core/cur.h ../templates/locale.h ../notify/notify.h template.o: ../notify/notifypool.h ../templates/misc.h template.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h template.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h template.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h template.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h template.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -template.o: ../core/basethread.h ../core/sessionmanager.h -template.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -template.o: ../core/misc.h +template.o: ../core/basethread.h ../core/threadmanager.h +template.o: ../core/sessionmanager.h ../core/sessioncontainer.h +template.o: ../core/system.h ../core/htmlfilter.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/funinfo.h templates.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.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 ../core/logmanipulators.h -templates.o: ../core/slog.h ../core/cur.h ../core/request.h -templates.o: ../core/requesttypes.h ../core/error.h ../core/config.h -templates.o: ../core/confparser.h ../core/htmlfilter.h +templates.o: ../core/item.h indexpatterns.h ../core/config.h +templates.o: ../core/confparser.h ../core/htmlfilter.h ../core/cur.h +templates.o: ../core/request.h ../core/requesttypes.h ../core/error.h +templates.o: ../core/config.h ../core/textstream.h templates.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h templates.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h -templates.o: ../templates/locale.h indexpatterns.h ../core/config.h -templates.o: ../core/cur.h ../core/system.h ../core/dirs.h -templates.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h -templates.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h -templates.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h -templates.o: ../core/ugcontainer.h ../core/log.h ../notify/notify.h +templates.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h +templates.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h +templates.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h +templates.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +templates.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h +templates.o: ../core/cur.h ../templates/locale.h ../notify/notify.h templates.o: ../notify/notifypool.h ../templates/misc.h templates.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h templates.o: ../notify/templatesnotify.h ../core/users.h @@ -528,11 +499,11 @@ templates.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h templates.o: ../core/mountparser.h ../core/crypt.h ../core/run.h templates.o: ../core/users.h ../core/groups.h ../core/group.h templates.o: ../core/loadavg.h ../core/thumb.h ../core/basethread.h -templates.o: ../core/sessionmanager.h ../core/sessioncontainer.h -templates.o: ../core/system.h ../core/htmlfilter.h ../core/misc.h -templates.o: ../core/plugin.h ../core/pluginmsg.h ../core/sessionmanager.h -templates.o: ../functions/functions.h ../functions/functionbase.h -templates.o: ../core/request.h ../core/synchro.h +templates.o: ../core/threadmanager.h ../core/sessionmanager.h +templates.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h +templates.o: ../core/misc.h ../core/plugin.h ../core/pluginmsg.h +templates.o: ../core/sessionmanager.h ../functions/functions.h +templates.o: ../functions/functionbase.h ../core/request.h ../core/synchro.h templates.o: ../functions/functionparser.h ../functions/adduser.h templates.o: ../functions/cat.h ../functions/chmod.h templates.o: ../functions/privchanger.h ../functions/chown.h @@ -547,83 +518,81 @@ templates.o: ../functions/subject.h ../functions/template.h templates.o: ../functions/tinymce.h ../functions/uname.h templates.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h templates.o: ../functions/vim.h ../templates/templates.h -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/funinfo.h -upload.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.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 ../core/logmanipulators.h ../core/slog.h +upload.o: ../core/request.h templates.h ../../ezc/src/ezc.h +upload.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h +upload.o: ../../ezc/src/pattern.h ../../ezc/src/item.h +upload.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h +upload.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.h +upload.o: ../core/confparser.h htmltextstream.h ../core/textstream.h +upload.o: ../core/user.h patterncacher.h ../core/item.h indexpatterns.h +upload.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h upload.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -upload.o: ../core/error.h ../core/config.h ../core/confparser.h -upload.o: ../core/htmlfilter.h ../templates/htmltextstream.h -upload.o: ../core/session.h ../core/user.h ../core/plugindata.h -upload.o: ../core/rebus.h ../core/mount.h ../templates/locale.h -upload.o: indexpatterns.h ../core/config.h ../core/cur.h ../core/system.h -upload.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h -upload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h +upload.o: ../core/error.h ../core/config.h ../core/textstream.h +upload.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h +upload.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h +upload.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h +upload.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h upload.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h upload.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -upload.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -upload.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -upload.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -upload.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -upload.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -upload.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -upload.o: ../core/basethread.h ../core/sessionmanager.h -upload.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -upload.o: ../core/request.h +upload.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +upload.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h +upload.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h +upload.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h +upload.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +upload.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +upload.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +upload.o: ../core/basethread.h ../core/threadmanager.h +upload.o: ../core/sessionmanager.h ../core/sessioncontainer.h +upload.o: ../core/system.h ../core/htmlfilter.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/funinfo.h uptime.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.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 ../core/logmanipulators.h ../core/slog.h -uptime.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -uptime.o: ../core/error.h ../core/config.h ../core/confparser.h -uptime.o: ../core/htmlfilter.h ../templates/htmltextstream.h +uptime.o: indexpatterns.h ../core/config.h ../core/confparser.h +uptime.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h +uptime.o: ../core/requesttypes.h ../core/error.h ../core/config.h +uptime.o: ../core/textstream.h ../templates/htmltextstream.h uptime.o: ../core/session.h ../core/user.h ../core/plugindata.h -uptime.o: ../core/rebus.h ../core/mount.h ../templates/locale.h -uptime.o: indexpatterns.h ../core/config.h ../core/cur.h ../core/system.h -uptime.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h -uptime.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h -uptime.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h -uptime.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h +uptime.o: ../core/rebus.h ../core/mount.h ../core/system.h ../core/dirs.h +uptime.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h +uptime.o: ../db/dbtextstream.h ../core/error.h ../db/dbitemquery.h +uptime.o: ../db/dbitemcolumns.h ../core/group.h ../core/dircontainer.h +uptime.o: ../core/ugcontainer.h ../core/log.h ../core/logmanipulators.h +uptime.o: ../core/slog.h ../core/cur.h ../templates/locale.h uptime.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h uptime.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h uptime.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h uptime.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h uptime.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h uptime.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -uptime.o: ../core/basethread.h ../core/sessionmanager.h -uptime.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h +uptime.o: ../core/basethread.h ../core/threadmanager.h +uptime.o: ../core/sessionmanager.h ../core/sessioncontainer.h +uptime.o: ../core/system.h ../core/htmlfilter.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/funinfo.h user.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.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 ../core/logmanipulators.h ../core/slog.h -user.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -user.o: ../core/error.h ../core/config.h ../core/confparser.h -user.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h +user.o: indexpatterns.h ../core/config.h ../core/confparser.h +user.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h +user.o: ../core/requesttypes.h ../core/error.h ../core/config.h +user.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h user.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h -user.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h user.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h user.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h user.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h user.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -user.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -user.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -user.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -user.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -user.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -user.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -user.o: ../core/basethread.h ../core/sessionmanager.h +user.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +user.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h +user.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h +user.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h +user.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +user.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +user.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +user.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h user.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h user.o: ../core/request.h ../core/misc.h who.o: templates.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h @@ -631,63 +600,62 @@ who.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h ../../ezc/src/item.h who.o: ../../ezc/src/funinfo.h ../../ezc/src/functions.h who.o: ../../ezc/src/stringconv.h misc.h localefilter.h locale.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: ../core/logmanipulators.h ../core/slog.h ../core/cur.h -who.o: ../core/request.h ../core/requesttypes.h ../core/error.h +who.o: ../core/user.h patterncacher.h ../core/item.h indexpatterns.h who.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h -who.o: ../templates/htmltextstream.h ../core/session.h ../core/user.h -who.o: ../core/plugindata.h ../core/rebus.h ../core/mount.h -who.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h -who.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h -who.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h -who.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h -who.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -who.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -who.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -who.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -who.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -who.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -who.o: ../core/group.h ../core/loadavg.h ../core/thumb.h ../core/basethread.h -who.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h -who.o: ../core/htmlfilter.h ../core/request.h ../core/misc.h +who.o: ../core/cur.h ../core/request.h ../core/requesttypes.h ../core/error.h +who.o: ../core/config.h ../core/textstream.h ../templates/htmltextstream.h +who.o: ../core/session.h ../core/user.h ../core/plugindata.h ../core/rebus.h +who.o: ../core/mount.h ../core/system.h ../core/dirs.h ../core/dircontainer.h +who.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h +who.o: ../core/error.h ../db/dbitemquery.h ../db/dbitemcolumns.h +who.o: ../core/group.h ../core/dircontainer.h ../core/ugcontainer.h +who.o: ../core/log.h ../core/logmanipulators.h ../core/slog.h ../core/cur.h +who.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h +who.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h +who.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h +who.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +who.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +who.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +who.o: ../core/basethread.h ../core/threadmanager.h ../core/sessionmanager.h +who.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h +who.o: ../core/request.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/funinfo.h winix.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h misc.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 ../core/logmanipulators.h ../core/slog.h -winix.o: ../core/cur.h ../core/request.h ../core/requesttypes.h -winix.o: ../core/error.h ../core/config.h ../core/confparser.h -winix.o: ../core/htmlfilter.h ../templates/htmltextstream.h ../core/session.h +winix.o: indexpatterns.h ../core/config.h ../core/confparser.h +winix.o: ../core/htmlfilter.h ../core/cur.h ../core/request.h +winix.o: ../core/requesttypes.h ../core/error.h ../core/config.h +winix.o: ../core/textstream.h ../templates/htmltextstream.h ../core/session.h winix.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mount.h -winix.o: ../templates/locale.h indexpatterns.h ../core/config.h ../core/cur.h winix.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h winix.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/error.h winix.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/group.h winix.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/log.h -winix.o: ../notify/notify.h ../notify/notifypool.h ../templates/misc.h -winix.o: ../notify/notifythread.h ../core/basethread.h ../core/synchro.h -winix.o: ../notify/templatesnotify.h ../core/users.h ../core/ugcontainer.h -winix.o: ../core/lastcontainer.h ../core/mounts.h ../core/mountparser.h -winix.o: ../core/crypt.h ../core/run.h ../core/users.h ../core/groups.h -winix.o: ../core/group.h ../core/loadavg.h ../core/thumb.h -winix.o: ../core/basethread.h ../core/sessionmanager.h -winix.o: ../core/sessioncontainer.h ../core/system.h ../core/htmlfilter.h -winix.o: ../core/request.h ../core/plugin.h ../core/pluginmsg.h -winix.o: ../core/sessionmanager.h ../functions/functions.h -winix.o: ../functions/functionbase.h ../core/synchro.h -winix.o: ../functions/functionparser.h ../functions/adduser.h -winix.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h -winix.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h -winix.o: ../functions/default.h ../functions/download.h ../functions/emacs.h -winix.o: ../functions/last.h ../functions/login.h ../functions/logout.h -winix.o: ../functions/ln.h ../functions/ls.h ../functions/mkdir.h -winix.o: ../functions/mv.h ../functions/nicedit.h ../functions/node.h -winix.o: ../functions/passwd.h ../functions/priv.h ../functions/reload.h -winix.o: ../functions/rm.h ../functions/specialdefault.h ../functions/stat.h +winix.o: ../core/logmanipulators.h ../core/slog.h ../core/cur.h +winix.o: ../templates/locale.h ../notify/notify.h ../notify/notifypool.h +winix.o: ../templates/misc.h ../notify/notifythread.h ../core/basethread.h +winix.o: ../core/synchro.h ../notify/templatesnotify.h ../core/users.h +winix.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/mounts.h +winix.o: ../core/mountparser.h ../core/crypt.h ../core/run.h ../core/users.h +winix.o: ../core/groups.h ../core/group.h ../core/loadavg.h ../core/thumb.h +winix.o: ../core/basethread.h ../core/threadmanager.h +winix.o: ../core/sessionmanager.h ../core/sessioncontainer.h ../core/system.h +winix.o: ../core/htmlfilter.h ../core/request.h ../core/plugin.h +winix.o: ../core/pluginmsg.h ../core/sessionmanager.h +winix.o: ../functions/functions.h ../functions/functionbase.h +winix.o: ../core/synchro.h ../functions/functionparser.h +winix.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h +winix.o: ../functions/privchanger.h ../functions/chown.h +winix.o: ../functions/ckeditor.h ../functions/cp.h ../functions/default.h +winix.o: ../functions/download.h ../functions/emacs.h ../functions/last.h +winix.o: ../functions/login.h ../functions/logout.h ../functions/ln.h +winix.o: ../functions/ls.h ../functions/mkdir.h ../functions/mv.h +winix.o: ../functions/nicedit.h ../functions/node.h ../functions/passwd.h +winix.o: ../functions/priv.h ../functions/reload.h ../functions/rm.h +winix.o: ../functions/specialdefault.h ../functions/stat.h winix.o: ../functions/subject.h ../functions/template.h winix.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h winix.o: ../functions/uptime.h ../functions/who.h ../functions/vim.h diff --git a/templates/ckeditorgetparser.h b/templates/ckeditorgetparser.h deleted file mode 100755 index 464748d..0000000 --- a/templates/ckeditorgetparser.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * This file is a part of Winix - * and is not publicly distributed - * - * Copyright (c) 2008-2010, Tomasz Sowa - * All rights reserved. - * - */ - -#ifndef headerfile_winix_templates_ckeditorgetparser -#define headerfile_winix_templates_ckeditorgetparser - - -#include -#include "../core/httpsimpleparser.h" -#include "../core/log.h" - - - - -class CKEditorGetParser : public HttpSimpleParser -{ - const char * pchar; - - -protected: - - - virtual int GetChar() - { - if( !pchar || *pchar == 0 ) - return -1; - - return (int)(unsigned char)*(pchar++); - } - - - virtual void Parameter(std::string & name, std::string & value) - { - if( name == "CKEditorFuncNum" ) - { - fun_num = Tol(value); - log << log3 << "CKEGetParser: callback function number: " << fun_num << logend; - } - } - - -public: - - long fun_num; - - CKEditorGetParser() - { - pchar = 0; - fun_num = 0; - } - - void Parse(const char * str) - { - pchar = str; - HttpSimpleParser::Parse(); - } - - -}; - - -#endif diff --git a/templates/insert.cpp b/templates/insert.cpp index 85b3745..30e0332 100755 --- a/templates/insert.cpp +++ b/templates/insert.cpp @@ -41,7 +41,7 @@ void insert_page_run(Info & i) InsertPageInfo & info = insert_page_info[insert_page_cur]; Ezc::Pattern * pat = pattern_cacher.GetPattern(info.item); - log << log4 << "Templates: insert_page_run: using " << insert_page_cur << " generator" << logend; + log << log4 << "Templates: insert_page_run: using generator number: " << insert_page_cur << logend; insert_page_cur += 1; info.run_content.Clear(); diff --git a/templates/ls.cpp b/templates/ls.cpp index ee9a69f..a0d1696 100755 --- a/templates/ls.cpp +++ b/templates/ls.cpp @@ -2,13 +2,13 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ #include "templates.h" -#include "../core/request.h" +#include "core/request.h" #include "misc.h" @@ -27,7 +27,7 @@ void ls_ckeditor_funnum_browse(Info & i) if( ls_ckeditor_reqid != cur->request->id ) { ls_ckeditor_reqid = cur->request->id; - ls_ckeditor_funnum = ParseCKeditorFun(); + ls_ckeditor_funnum = Toi(cur->request->ParamValue(L"CKEditorFuncNum")); } i.out << ls_ckeditor_funnum; diff --git a/templates/misc.cpp b/templates/misc.cpp index 505b6f2..d745c70 100755 --- a/templates/misc.cpp +++ b/templates/misc.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2011, Tomasz Sowa * All rights reserved. * */ @@ -150,28 +150,6 @@ void print_user_name(Info & i, const User * puser, const std::wstring & guest_na -int ParseCKeditorFun() -{ - ckeditor_getparser.fun_num = 2; // default if there is a problem with parsing info - - if( !cur->request->get_tab.empty() ) - { - size_t last = cur->request->get_tab.size()-1; - - if( !cur->request->get_tab[last].empty() ) - { - static std::string get; - AssignString(cur->request->get_tab[last], get); - ckeditor_getparser.Parse(get.c_str() + 1); // the first char is '?' - } - } - -return ckeditor_getparser.fun_num; -} - - - - } // namespace TemplatesFunctions diff --git a/templates/misc.h b/templates/misc.h index b9fd977..62eee8d 100755 --- a/templates/misc.h +++ b/templates/misc.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2011, Tomasz Sowa * All rights reserved. * */ @@ -45,7 +45,7 @@ typedef std::vector > Patterns; void print_date_nice(Info & i, const tm & rtm); void print_user_name(Info & i, const User * puser, const std::wstring & guest_name); -int ParseCKeditorFun(); + diff --git a/templates/templates.cpp b/templates/templates.cpp index 4557911..51f139e 100755 --- a/templates/templates.cpp +++ b/templates/templates.cpp @@ -26,7 +26,6 @@ Locale locale; EzcFun ezc_functions; LocaleFilter locale_filter; HTMLFilter html_filter; -CKEditorGetParser ckeditor_getparser; // used by GenerateRunRaw() std::vector empty_pars; @@ -85,7 +84,9 @@ Ezc::Pattern * p = 0; //case WINIX_ERR_NO_ITEM: !! we need something like 'error::item_required' //p = &pat_err_item_required; //break; - + + case WINIX_ERR_INCORRECT_URI: // !!temporarily + case WINIX_ERR_INTERNAL_ERROR: // !! temprarily case WINIX_ERR_PERMISSION_DENIED: case WINIX_ERR_CANT_CHANGE_USER: case WINIX_ERR_CANT_CHANGE_GROUP: diff --git a/templates/templates.h b/templates/templates.h index 597a96c..023537d 100755 --- a/templates/templates.h +++ b/templates/templates.h @@ -15,7 +15,6 @@ #include "ezc.h" #include "misc.h" #include "patterncacher.h" -#include "ckeditorgetparser.h" #include "indexpatterns.h" #include "locale.h" #include "htmltextstream.h" @@ -52,7 +51,6 @@ namespace TemplatesFunctions extern EzcFun ezc_functions; extern LocaleFilter locale_filter; extern HTMLFilter html_filter; - extern CKEditorGetParser ckeditor_getparser; extern Db * db; extern Cur * cur; diff --git a/templates/upload.cpp b/templates/upload.cpp index 8a044bf..031a2a6 100755 --- a/templates/upload.cpp +++ b/templates/upload.cpp @@ -2,14 +2,14 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2011, Tomasz Sowa * All rights reserved. * */ #include +#include "core/request.h" #include "templates.h" -#include "../core/request.h" #include "misc.h" @@ -26,7 +26,7 @@ void upload_ckeditor_funnum(Info & i) if( upload_ckeditor_reqid != cur->request->id ) { upload_ckeditor_reqid = cur->request->id; - upload_fun_num = ParseCKeditorFun(); + upload_fun_num = Toi(cur->request->ParamValue(L"CKEditorFuncNum")); } i.out << upload_fun_num;