From 031ace3fe5876d00ae10f7d8a8b54d3469c1f9bc Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Tue, 27 Jul 2010 20:41:56 +0000 Subject: [PATCH] changed: the way how plugins work all your plugin functions can have signature either: void my_function(PluginInfo & info); or void my_function(); only the main Init should have: extern "C" void Init(PluginFunction & info); added: directory 'plugins' for plugins added: 'stats' plugin git-svn-id: svn://ttmath.org/publicrep/winix/trunk@624 e52654a7-88a9-db11-a3e9-0013d4bc506e --- Makefile | 3 + confparser/Makefile | 2 +- content/Makefile | 2 +- content/Makefile.dep | 115 ++++++----- content/content.cpp | 1 + content/rm.cpp | 14 +- core/Makefile | 2 +- core/Makefile.dep | 17 +- core/config.cpp | 3 +- core/config.h | 28 +-- core/db.cpp | 62 ++++-- core/db.h | 16 +- core/misc.cpp | 14 ++ core/misc.h | 2 + core/plugin.cpp | 188 ++++++++++++----- core/plugin.h | 115 ++++++++--- core/pluginmsg.h | 18 +- main/Makefile | 2 +- main/Makefile.dep | 5 +- main/main.cpp | 3 + plugins/stats/Makefile | 27 +++ plugins/stats/Makefile.dep | 18 ++ plugins/stats/Makefile.o.dep | 1 + plugins/stats/data.h | 52 +++++ plugins/stats/init.cpp | 246 ++++++++++++++++++++++ plugins/stats/stats.cpp | 120 +++++++++++ plugins/stats/stats.h | 60 ++++++ plugins/stats/templates.cpp | 91 ++++++++ plugins/stats/templates.h | 27 +++ templates/Makefile | 2 +- templates/Makefile.dep | 391 ++++++++++++++++++----------------- templatesnotify/Makefile | 2 +- templatesnotify/Makefile.dep | 18 +- 33 files changed, 1268 insertions(+), 399 deletions(-) create mode 100755 plugins/stats/Makefile create mode 100755 plugins/stats/Makefile.dep create mode 100755 plugins/stats/Makefile.o.dep create mode 100755 plugins/stats/data.h create mode 100755 plugins/stats/init.cpp create mode 100755 plugins/stats/stats.cpp create mode 100755 plugins/stats/stats.h create mode 100755 plugins/stats/templates.cpp create mode 100755 plugins/stats/templates.h diff --git a/Makefile b/Makefile index f932385..b393933 100755 --- a/Makefile +++ b/Makefile @@ -22,6 +22,7 @@ winix: FORCE @cd confparser ; $(MAKE) -e @cd templates ; $(MAKE) -e @cd templatesnotify ; $(MAKE) -e + @cd plugins/stats ; $(MAKE) -e @cd ../ezc/src ; $(MAKE) -e $(CXX) -shared -o winix.so $(CXXFLAGS) core/*.o content/*.o templates/*.o templatesnotify/*.o confparser/*.o ../ezc/src/ezc.a -lfcgi -lpq -lz -lpthread @cd main ; $(MAKE) -e @@ -35,6 +36,7 @@ clean: @cd confparser ; $(MAKE) -e clean @cd templates ; $(MAKE) -e clean @cd templatesnotify ; $(MAKE) -e clean + @cd plugins/stats ; $(MAKE) -e clean @cd ../ezc/src ; $(MAKE) -e clean @cd main ; $(MAKE) -e clean rm -f winix.so @@ -50,6 +52,7 @@ depend: @cd confparser ; $(MAKE) -e depend @cd templates ; $(MAKE) -e depend @cd templatesnotify ; $(MAKE) -e depend + @cd plugins/stats ; $(MAKE) -e depend @cd ../ezc/src ; $(MAKE) -e depend @cd main ; $(MAKE) -e depend diff --git a/confparser/Makefile b/confparser/Makefile index e5cd145..98f1f52 100755 --- a/confparser/Makefile +++ b/confparser/Makefile @@ -12,7 +12,7 @@ all: $(o) depend: - makedepend -Y. -f- *.cpp > Makefile.dep + 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 diff --git a/content/Makefile b/content/Makefile index e5cd145..98f1f52 100755 --- a/content/Makefile +++ b/content/Makefile @@ -12,7 +12,7 @@ all: $(o) depend: - makedepend -Y. -f- *.cpp > Makefile.dep + 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 diff --git a/content/Makefile.dep b/content/Makefile.dep index f1f8565..27c45be 100755 --- a/content/Makefile.dep +++ b/content/Makefile.dep @@ -1,8 +1,8 @@ # DO NOT DELETE adduser.o: content.h ../core/item.h ../templates/templates.h -adduser.o: ../templates/patterncacher.h ../templates/misc.h -adduser.o: ../templates/localefilter.h ../core/locale.h +adduser.o: ../../ezc/src/ezc.h ../templates/patterncacher.h +adduser.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h adduser.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h adduser.o: ../core/httpsimpleparser.h ../core/log.h adduser.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h @@ -17,7 +17,7 @@ adduser.o: ../core/postmultiparser.h ../core/data.h ../core/dirs.h adduser.o: ../core/users.h ../core/groups.h ../core/functions.h adduser.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h adduser.o: ../core/loadavg.h -cat.o: content.h ../core/item.h ../templates/templates.h +cat.o: content.h ../core/item.h ../templates/templates.h ../../ezc/src/ezc.h cat.o: ../templates/patterncacher.h ../templates/misc.h cat.o: ../templates/localefilter.h ../core/locale.h cat.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h @@ -34,8 +34,8 @@ cat.o: ../core/dirs.h ../core/users.h ../core/groups.h ../core/functions.h cat.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h cat.o: ../core/loadavg.h content.o: content.h ../core/item.h ../templates/templates.h -content.o: ../templates/patterncacher.h ../templates/misc.h -content.o: ../templates/localefilter.h ../core/locale.h +content.o: ../../ezc/src/ezc.h ../templates/patterncacher.h +content.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h content.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h content.o: ../core/httpsimpleparser.h ../core/log.h content.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h @@ -51,7 +51,7 @@ content.o: ../core/dirs.h ../core/users.h ../core/groups.h content.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h content.o: ../core/mount.h ../core/loadavg.h ../core/misc.h ../core/plugin.h content.o: ../core/request.h ../core/data.h ../core/pluginmsg.h -cp.o: content.h ../core/item.h ../templates/templates.h +cp.o: content.h ../core/item.h ../templates/templates.h ../../ezc/src/ezc.h cp.o: ../templates/patterncacher.h ../templates/misc.h cp.o: ../templates/localefilter.h ../core/locale.h ../confparser/confparser.h cp.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h @@ -67,11 +67,11 @@ cp.o: ../core/postmultiparser.h ../core/data.h ../core/dirs.h ../core/users.h cp.o: ../core/groups.h ../core/functions.h ../core/lastcontainer.h cp.o: ../core/mounts.h ../core/mount.h ../core/loadavg.h ../core/misc.h createthread.o: content.h ../core/item.h ../templates/templates.h -createthread.o: ../templates/patterncacher.h ../templates/misc.h -createthread.o: ../templates/localefilter.h ../core/locale.h -createthread.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h -createthread.o: ../core/httpsimpleparser.h ../core/log.h -createthread.o: ../templates/indexpatterns.h ../core/thread.h +createthread.o: ../../ezc/src/ezc.h ../templates/patterncacher.h +createthread.o: ../templates/misc.h ../templates/localefilter.h +createthread.o: ../core/locale.h ../confparser/confparser.h +createthread.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h +createthread.o: ../core/log.h ../templates/indexpatterns.h ../core/thread.h createthread.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h createthread.o: ../core/group.h ../core/thread.h ../core/error.h createthread.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h @@ -85,11 +85,11 @@ createthread.o: ../core/users.h ../core/groups.h ../core/functions.h createthread.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h createthread.o: ../core/loadavg.h createticket.o: content.h ../core/item.h ../templates/templates.h -createticket.o: ../templates/patterncacher.h ../templates/misc.h -createticket.o: ../templates/localefilter.h ../core/locale.h -createticket.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h -createticket.o: ../core/httpsimpleparser.h ../core/log.h -createticket.o: ../templates/indexpatterns.h ../core/thread.h +createticket.o: ../../ezc/src/ezc.h ../templates/patterncacher.h +createticket.o: ../templates/misc.h ../templates/localefilter.h +createticket.o: ../core/locale.h ../confparser/confparser.h +createticket.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h +createticket.o: ../core/log.h ../templates/indexpatterns.h ../core/thread.h createticket.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h createticket.o: ../core/group.h ../core/thread.h ../core/error.h createticket.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h @@ -103,8 +103,8 @@ createticket.o: ../core/users.h ../core/groups.h ../core/functions.h createticket.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h createticket.o: ../core/loadavg.h default.o: content.h ../core/item.h ../templates/templates.h -default.o: ../templates/patterncacher.h ../templates/misc.h -default.o: ../templates/localefilter.h ../core/locale.h +default.o: ../../ezc/src/ezc.h ../templates/patterncacher.h +default.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h default.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h default.o: ../core/httpsimpleparser.h ../core/log.h default.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h @@ -120,8 +120,8 @@ default.o: ../core/dirs.h ../core/users.h ../core/groups.h default.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h default.o: ../core/mount.h ../core/loadavg.h download.o: content.h ../core/item.h ../templates/templates.h -download.o: ../templates/patterncacher.h ../templates/misc.h -download.o: ../templates/localefilter.h ../core/locale.h +download.o: ../../ezc/src/ezc.h ../templates/patterncacher.h +download.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h download.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h download.o: ../core/httpsimpleparser.h ../core/log.h download.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h @@ -137,13 +137,13 @@ download.o: ../core/users.h ../core/groups.h ../core/functions.h download.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h download.o: ../core/loadavg.h editticket.o: content.h ../core/item.h ../templates/templates.h -editticket.o: ../templates/patterncacher.h ../templates/misc.h -editticket.o: ../templates/localefilter.h ../core/locale.h -editticket.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h -editticket.o: ../core/httpsimpleparser.h ../core/log.h -editticket.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h -editticket.o: ../core/db.h ../core/item.h ../core/user.h ../core/group.h -editticket.o: ../core/thread.h ../core/error.h ../core/log.h +editticket.o: ../../ezc/src/ezc.h ../templates/patterncacher.h +editticket.o: ../templates/misc.h ../templates/localefilter.h +editticket.o: ../core/locale.h ../confparser/confparser.h +editticket.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h +editticket.o: ../core/log.h ../templates/indexpatterns.h ../core/thread.h +editticket.o: ../core/ticket.h ../core/db.h ../core/item.h ../core/user.h +editticket.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h editticket.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h editticket.o: ../core/request.h ../core/requesttypes.h ../core/session.h editticket.o: ../core/rebus.h ../core/plugindata.h ../core/function.h @@ -154,7 +154,7 @@ editticket.o: ../core/data.h ../core/dirs.h ../core/users.h ../core/groups.h editticket.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h editticket.o: ../core/mount.h ../core/loadavg.h emacs.o: content.h ../core/item.h ../templates/templates.h -emacs.o: ../templates/patterncacher.h ../templates/misc.h +emacs.o: ../../ezc/src/ezc.h ../templates/patterncacher.h ../templates/misc.h emacs.o: ../templates/localefilter.h ../core/locale.h emacs.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h emacs.o: ../core/httpsimpleparser.h ../core/log.h @@ -172,7 +172,7 @@ emacs.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h emacs.o: ../core/loadavg.h ../core/notify.h emacs.o: ../templatesnotify/templatesnotify.h ../core/mount.h emacs.o: ../templates/misc.h ../core/misc.h -last.o: content.h ../core/item.h ../templates/templates.h +last.o: content.h ../core/item.h ../templates/templates.h ../../ezc/src/ezc.h last.o: ../templates/patterncacher.h ../templates/misc.h last.o: ../templates/localefilter.h ../core/locale.h last.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h @@ -182,7 +182,7 @@ last.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h last.o: ../core/log.h ../core/dircontainer.h ../core/ugcontainer.h last.o: ../core/ticket.h login.o: content.h ../core/item.h ../templates/templates.h -login.o: ../templates/patterncacher.h ../templates/misc.h +login.o: ../../ezc/src/ezc.h ../templates/patterncacher.h ../templates/misc.h login.o: ../templates/localefilter.h ../core/locale.h login.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h login.o: ../core/httpsimpleparser.h ../core/log.h @@ -199,8 +199,8 @@ login.o: ../core/dirs.h ../core/users.h ../core/groups.h ../core/functions.h login.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h login.o: ../core/loadavg.h logout.o: content.h ../core/item.h ../templates/templates.h -logout.o: ../templates/patterncacher.h ../templates/misc.h -logout.o: ../templates/localefilter.h ../core/locale.h +logout.o: ../../ezc/src/ezc.h ../templates/patterncacher.h +logout.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h logout.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h logout.o: ../core/httpsimpleparser.h ../core/log.h logout.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h @@ -215,7 +215,7 @@ logout.o: ../core/postmultiparser.h ../core/data.h ../core/dirs.h logout.o: ../core/users.h ../core/groups.h ../core/functions.h logout.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h logout.o: ../core/loadavg.h -ls.o: content.h ../core/item.h ../templates/templates.h +ls.o: content.h ../core/item.h ../templates/templates.h ../../ezc/src/ezc.h ls.o: ../templates/patterncacher.h ../templates/misc.h ls.o: ../templates/localefilter.h ../core/locale.h ../confparser/confparser.h ls.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h @@ -229,8 +229,8 @@ ls.o: ../core/compress.h ../core/acceptencodingparser.h ls.o: ../core/acceptbaseparser.h ../core/htmlfilter.h ls.o: ../core/postmultiparser.h misc_item.o: content.h ../core/item.h ../templates/templates.h -misc_item.o: ../templates/patterncacher.h ../templates/misc.h -misc_item.o: ../templates/localefilter.h ../core/locale.h +misc_item.o: ../../ezc/src/ezc.h ../templates/patterncacher.h +misc_item.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h misc_item.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h misc_item.o: ../core/httpsimpleparser.h ../core/log.h misc_item.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h @@ -243,9 +243,9 @@ misc_item.o: ../core/compress.h ../core/acceptencodingparser.h misc_item.o: ../core/acceptbaseparser.h ../core/htmlfilter.h misc_item.o: ../core/postmultiparser.h ../core/misc.h misc_specialfile.o: content.h ../core/item.h ../templates/templates.h -misc_specialfile.o: ../templates/patterncacher.h ../templates/misc.h -misc_specialfile.o: ../templates/localefilter.h ../core/locale.h -misc_specialfile.o: ../confparser/confparser.h +misc_specialfile.o: ../../ezc/src/ezc.h ../templates/patterncacher.h +misc_specialfile.o: ../templates/misc.h ../templates/localefilter.h +misc_specialfile.o: ../core/locale.h ../confparser/confparser.h misc_specialfile.o: ../templates/ckeditorgetparser.h misc_specialfile.o: ../core/httpsimpleparser.h ../core/log.h misc_specialfile.o: ../templates/indexpatterns.h ../core/thread.h @@ -262,7 +262,7 @@ misc_specialfile.o: ../core/users.h ../core/groups.h ../core/functions.h misc_specialfile.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h misc_specialfile.o: ../core/loadavg.h mkdir.o: content.h ../core/item.h ../templates/templates.h -mkdir.o: ../templates/patterncacher.h ../templates/misc.h +mkdir.o: ../../ezc/src/ezc.h ../templates/patterncacher.h ../templates/misc.h mkdir.o: ../templates/localefilter.h ../core/locale.h mkdir.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h mkdir.o: ../core/httpsimpleparser.h ../core/log.h @@ -280,7 +280,7 @@ mkdir.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h mkdir.o: ../core/loadavg.h ../core/notify.h mkdir.o: ../templatesnotify/templatesnotify.h ../core/mount.h mkdir.o: ../templates/misc.h -mv.o: content.h ../core/item.h ../templates/templates.h +mv.o: content.h ../core/item.h ../templates/templates.h ../../ezc/src/ezc.h mv.o: ../templates/patterncacher.h ../templates/misc.h mv.o: ../templates/localefilter.h ../core/locale.h ../confparser/confparser.h mv.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h @@ -295,7 +295,7 @@ mv.o: ../core/acceptbaseparser.h ../core/htmlfilter.h mv.o: ../core/postmultiparser.h ../core/data.h ../core/dirs.h ../core/users.h mv.o: ../core/groups.h ../core/functions.h ../core/lastcontainer.h mv.o: ../core/mounts.h ../core/mount.h ../core/loadavg.h -node.o: content.h ../core/item.h ../templates/templates.h +node.o: content.h ../core/item.h ../templates/templates.h ../../ezc/src/ezc.h node.o: ../templates/patterncacher.h ../templates/misc.h node.o: ../templates/localefilter.h ../core/locale.h node.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h @@ -308,7 +308,7 @@ node.o: ../core/session.h ../core/rebus.h ../core/plugindata.h node.o: ../core/function.h ../core/compress.h ../core/acceptencodingparser.h node.o: ../core/acceptbaseparser.h ../core/htmlfilter.h node.o: ../core/postmultiparser.h -priv.o: content.h ../core/item.h ../templates/templates.h +priv.o: content.h ../core/item.h ../templates/templates.h ../../ezc/src/ezc.h priv.o: ../templates/patterncacher.h ../templates/misc.h priv.o: ../templates/localefilter.h ../core/locale.h priv.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h @@ -325,8 +325,8 @@ priv.o: ../core/dirs.h ../core/users.h ../core/groups.h ../core/functions.h priv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h priv.o: ../core/loadavg.h reload.o: content.h ../core/item.h ../templates/templates.h -reload.o: ../templates/patterncacher.h ../templates/misc.h -reload.o: ../templates/localefilter.h ../core/locale.h +reload.o: ../../ezc/src/ezc.h ../templates/patterncacher.h +reload.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h reload.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h reload.o: ../core/httpsimpleparser.h ../core/log.h reload.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h @@ -340,7 +340,7 @@ reload.o: ../core/acceptbaseparser.h ../core/htmlfilter.h reload.o: ../core/postmultiparser.h ../core/error.h ../core/notify.h reload.o: ../templatesnotify/templatesnotify.h ../core/mount.h reload.o: ../templates/misc.h -rm.o: content.h ../core/item.h ../templates/templates.h +rm.o: content.h ../core/item.h ../templates/templates.h ../../ezc/src/ezc.h rm.o: ../templates/patterncacher.h ../templates/misc.h rm.o: ../templates/localefilter.h ../core/locale.h ../confparser/confparser.h rm.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h @@ -355,8 +355,9 @@ rm.o: ../core/acceptbaseparser.h ../core/htmlfilter.h rm.o: ../core/postmultiparser.h ../core/error.h ../core/data.h ../core/dirs.h rm.o: ../core/users.h ../core/groups.h ../core/functions.h rm.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -rm.o: ../core/loadavg.h -run.o: content.h ../core/item.h ../templates/templates.h +rm.o: ../core/loadavg.h ../core/plugin.h ../core/request.h ../core/data.h +rm.o: ../core/pluginmsg.h +run.o: content.h ../core/item.h ../templates/templates.h ../../ezc/src/ezc.h run.o: ../templates/patterncacher.h ../templates/misc.h run.o: ../templates/localefilter.h ../core/locale.h run.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h @@ -370,8 +371,8 @@ run.o: ../core/function.h ../core/compress.h ../core/acceptencodingparser.h run.o: ../core/acceptbaseparser.h ../core/htmlfilter.h run.o: ../core/postmultiparser.h ../core/error.h subject.o: content.h ../core/item.h ../templates/templates.h -subject.o: ../templates/patterncacher.h ../templates/misc.h -subject.o: ../templates/localefilter.h ../core/locale.h +subject.o: ../../ezc/src/ezc.h ../templates/patterncacher.h +subject.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h subject.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h subject.o: ../core/httpsimpleparser.h ../core/log.h subject.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h @@ -384,8 +385,8 @@ subject.o: ../core/compress.h ../core/acceptencodingparser.h subject.o: ../core/acceptbaseparser.h ../core/htmlfilter.h subject.o: ../core/postmultiparser.h thread.o: content.h ../core/item.h ../templates/templates.h -thread.o: ../templates/patterncacher.h ../templates/misc.h -thread.o: ../templates/localefilter.h ../core/locale.h +thread.o: ../../ezc/src/ezc.h ../templates/patterncacher.h +thread.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h thread.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h thread.o: ../core/httpsimpleparser.h ../core/log.h thread.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h @@ -401,8 +402,8 @@ thread.o: ../core/users.h ../core/groups.h ../core/functions.h thread.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h thread.o: ../core/loadavg.h ../core/mount.h ticket.o: content.h ../core/item.h ../templates/templates.h -ticket.o: ../templates/patterncacher.h ../templates/misc.h -ticket.o: ../templates/localefilter.h ../core/locale.h +ticket.o: ../../ezc/src/ezc.h ../templates/patterncacher.h +ticket.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h ticket.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h ticket.o: ../core/httpsimpleparser.h ../core/log.h ticket.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h @@ -418,7 +419,7 @@ ticket.o: ../core/users.h ../core/groups.h ../core/functions.h ticket.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h ticket.o: ../core/loadavg.h ../core/mount.h uname.o: content.h ../core/item.h ../templates/templates.h -uname.o: ../templates/patterncacher.h ../templates/misc.h +uname.o: ../../ezc/src/ezc.h ../templates/patterncacher.h ../templates/misc.h uname.o: ../templates/localefilter.h ../core/locale.h uname.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h uname.o: ../core/httpsimpleparser.h ../core/log.h @@ -427,8 +428,8 @@ uname.o: ../core/db.h ../core/item.h ../core/user.h ../core/group.h uname.o: ../core/thread.h ../core/error.h ../core/log.h uname.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h upload.o: content.h ../core/item.h ../templates/templates.h -upload.o: ../templates/patterncacher.h ../templates/misc.h -upload.o: ../templates/localefilter.h ../core/locale.h +upload.o: ../../ezc/src/ezc.h ../templates/patterncacher.h +upload.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h upload.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h upload.o: ../core/httpsimpleparser.h ../core/log.h upload.o: ../templates/indexpatterns.h ../core/thread.h ../core/ticket.h @@ -443,7 +444,7 @@ upload.o: ../core/postmultiparser.h ../core/data.h ../core/dirs.h upload.o: ../core/users.h ../core/groups.h ../core/functions.h upload.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h upload.o: ../core/loadavg.h ../core/misc.h -who.o: content.h ../core/item.h ../templates/templates.h +who.o: content.h ../core/item.h ../templates/templates.h ../../ezc/src/ezc.h who.o: ../templates/patterncacher.h ../templates/misc.h who.o: ../templates/localefilter.h ../core/locale.h who.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h diff --git a/content/content.cpp b/content/content.cpp index 232cd45..4e2cbd8 100755 --- a/content/content.cpp +++ b/content/content.cpp @@ -344,6 +344,7 @@ void Content::Make() plugin.Call(WINIX_CONTENT_MAKE); MakePage(); + // !! dodac parametr do konfiga wlaczajacy te informacje //request.PrintGetTable(); //request.PrintEnv(); //request.PrintIn(); diff --git a/content/rm.cpp b/content/rm.cpp index b09c868..46a57e9 100755 --- a/content/rm.cpp +++ b/content/rm.cpp @@ -10,10 +10,10 @@ #include #include #include "content.h" -#include "../core/request.h" -#include "../core/error.h" -#include "../core/data.h" - +#include "core/request.h" +#include "core/error.h" +#include "core/data.h" +#include "core/plugin.h" bool Content::RemoveCheckAccess() @@ -65,6 +65,8 @@ void Content::RemoveAllDirs(long dir_id) RemoveAllDirs(p->second->id); } + plugin.Call(WINIX_DIR_PREPARE_TO_REMOVE, dir_id); + rm_auth_iq.WhereParentId(dir_id); db.GetItems(request.item_table, rm_auth_iq); @@ -77,6 +79,8 @@ void Content::RemoveAllDirs(long dir_id) db.RemoveThread(dir_id); db.RemoveTicket(dir_id); + + plugin.Call(WINIX_DIR_REMOVED, dir_id); } } @@ -167,6 +171,8 @@ void Content::RemoveFile() log << log2 << "Content: deleted item: subject: " << request.item.subject << ", id: " << request.item.id << logend; TemplatesFunctions::pattern_cacher.DeletePattern(request.item); + plugin.Call(WINIX_FILE_REMOVED, request.item.id); + if( data.mounts.pmount->type == Mount::thread ) db.EditThreadRemoveItem(request.item.parent_id); else diff --git a/core/Makefile b/core/Makefile index e5cd145..98f1f52 100755 --- a/core/Makefile +++ b/core/Makefile @@ -12,7 +12,7 @@ all: $(o) depend: - makedepend -Y. -f- *.cpp > Makefile.dep + 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 diff --git a/core/Makefile.dep b/core/Makefile.dep index 2a774e9..8a59923 100755 --- a/core/Makefile.dep +++ b/core/Makefile.dep @@ -57,12 +57,12 @@ mounts.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h mounts.o: postmultiparser.h ticket.h mountparser.h db.h notify.o: log.h notify.h ../templatesnotify/templatesnotify.h ../core/mount.h notify.o: ../core/locale.h ../confparser/confparser.h ../templates/misc.h -notify.o: ../templates/localefilter.h data.h dirs.h item.h dircontainer.h -notify.o: users.h user.h ugcontainer.h groups.h group.h functions.h -notify.o: function.h lastcontainer.h mounts.h mount.h error.h rebus.h -notify.o: loadavg.h misc.h request.h requesttypes.h session.h plugindata.h -notify.o: thread.h compress.h acceptencodingparser.h acceptbaseparser.h -notify.o: htmlfilter.h postmultiparser.h ticket.h +notify.o: ../templates/localefilter.h ../../ezc/src/ezc.h data.h dirs.h +notify.o: item.h dircontainer.h users.h user.h ugcontainer.h groups.h group.h +notify.o: functions.h function.h lastcontainer.h mounts.h mount.h error.h +notify.o: rebus.h loadavg.h misc.h request.h requesttypes.h session.h +notify.o: plugindata.h thread.h compress.h acceptencodingparser.h +notify.o: acceptbaseparser.h htmlfilter.h postmultiparser.h ticket.h plugin.o: plugin.h request.h requesttypes.h session.h item.h error.h log.h plugin.o: user.h rebus.h plugindata.h function.h thread.h compress.h plugin.o: acceptencodingparser.h acceptbaseparser.h htmlfilter.h @@ -88,8 +88,9 @@ request.o: postparser.h cookieparser.h data.h dirs.h dircontainer.h users.h request.o: ugcontainer.h groups.h group.h functions.h lastcontainer.h request.o: mounts.h mount.h loadavg.h plugin.h pluginmsg.h misc.h db.h requestcontroller.o: requestcontroller.h ../content/content.h ../core/item.h -requestcontroller.o: ../templates/templates.h ../templates/patterncacher.h -requestcontroller.o: misc.h item.h ../templates/ckeditorgetparser.h +requestcontroller.o: ../templates/templates.h ../../ezc/src/ezc.h +requestcontroller.o: ../templates/patterncacher.h misc.h item.h +requestcontroller.o: ../templates/ckeditorgetparser.h requestcontroller.o: ../core/httpsimpleparser.h ../core/log.h requestcontroller.o: ../core/locale.h ../confparser/confparser.h requestcontroller.o: ../templates/indexpatterns.h ../templates/localefilter.h diff --git a/core/config.cpp b/core/config.cpp index 20f4afa..ad3a2e4 100755 --- a/core/config.cpp +++ b/core/config.cpp @@ -79,7 +79,6 @@ bool Config::ReadConfig(bool errors_to_stdout_) if( status == ConfParser::ok ) { AssignValues(); - data.SetAdditionalVariables(); return true; } @@ -151,7 +150,7 @@ void Config::AssignValues() data.title_separator = Text("title_separator", " / "); - ListText(data.plugin_file, "plugin"); + ListText(data.plugin_file, "plugins"); } diff --git a/core/config.h b/core/config.h index 5b02dd7..4641dff 100755 --- a/core/config.h +++ b/core/config.h @@ -11,11 +11,11 @@ #define headerfilecmslucoreconfig #include - #include "../confparser/confparser.h" + class Config { @@ -24,14 +24,6 @@ public: bool ReadConfig(bool errors_to_stdout_); - - - -private: - ConfParser conf_parser; - void ShowError(); - void AssignValues(); - std::string Text(const char * name); std::string Text(const char * name, const char * def); std::string Text(const std::string & name, const std::string & def); @@ -47,17 +39,27 @@ private: void ListText(std::vector & list, const char * name); void ListText(std::vector & list, const std::string & name); + void NoLastSlash(std::string & s); + void NoFirstHttp(std::string & s); + + + +private: + ConfParser conf_parser; + void ShowError(); + void AssignValues(); + std::string default_str; int default_int; bool default_bool; - bool errors_to_stdout; - - void NoLastSlash(std::string & s); - void NoFirstHttp(std::string & s); }; +extern Config config; + + + #endif diff --git a/core/db.cpp b/core/db.cpp index fdf52e6..d78dda1 100755 --- a/core/db.cpp +++ b/core/db.cpp @@ -791,24 +791,27 @@ return result; -PGresult * Db::GetItemsQuery(const ItemQuery & iq) +PGresult * Db::GetItemsQuery(const ItemQuery & iq, bool skip_other_sel) { std::ostringstream query; query << "select item.id"; - if( iq.sel_parent_id ) query << " ,parent_id"; - if( iq.sel_user_id ) query << " ,user_id, modification_user_id"; - if( iq.sel_group_id ) query << " ,group_id"; - if( iq.sel_guest_name) query << " ,guest_name"; - if( iq.sel_privileges ) query << " ,privileges"; - if( iq.sel_date ) query << " ,date_creation, date_modification"; - if( iq.sel_subject ) query << " ,subject"; - if( iq.sel_content ) query << " ,content, content_type, content_id"; - if( iq.sel_url ) query << " ,url"; - if( iq.sel_type ) query << " ,type"; - if( iq.sel_default_item ) query << " ,default_item"; - if( iq.sel_auth ) query << " ,auth, auth_path"; - + if( !skip_other_sel ) + { + if( iq.sel_parent_id ) query << " ,parent_id"; + if( iq.sel_user_id ) query << " ,user_id, modification_user_id"; + if( iq.sel_group_id ) query << " ,group_id"; + if( iq.sel_guest_name) query << " ,guest_name"; + if( iq.sel_privileges ) query << " ,privileges"; + if( iq.sel_date ) query << " ,date_creation, date_modification"; + if( iq.sel_subject ) query << " ,subject"; + if( iq.sel_content ) query << " ,content, content_type, content_id"; + if( iq.sel_url ) query << " ,url"; + if( iq.sel_type ) query << " ,type"; + if( iq.sel_default_item ) query << " ,default_item"; + if( iq.sel_auth ) query << " ,auth, auth_path"; + } + query << " from core.item"; if( iq.sel_content ) query << " left join core.content on item.content_id = content.id"; @@ -857,8 +860,6 @@ void Db::GetItems(std::vector & item_table, const ItemQuery & item_query) item_table.clear(); PGresult * r = 0; - item_table.clear(); - try { AssertConnection(); @@ -886,6 +887,35 @@ void Db::GetItems(std::vector & item_table, const ItemQuery & item_query) } + +void Db::GetItems(std::vector & item_table, const ItemQuery & item_query) +{ + item_table.clear(); + PGresult * r = 0; + + try + { + AssertConnection(); + + r = GetItemsQuery(item_query, true); + AssertResultStatus(r, PGRES_TUPLES_OK); + + int rows = PQntuples(r); + + for(int i = 0 ; i & item_table, const ItemQuery & item_query); - - + void GetItems(std::vector & item_table, const ItemQuery & item_query); // !! pobiera tylko jeden item (cos wymyslec innego z nazwa albo argumentem) @@ -213,7 +221,7 @@ protected: void CheckAllUrlSubjectModifyItem(Item & item); - PGresult * GetItemsQuery(const ItemQuery & iq); + PGresult * GetItemsQuery(const ItemQuery & iq, bool skip_other_sel = false); bool DelItemDelItem(const Item & item); void DelItemDelContent(const Item & item); diff --git a/core/misc.cpp b/core/misc.cpp index 35815c2..c69d250 100755 --- a/core/misc.cpp +++ b/core/misc.cpp @@ -324,6 +324,20 @@ return DateToStr(ptm); } +const char * DateToStrWithoutHours(tm * ptm) +{ + return DateToStr(ptm->tm_year + 1900, ptm->tm_mon+1, ptm->tm_mday); +} + + +const char * DateToStrWithoutHours(time_t t) +{ + tm * ptm = std::localtime(&t); + +return DateToStrWithoutHours(ptm); +} + + // this format is used with cookies const char * DateToStrCookie(int year, int month, int day, int hour, int min, int sec) diff --git a/core/misc.h b/core/misc.h index ecf29ed..bfe4dfd 100755 --- a/core/misc.h +++ b/core/misc.h @@ -36,6 +36,8 @@ const char * DateToStr(int year, int month, int day); const char * DateToStr(int year, int month, int day, int hour, int min, int sec); const char * DateToStr(tm * ptm); const char * DateToStr(time_t t); +const char * DateToStrWithoutHours(tm * ptm); +const char * DateToStrWithoutHours(time_t t); const char * DateToStrCookie(int year, int month, int day, int hour, int min, int sec); const char * DateToStrCookie(tm * ptm); diff --git a/core/plugin.cpp b/core/plugin.cpp index 2fd2f2f..7821a6d 100755 --- a/core/plugin.cpp +++ b/core/plugin.cpp @@ -21,7 +21,7 @@ size_t i; slots.clear(); for(i=0 ; isecond.index; + info.plugin_id = current_plugin; -Arg * Plugin::Call(int message, void * a, void * a2, void * a3) + if( request.session && current_plugin != -1 ) + info.plugin_data_base = request.session->plugin_data.Get(current_plugin); + else + info.plugin_data_base = 0; + + if( !slot->second.is_running ) + { + slot->second.is_running = true; + + if( slot->second.fun1 ) + slot->second.fun1(info); + + if( slot->second.fun2 ) + slot->second.fun2(); + + slot->second.is_running = false; + } + else + { + log << log1 << "Plugin: id: " << slot->second.index + << ", message: " << message + << ", recurrences are not allowed" << logend; + } +} + + + +void Plugin::Call(int message, void * p1_, void * p2_, long l1_, long l2_) { Slots::iterator i = slots.lower_bound(message); - arg.Clear(); - int old_current_plugin = current_plugin; for( ; i!=slots.end() && i->first==message ; ++i ) { - arg.app = a; - arg.app2 = a2; - arg.app3 = a3; - current_plugin = i->second.index; - arg.plugin_id = current_plugin; + info.Clear(); + info.p1 = p1_; + info.p2 = p2_; + info.l1 = l1_; + info.l2 = l2_; - if( request.session && current_plugin != -1 ) - arg.plugin_data_base = request.session->plugin_data.Get(current_plugin); - else - arg.plugin_data_base = 0; - - if( i->second.fun(&arg) ) - arg.ret_true++; - else - arg.ret_false++; + Call(message, i); } current_plugin = old_current_plugin; - -return &arg; } +void Plugin::Call(int message) +{ + Call(message, 0, 0, 0, 0); +} + +void Plugin::Call(int message, void * p1_) +{ + Call(message, p1_, 0, 0, 0); +} + +void Plugin::Call(int message, void * p1_, void * p2_) +{ + Call(message, p1_, p2_, 0, 0); +} + +void Plugin::Call(int message, long l1_) +{ + Call(message, 0, 0, l1_, 0); +} + +void Plugin::Call(int message, long l1_, long l2_) +{ + Call(message, 0, 0, l1_, l2_); +} + +void Plugin::Call(int message, void * p1_, long l1_) +{ + Call(message, p1_, 0, l1_, 0); +} + +void Plugin::Call(int message, void * p1_, long l1_, long l2_) +{ + Call(message, p1_, 0, l1_, l2_); +} + +void Plugin::Call(int message, void * p1_, void * p2_, long l1_) +{ + Call(message, p1_, p2_, l1_, 0); +} + + + + size_t Plugin::Size() { return plugins.size(); @@ -143,14 +213,26 @@ size_t Plugin::Size() -void Plugin::Assign(int message, Fun fun) +void Plugin::Assign(int message, Fun1 fun1) { - Slot s; +Slot s; - s.fun = fun; + s.fun1 = fun1; s.index = current_plugin; slots.insert( std::make_pair(message, s) ); - log << log3 << "Plugin: added function for message: " << message << ", plugin index: " << s.index << logend; } + + +void Plugin::Assign(int message, Fun2 fun2) +{ +Slot s; + + s.fun2 = fun2; + s.index = current_plugin; + + slots.insert( std::make_pair(message, s) ); + log << log3 << "Plugin: added function for message: " << message << ", plugin index: " << s.index << logend; +} + diff --git a/core/plugin.h b/core/plugin.h index f9622b8..e76c8cb 100755 --- a/core/plugin.h +++ b/core/plugin.h @@ -21,30 +21,56 @@ #include "plugindata.h" -// plugin arguments -struct Arg +/* + all your plugin functions can have signature either: + void my_function(PluginInfo & info); or + void my_function(); + + only the main Init should have: + extern "C" void Init(PluginFunction & info); + + in the Init you can add your own functions by using plugin.Assign() method + and you can set the name of the plugin by setting info.p1 pointer + to a string buffer (const char *) + (this buffer will not be copied so it should not be destroyed after Init finishes) +*/ + + + + +struct PluginInfo { - void * app; // used for some purposes - void * app2; // used for some purposes - void * app3; // used for some purposes + // these variables are used for some purposes + // depending on a hook in which they are used + void * p1; + void * p2; + long l1; + long l2; + + // unique plugin identifier + int plugin_id; - int plugin_id; // unique plugin identifier + // pointer to the plugin session (can be null if not set by the plugin) + // you should use WINIX_SESSION_CREATED and WINIX_SESSION_REMOVE + // to create your plugin's session data + PluginDataBase * plugin_data_base; - - PluginDataBase * plugin_data_base; // pointer to the plugin session - - int ret_true; // how many plugins returned true - int ret_false; // how many plugins returned false + // function return status + // default: false (if not set by the plugin) + bool ret; void Clear() { - app = 0; - app2 = 0; - app3 = 0; - ret_true = 0; - ret_false = 0; + p1 = 0; + p2 = 0; + l1 = 0; + l2 = 0; + + plugin_id = -1; plugin_data_base = 0; + + ret = false; } }; @@ -58,46 +84,73 @@ public: // normally: -1 int current_plugin; + // Fun is a type of a function you should provide in your plugin + typedef void (*Fun1)(PluginInfo &); + typedef void (*Fun2)(void); - // !! zmienic sygnature funkcji (niech nie zwraca zadnej wartosci, bo to tylko wkurwia) - // albo dodac jeszcze inna sygnature (niech nie pobiera zadnego argumentu) - typedef bool (*Fun)(Arg *); - - //typedef void (*Fun2)(); struct Slot { - Fun fun; - // Fun2 fun2; // dla drugiej sygnatury - int index; // plugin index + Fun1 fun1; + Fun2 fun2; + int index; // plugin index (which plugin has inserted the slot) + bool is_running; + + Slot() + { + fun1 = 0; + fun2 = 0; + index = -1; + is_running = false; + } }; Plugin(); ~Plugin(); + void LoadPlugin(const char * filename); void LoadPlugin(const std::string & filename); void LoadPlugins(const std::vector & plugins); - void UnloadPlugins(); - Arg * Call(int message, void * a=0, void * a2=0, void * a3=0); + void Call(int message); + void Call(int message, void * p1_); + void Call(int message, void * p1_, void * p2_); + void Call(int message, long l1_); + void Call(int message, long l1_, long l2_); + void Call(int message, void * p1_, long l1_); + void Call(int message, void * p1_, long l1_, long l2_); + void Call(int message, void * p1_, void * p2_, long l1_); + void Call(int message, void * p1_, void * p2_, long l1_, long l2_); + // how many plugins there are size_t Size(); - - void Assign(int message, Fun); + + // assign a function to a message + // you can assign more than one function to a specific message + void Assign(int message, Fun1); + void Assign(int message, Fun2); private: - typedef std::vector Plugins; + struct PluginsItem + { + void * handle; + const char * plugin_name; // plugin name (can be null if was not set by the plugin) + }; + + typedef std::vector Plugins; Plugins plugins; typedef std::multimap Slots; Slots slots; - Arg arg; - + PluginInfo info; + + void * LoadInitFun(const char * filename, Fun1 & fun_init); + void Call(int message, Slots::iterator & slot); }; diff --git a/core/pluginmsg.h b/core/pluginmsg.h index 20a8062..4412b19 100755 --- a/core/pluginmsg.h +++ b/core/pluginmsg.h @@ -11,8 +11,10 @@ #ifndef headerfilecmslupluginmsg #define headerfilecmslupluginmsg - +// here you can add your own EZC functions ([function]) +// PluginInfo.p1 is a pointer to Ezc::Functions object #define WINIX_TEMPLATES_CREATEFUNCTIONS 999 + #define WINIX_REQUEST_CLEAR 1000 #define WINIX_CONTENT_MAKE 2000 @@ -28,11 +30,23 @@ // when a session is changed (you can save a pointer to your data here) #define WINIX_SESSION_CHANGED 3002 +// all plugins have been started, now you can init +#define WINIX_PLUGIN_INIT 3003 +// the winix is closing +#define WINIX_CLOSE 3004 +// item was removed (rm function) +// PluginInfo::l1 is the file (item) id +#define WINIX_FILE_REMOVED 3005 +// directory was removed (rm function) +// PluginInfo::l1 is the dir id +#define WINIX_DIR_REMOVED 3006 - +// preparing to remove a directory (rm function) +// PluginInfo::l1 is the dir id +#define WINIX_DIR_PREPARE_TO_REMOVE 3007 diff --git a/main/Makefile b/main/Makefile index e5cd145..98f1f52 100755 --- a/main/Makefile +++ b/main/Makefile @@ -12,7 +12,7 @@ all: $(o) depend: - makedepend -Y. -f- *.cpp > Makefile.dep + 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 diff --git a/main/Makefile.dep b/main/Makefile.dep index 9c8350f..f573802 100755 --- a/main/Makefile.dep +++ b/main/Makefile.dep @@ -1,8 +1,9 @@ # DO NOT DELETE main.o: ../core/requestcontroller.h ../content/content.h ../core/item.h -main.o: ../templates/templates.h ../templates/patterncacher.h -main.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h +main.o: ../templates/templates.h ../../ezc/src/ezc.h +main.o: ../templates/patterncacher.h ../templates/misc.h +main.o: ../templates/localefilter.h ../core/locale.h main.o: ../confparser/confparser.h ../templates/ckeditorgetparser.h main.o: ../core/httpsimpleparser.h ../core/log.h ../templates/indexpatterns.h main.o: ../core/thread.h ../core/ticket.h ../core/db.h ../core/item.h diff --git a/main/main.cpp b/main/main.cpp index 67a683a..e0d2c86 100755 --- a/main/main.cpp +++ b/main/main.cpp @@ -38,6 +38,8 @@ Plugin plugin; void signal_term(int) { + plugin.Call(WINIX_CLOSE); + req_controller.SaveSessions(); req_controller.DeleteAllPluginsData(); log << log1 << "cmslu stopped" << logend << logsave; @@ -103,6 +105,7 @@ int main(int argv, char ** argc) // load plugins before loading sessions - req_controller.LoadSessions() plugin.LoadPlugins(data.plugin_file); + plugin.Call(WINIX_PLUGIN_INIT); request.Init(); diff --git a/plugins/stats/Makefile b/plugins/stats/Makefile new file mode 100755 index 0000000..5fe1cc3 --- /dev/null +++ b/plugins/stats/Makefile @@ -0,0 +1,27 @@ +include Makefile.o.dep + +name = stats.so + + +all: $(o) + $(CXX) -shared -Wl,-soname,$(name).so -o $(name) $(CXXFLAGS) *.o + + + +.SUFFIXES: .cpp .o + +.cpp.o: + $(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/stats/Makefile.dep b/plugins/stats/Makefile.dep new file mode 100755 index 0000000..4acea33 --- /dev/null +++ b/plugins/stats/Makefile.dep @@ -0,0 +1,18 @@ +# DO NOT DELETE + +init.o: ../../core/log.h ../../core/request.h ../../core/requesttypes.h +init.o: ../../core/session.h ../../core/item.h ../../core/error.h +init.o: ../../core/log.h ../../core/user.h ../../core/rebus.h +init.o: ../../core/plugindata.h ../../core/function.h ../../core/thread.h +init.o: ../../core/compress.h ../../core/acceptencodingparser.h +init.o: ../../core/acceptbaseparser.h ../../core/htmlfilter.h +init.o: ../../core/postmultiparser.h ../../core/ticket.h ../../core/config.h +init.o: ../../confparser/confparser.h ../../core/db.h ../../core/group.h +init.o: ../../core/dircontainer.h ../../core/ugcontainer.h stats.h +init.o: templates.h ../../core/plugin.h ../../core/request.h data.h +init.o: ../../core/plugindata.h ../../core/pluginmsg.h +stats.o: stats.h data.h ../../core/plugindata.h ../../core/log.h +templates.o: templates.h ../../core/plugin.h ../../core/request.h data.h +templates.o: stats.h ../../core/plugindata.h ../../core/pluginmsg.h +templates.o: ../../core/log.h ../../core/plugindata.h ../../../ezc/src/ezc.h +templates.o: ../../core/misc.h ../../core/item.h diff --git a/plugins/stats/Makefile.o.dep b/plugins/stats/Makefile.o.dep new file mode 100755 index 0000000..0360402 --- /dev/null +++ b/plugins/stats/Makefile.o.dep @@ -0,0 +1 @@ +o = init.o stats.o templates.o diff --git a/plugins/stats/data.h b/plugins/stats/data.h new file mode 100755 index 0000000..1c9e16e --- /dev/null +++ b/plugins/stats/data.h @@ -0,0 +1,52 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2010, Tomasz Sowa + * All rights reserved. + * + */ + +#ifndef headerfilecmsluplugin_stats_data +#define headerfilecmsluplugin_stats_data + +#include "stats.h" +#include +#include "core/plugindata.h" +#include + + +namespace Stats +{ + + +// session data for the plugin +struct StatsData : public PluginDataBase +{ + // whether this session has been calculated + bool calculated; + long last_visited; + + StatsData() + { + calculated = false; + last_visited = -1; + } +}; + +extern time_t stats_start; + +// statistics for all pages +extern StatsGlobal stat_global; + +// statistics for one item +// +extern std::map stats_tab; + + +long ItemId(); + + +} // namespace + +#endif diff --git a/plugins/stats/init.cpp b/plugins/stats/init.cpp new file mode 100755 index 0000000..f243202 --- /dev/null +++ b/plugins/stats/init.cpp @@ -0,0 +1,246 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2010, Tomasz Sowa + * All rights reserved. + * + */ + + +#include +#include "core/log.h" +#include "core/request.h" +#include "core/config.h" +#include "core/db.h" + +#include "stats.h" +#include "templates.h" +#include "data.h" + +extern "C" void Init(PluginInfo &); +const char plugin_name[] = "stats"; + + +namespace Stats +{ + +// when the statistics start +time_t stats_start; + + +// statistics for all pages +StatsGlobal stat_global; + +// statistics for one item +// +std::map stats_tab; + + +// when to save the config (how many requests should have gone) +// (for safety: power failure etc) +// default: 1000 +// you can set: stats_req_save_freq in the config file to overwrite it +// 0 - turn it off +int req_save_freq = 1000; +int req_current = 0; // helper + + + + +long ItemId() +{ +long item_id; + + if( request.is_item ) + item_id = request.item.id; + else + item_id = request.dir_table.back()->id; + +return item_id; +} + + +void CheckSaving() +{ + req_current += 1; + + if( req_save_freq != 0 && req_current >= req_save_freq ) + { + SaveStats(); + req_current = 0; + } +} + + + +bool BrowserHas(const char * name) +{ + const char * is = strstr(request.env_http_user_agent, name); + return is != 0; +} + + +bool IsGoogle() +{ + return BrowserHas("Googlebot") && BrowserHas("www.google.com"); +} + + +bool IsYahoo() +{ + return BrowserHas("Yahoo!") && BrowserHas("yahoo.com"); +} + + +void UpdateStats(Stats & item_stats) +{ + stat_global.all += 1; + item_stats.all += 1; + + if( IsGoogle() ) + { + stat_global.google += 1; + item_stats.google += 1; + } + + if( IsYahoo() ) + { + stat_global.yahoo += 1; + item_stats.yahoo += 1; + } +} + + +void ContentMake(PluginInfo & info) +{ +StatsData * d = 0; + + long id = ItemId(); + + if( info.plugin_data_base ) + d = reinterpret_cast(info.plugin_data_base); + + // this simply prevents F5 (refresh) from a webbrowser + if( d && d->last_visited != -1 && d->last_visited == id ) + return; + + if( d ) + d->last_visited = id; + + UpdateStats(stats_tab[id]); + + if( d && !d->calculated ) + { + stat_global.unique += 1; + d->calculated = true; + } + + CheckSaving(); +} + + + +void SessionCreated(PluginInfo & info) +{ + StatsData * d = new StatsData(); + request.session->plugin_data.Assign(d); + + log << log3 << "created stats plugin data" + << ", plugin id: " << info.plugin_id + << ", pointer: " << d << logend; +} + + + +void RemoveSession(PluginInfo & info) +{ + log << log1 << "deleting stats plugin data" + << ", plugin id: " << info.plugin_id + << ", pointer: " << info.plugin_data_base << logend; + + delete info.plugin_data_base; +} + + + +void ReadConfig() +{ + stats_file = config.Text("stats_file"); + req_save_freq = config.Int("stats_req_save_freq", req_save_freq); + + if( stats_file.empty() ) + log << log1 << "you should set stats_file in your config to keep statistics between restarting winix" << logend; + else + log << log2 << "stats_file: " << stats_file << logend; + + stats_start = time(0); // it will be overwritten if the config file exists + ReadStats(); +} + + +void Close() +{ + SaveStats(); +} + + +void RemoveItem(long id) +{ + std::map::iterator i = stats_tab.find(id); + + if( i == stats_tab.end() ) + return; + + stats_tab.erase(i); + log << log3 << "Stats: removed stats for item.id: " << id << logend; +} + + + +void RemoveFile(PluginInfo & info) +{ + RemoveItem(info.l1); +} + + +void RemoveDir(PluginInfo & info) +{ +Db::ItemQuery query; +std::vector items; +size_t i; + + query.SetAll(false, false); + query.WhereParentId(info.l1); + db.GetItems(items, query); + + // removing childs + for(i=0 ; i +#include "data.h" +#include "core/log.h" + + +namespace Stats +{ + + +std::string stats_file; + + +void ReadStats(std::ifstream & file) +{ + file >> stats_start; + file >> stat_global.all; + file >> stat_global.unique; + file >> stat_global.google; + file >> stat_global.yahoo; + + size_t len; + file >> len; + + Stats s; + long item_id; + + for(size_t i = 0 ; i> item_id; + file >> s.all; + file >> s.google; + file >> s.yahoo; + + stats_tab.insert( std::make_pair(item_id, s) ); + } +} + + + + +void ReadStats() +{ + if( stats_file.empty() ) + return; + + std::ifstream file(stats_file.c_str()); + + if( !file ) + { + log << log1 << "Stats: I cannot open the stats file: " << stats_file << logend; + return; + } + + ReadStats(file); + file.close(); + + log << log3 << "Stats: statistics loaded from: " << stats_file + << " (" << stats_tab.size() << " items)" << logend; +} + + + + +void SaveStats(std::ofstream & file) +{ + file << stats_start << std::endl; + + file << stat_global.all << ' '; + file << stat_global.unique << ' '; + file << stat_global.google << ' '; + file << stat_global.yahoo << ' '; + file << std::endl; + + file << stats_tab.size() << std::endl; + + std::map::iterator i = stats_tab.begin(); + + for( ; i != stats_tab.end() ; ++i) + { + file << i->first << ' '; + file << i->second.all << ' '; + file << i->second.google << ' '; + file << i->second.yahoo << ' '; + file << std::endl; + } +} + + +void SaveStats() +{ + if( stats_file.empty() ) + return; + + std::ofstream file(stats_file.c_str()); + + if( !file ) + { + log << log1 << "Stats: I cannot open the stats file: " << stats_file << logend; + return; + } + + SaveStats(file); + file.close(); + + log << log3 << "Stats: statistics saved to: " << stats_file << logend; +} + +} // namespace + + diff --git a/plugins/stats/stats.h b/plugins/stats/stats.h new file mode 100755 index 0000000..dd5c5cf --- /dev/null +++ b/plugins/stats/stats.h @@ -0,0 +1,60 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2010, Tomasz Sowa + * All rights reserved. + * + */ + +#ifndef headerfilecmsluplugin_stats_stats +#define headerfilecmsluplugin_stats_stats + +#include + +namespace Stats +{ + + +struct StatsGlobal +{ + int all; + int unique; + + int google; + int yahoo; + + StatsGlobal() + { + all = 0; + unique = 0; + google = 0; + yahoo = 0; + } +}; + + +struct Stats +{ + int all; + int google; + int yahoo; + + Stats() + { + all = 0; + google = 0; + yahoo = 0; + } +}; + +extern std::string stats_file; + +void ReadStats(); +void SaveStats(); + +} // namespace + + + +#endif diff --git a/plugins/stats/templates.cpp b/plugins/stats/templates.cpp new file mode 100755 index 0000000..4984ca3 --- /dev/null +++ b/plugins/stats/templates.cpp @@ -0,0 +1,91 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2010, Tomasz Sowa + * All rights reserved. + * + */ + +#include "templates.h" +#include "ezc.h" +#include "data.h" +#include "core/misc.h" + + + +namespace Stats +{ + + +void stats_from(Ezc::Info & i) +{ + i.out << DateToStrWithoutHours(stats_start); + +} + +void stats_all(Ezc::Info & i) +{ + i.out << stat_global.all; +} + +void stats_unique(Ezc::Info & i) +{ + i.out << stat_global.unique; +} + +void stats_google(Ezc::Info & i) +{ + i.out << stat_global.google; +} + +void stats_yahoo(Ezc::Info & i) +{ + i.out << stat_global.yahoo; +} + + +void stats_item_all(Ezc::Info & i) +{ + i.out << stats_tab[ItemId()].all; +} + + +void stats_item_google(Ezc::Info & i) +{ + i.out << stats_tab[ItemId()].google; +} + +void stats_item_yahoo(Ezc::Info & i) +{ + i.out << stats_tab[ItemId()].yahoo; +} + + + + +void CreateFunctions(PluginInfo & info) +{ + if( !info.p1 ) + { + log << log1 << "S: functions object doesn't set" << logend; + return; + } + + Ezc::Functions * fun = reinterpret_cast(info.p1); + + fun->Insert("stats_from", stats_from); + + fun->Insert("stats_all", stats_all); + fun->Insert("stats_unique", stats_unique); + fun->Insert("stats_google", stats_google); + fun->Insert("stats_yahoo", stats_yahoo); + + fun->Insert("stats_item_all", stats_item_all); + fun->Insert("stats_item_google", stats_item_google); + fun->Insert("stats_item_yahoo", stats_item_yahoo); +} + + +} // namespace + diff --git a/plugins/stats/templates.h b/plugins/stats/templates.h new file mode 100755 index 0000000..7f8be85 --- /dev/null +++ b/plugins/stats/templates.h @@ -0,0 +1,27 @@ +/* + * This file is a part of Winix + * and is not publicly distributed + * + * Copyright (c) 2010, Tomasz Sowa + * All rights reserved. + * + */ + +#ifndef headerfilecmsluplugin_stats_templates +#define headerfilecmsluplugin_stats_templates + +#include "core/plugin.h" + +namespace Stats +{ + + +void CreateFunctions(PluginInfo & info); + + + +} // namespace + + + +#endif diff --git a/templates/Makefile b/templates/Makefile index e5cd145..98f1f52 100755 --- a/templates/Makefile +++ b/templates/Makefile @@ -12,7 +12,7 @@ all: $(o) depend: - makedepend -Y. -f- *.cpp > Makefile.dep + 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 diff --git a/templates/Makefile.dep b/templates/Makefile.dep index ec2808b..3f78c0e 100755 --- a/templates/Makefile.dep +++ b/templates/Makefile.dep @@ -1,20 +1,20 @@ # DO NOT DELETE -adduser.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h -adduser.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h -adduser.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h -adduser.o: ../core/request.h ../core/requesttypes.h ../core/session.h -adduser.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -adduser.o: ../core/rebus.h ../core/plugindata.h ../core/function.h -adduser.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h -adduser.o: ../core/acceptbaseparser.h ../core/htmlfilter.h -adduser.o: ../core/postmultiparser.h ../core/ticket.h -dir.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h -dir.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h -dir.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h -dir.o: ../core/request.h ../core/requesttypes.h ../core/session.h -dir.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -dir.o: ../core/rebus.h ../core/plugindata.h ../core/function.h +adduser.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h +adduser.o: misc.h localefilter.h ../core/locale.h ../confparser/confparser.h +adduser.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h +adduser.o: indexpatterns.h ../core/request.h ../core/requesttypes.h +adduser.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +adduser.o: ../core/user.h ../core/rebus.h ../core/plugindata.h +adduser.o: ../core/function.h ../core/thread.h ../core/compress.h +adduser.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h +adduser.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h +dir.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h +dir.o: localefilter.h ../core/locale.h ../confparser/confparser.h +dir.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h +dir.o: indexpatterns.h ../core/request.h ../core/requesttypes.h +dir.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +dir.o: ../core/user.h ../core/rebus.h ../core/plugindata.h ../core/function.h dir.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h dir.o: ../core/acceptbaseparser.h ../core/htmlfilter.h dir.o: ../core/postmultiparser.h ../core/ticket.h ../core/data.h @@ -22,45 +22,46 @@ dir.o: ../core/dirs.h ../core/dircontainer.h ../core/users.h dir.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h dir.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h dir.o: ../core/mount.h ../core/loadavg.h ../core/db.h ../core/misc.h -doc.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h -doc.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h -doc.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h -doc.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h -doc.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h -doc.o: ../core/groups.h ../core/group.h ../core/functions.h -doc.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h -doc.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h -doc.o: ../core/request.h ../core/requesttypes.h ../core/session.h -doc.o: ../core/plugindata.h ../core/thread.h ../core/compress.h -doc.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -doc.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h -doc.o: ../core/misc.h -indexpatterns.o: indexpatterns.h ../core/locale.h ../confparser/confparser.h -indexpatterns.o: localefilter.h ../core/log.h ../core/data.h ../core/dirs.h -indexpatterns.o: ../core/item.h ../core/dircontainer.h ../core/users.h -indexpatterns.o: ../core/user.h ../core/ugcontainer.h ../core/log.h -indexpatterns.o: ../core/groups.h ../core/group.h ../core/functions.h -indexpatterns.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h -indexpatterns.o: ../core/mount.h ../core/error.h ../core/rebus.h -indexpatterns.o: ../core/loadavg.h -item.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h -item.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h -item.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h -item.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h -item.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h -item.o: ../core/groups.h ../core/group.h ../core/functions.h -item.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h -item.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h -item.o: ../core/request.h ../core/requesttypes.h ../core/session.h -item.o: ../core/plugindata.h ../core/thread.h ../core/compress.h -item.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -item.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h -item.o: ../core/misc.h ../core/bbcodeparser.h -last.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h -last.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h -last.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h -last.o: ../core/lastcontainer.h ../core/data.h ../core/dirs.h ../core/item.h -last.o: ../core/dircontainer.h ../core/users.h ../core/user.h +doc.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h +doc.o: localefilter.h ../core/locale.h ../confparser/confparser.h +doc.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h +doc.o: indexpatterns.h ../core/data.h ../core/dirs.h ../core/item.h +doc.o: ../core/dircontainer.h ../core/users.h ../core/user.h +doc.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h +doc.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h +doc.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h +doc.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h +doc.o: ../core/session.h ../core/plugindata.h ../core/thread.h +doc.o: ../core/compress.h ../core/acceptencodingparser.h +doc.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +doc.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h +indexpatterns.o: indexpatterns.h ../../ezc/src/ezc.h ../core/locale.h +indexpatterns.o: ../confparser/confparser.h localefilter.h ../core/log.h +indexpatterns.o: ../core/data.h ../core/dirs.h ../core/item.h +indexpatterns.o: ../core/dircontainer.h ../core/users.h ../core/user.h +indexpatterns.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h +indexpatterns.o: ../core/group.h ../core/functions.h ../core/function.h +indexpatterns.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h +indexpatterns.o: ../core/error.h ../core/rebus.h ../core/loadavg.h +item.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h +item.o: localefilter.h ../core/locale.h ../confparser/confparser.h +item.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h +item.o: indexpatterns.h ../core/data.h ../core/dirs.h ../core/item.h +item.o: ../core/dircontainer.h ../core/users.h ../core/user.h +item.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h +item.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h +item.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h +item.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h +item.o: ../core/session.h ../core/plugindata.h ../core/thread.h +item.o: ../core/compress.h ../core/acceptencodingparser.h +item.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +item.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h +item.o: ../core/bbcodeparser.h +last.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h +last.o: localefilter.h ../core/locale.h ../confparser/confparser.h +last.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h +last.o: indexpatterns.h ../core/lastcontainer.h ../core/data.h ../core/dirs.h +last.o: ../core/item.h ../core/dircontainer.h ../core/users.h ../core/user.h last.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h last.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h last.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h @@ -70,13 +71,13 @@ last.o: ../core/compress.h ../core/acceptencodingparser.h last.o: ../core/acceptbaseparser.h ../core/htmlfilter.h last.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h localefilter.o: localefilter.h ../core/locale.h ../confparser/confparser.h -localefilter.o: ../core/misc.h ../core/item.h -ls.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h -ls.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h -ls.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h -ls.o: ../core/request.h ../core/requesttypes.h ../core/session.h -ls.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -ls.o: ../core/rebus.h ../core/plugindata.h ../core/function.h +localefilter.o: ../../ezc/src/ezc.h ../core/misc.h ../core/item.h +ls.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h +ls.o: localefilter.h ../core/locale.h ../confparser/confparser.h +ls.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h +ls.o: indexpatterns.h ../core/request.h ../core/requesttypes.h +ls.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +ls.o: ../core/user.h ../core/rebus.h ../core/plugindata.h ../core/function.h ls.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h ls.o: ../core/acceptbaseparser.h ../core/htmlfilter.h ls.o: ../core/postmultiparser.h ../core/ticket.h @@ -90,37 +91,40 @@ misc.o: ../core/session.h ../core/plugindata.h ../core/thread.h misc.o: ../core/compress.h ../core/acceptencodingparser.h misc.o: ../core/acceptbaseparser.h ../core/htmlfilter.h misc.o: ../core/postmultiparser.h ../core/ticket.h templates.h -misc.o: patterncacher.h ../core/item.h misc.h localefilter.h ../core/locale.h -misc.o: ../confparser/confparser.h ckeditorgetparser.h -misc.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h -mount.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h -mount.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h -mount.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h -mount.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h -mount.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h -mount.o: ../core/groups.h ../core/group.h ../core/functions.h -mount.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h -mount.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h -patterncacher.o: patterncacher.h ../core/item.h ../core/data.h ../core/dirs.h -patterncacher.o: ../core/item.h ../core/dircontainer.h ../core/users.h -patterncacher.o: ../core/user.h ../core/ugcontainer.h ../core/log.h -patterncacher.o: ../core/groups.h ../core/group.h ../core/functions.h -patterncacher.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h -patterncacher.o: ../core/mount.h ../core/error.h ../core/rebus.h -patterncacher.o: ../core/loadavg.h ../core/log.h -priv.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h -priv.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h -priv.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h -priv.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h -priv.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h -priv.o: ../core/groups.h ../core/group.h ../core/functions.h -priv.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h -priv.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h -priv.o: ../core/request.h ../core/requesttypes.h ../core/session.h -priv.o: ../core/plugindata.h ../core/thread.h ../core/compress.h -priv.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -priv.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h -priv.o: ../core/misc.h +misc.o: ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h +misc.o: localefilter.h ../core/locale.h ../confparser/confparser.h +misc.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h +misc.o: indexpatterns.h +mount.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h +mount.o: misc.h localefilter.h ../core/locale.h ../confparser/confparser.h +mount.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h +mount.o: indexpatterns.h ../core/data.h ../core/dirs.h ../core/item.h +mount.o: ../core/dircontainer.h ../core/users.h ../core/user.h +mount.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h +mount.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h +mount.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h +mount.o: ../core/loadavg.h +patterncacher.o: patterncacher.h ../core/item.h ../../ezc/src/ezc.h +patterncacher.o: ../core/data.h ../core/dirs.h ../core/item.h +patterncacher.o: ../core/dircontainer.h ../core/users.h ../core/user.h +patterncacher.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h +patterncacher.o: ../core/group.h ../core/functions.h ../core/function.h +patterncacher.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h +patterncacher.o: ../core/error.h ../core/rebus.h ../core/loadavg.h +patterncacher.o: ../core/log.h +priv.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h +priv.o: localefilter.h ../core/locale.h ../confparser/confparser.h +priv.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h +priv.o: indexpatterns.h ../core/data.h ../core/dirs.h ../core/item.h +priv.o: ../core/dircontainer.h ../core/users.h ../core/user.h +priv.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h +priv.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h +priv.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h +priv.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h +priv.o: ../core/session.h ../core/plugindata.h ../core/thread.h +priv.o: ../core/compress.h ../core/acceptencodingparser.h +priv.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +priv.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h rebus.o: ../core/request.h ../core/requesttypes.h ../core/session.h rebus.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h rebus.o: ../core/rebus.h ../core/plugindata.h ../core/function.h @@ -130,25 +134,26 @@ rebus.o: ../core/postmultiparser.h ../core/ticket.h ../core/data.h rebus.o: ../core/dirs.h ../core/dircontainer.h ../core/users.h rebus.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h rebus.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h -rebus.o: ../core/mount.h ../core/loadavg.h templates.h patterncacher.h -rebus.o: ../core/item.h misc.h localefilter.h ../core/locale.h -rebus.o: ../confparser/confparser.h ckeditorgetparser.h +rebus.o: ../core/mount.h ../core/loadavg.h templates.h ../../ezc/src/ezc.h +rebus.o: patterncacher.h ../core/item.h misc.h localefilter.h +rebus.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h rebus.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h -sys.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h -sys.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h -sys.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h -sys.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h -sys.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h -sys.o: ../core/groups.h ../core/group.h ../core/functions.h -sys.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h -sys.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h -sys.o: ../core/request.h ../core/requesttypes.h ../core/session.h -sys.o: ../core/plugindata.h ../core/thread.h ../core/compress.h -sys.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -sys.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h -sys.o: ../core/version.h -templates.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h -templates.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h +sys.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h +sys.o: localefilter.h ../core/locale.h ../confparser/confparser.h +sys.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h +sys.o: indexpatterns.h ../core/data.h ../core/dirs.h ../core/item.h +sys.o: ../core/dircontainer.h ../core/users.h ../core/user.h +sys.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h +sys.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h +sys.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h +sys.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h +sys.o: ../core/session.h ../core/plugindata.h ../core/thread.h +sys.o: ../core/compress.h ../core/acceptencodingparser.h +sys.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +sys.o: ../core/postmultiparser.h ../core/ticket.h ../core/version.h +templates.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h +templates.o: misc.h localefilter.h ../core/locale.h +templates.o: ../confparser/confparser.h ckeditorgetparser.h templates.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h templates.o: ../core/data.h ../core/dirs.h ../core/item.h templates.o: ../core/dircontainer.h ../core/users.h ../core/user.h @@ -162,87 +167,89 @@ templates.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h templates.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h templates.o: ../core/misc.h ../core/plugin.h ../core/request.h ../core/data.h templates.o: ../core/pluginmsg.h -thread.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h -thread.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h -thread.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h -thread.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h -thread.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h -thread.o: ../core/groups.h ../core/group.h ../core/functions.h -thread.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h -thread.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h -thread.o: ../core/request.h ../core/requesttypes.h ../core/session.h -thread.o: ../core/plugindata.h ../core/thread.h ../core/compress.h -thread.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -thread.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h -thread.o: ../core/misc.h -ticket.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h -ticket.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h -ticket.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h -ticket.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h -ticket.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h -ticket.o: ../core/groups.h ../core/group.h ../core/functions.h -ticket.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h -ticket.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h -ticket.o: ../core/request.h ../core/requesttypes.h ../core/session.h -ticket.o: ../core/plugindata.h ../core/thread.h ../core/compress.h -ticket.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -ticket.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h -ticket.o: ../core/misc.h -upload.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h -upload.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h -upload.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h -upload.o: ../core/request.h ../core/requesttypes.h ../core/session.h -upload.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h -upload.o: ../core/rebus.h ../core/plugindata.h ../core/function.h -upload.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h -upload.o: ../core/acceptbaseparser.h ../core/htmlfilter.h -upload.o: ../core/postmultiparser.h ../core/ticket.h -uptime.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h -uptime.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h -uptime.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h -uptime.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h -uptime.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h -uptime.o: ../core/groups.h ../core/group.h ../core/functions.h -uptime.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h -uptime.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h -user.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h -user.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h -user.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h -user.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h -user.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h -user.o: ../core/groups.h ../core/group.h ../core/functions.h -user.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h -user.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h -user.o: ../core/request.h ../core/requesttypes.h ../core/session.h -user.o: ../core/plugindata.h ../core/thread.h ../core/compress.h -user.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -user.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h -user.o: ../core/misc.h -who.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h -who.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h -who.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h -who.o: ../core/sessioncontainer.h ../core/session.h ../core/item.h -who.o: ../core/error.h ../core/log.h ../core/user.h ../core/rebus.h -who.o: ../core/plugindata.h ../core/requestcontroller.h ../content/content.h -who.o: ../templates/templates.h ../core/thread.h ../core/ticket.h -who.o: ../core/db.h ../core/group.h ../core/thread.h ../core/dircontainer.h -who.o: ../core/ugcontainer.h ../core/ticket.h ../core/sessionmanager.h -who.o: ../core/sessioncontainer.h ../core/functionparser.h -who.o: ../core/requesttypes.h ../core/data.h ../core/dirs.h ../core/users.h -who.o: ../core/groups.h ../core/functions.h ../core/function.h -who.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -who.o: ../core/loadavg.h ../core/request.h ../core/compress.h +thread.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h +thread.o: misc.h localefilter.h ../core/locale.h ../confparser/confparser.h +thread.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h +thread.o: indexpatterns.h ../core/data.h ../core/dirs.h ../core/item.h +thread.o: ../core/dircontainer.h ../core/users.h ../core/user.h +thread.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h +thread.o: ../core/group.h ../core/functions.h ../core/function.h +thread.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h +thread.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h +thread.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h +thread.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h +thread.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +thread.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h +ticket.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h +ticket.o: misc.h localefilter.h ../core/locale.h ../confparser/confparser.h +ticket.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h +ticket.o: indexpatterns.h ../core/data.h ../core/dirs.h ../core/item.h +ticket.o: ../core/dircontainer.h ../core/users.h ../core/user.h +ticket.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h +ticket.o: ../core/group.h ../core/functions.h ../core/function.h +ticket.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h +ticket.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h +ticket.o: ../core/requesttypes.h ../core/session.h ../core/plugindata.h +ticket.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h +ticket.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +ticket.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h +upload.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h +upload.o: misc.h localefilter.h ../core/locale.h ../confparser/confparser.h +upload.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h +upload.o: indexpatterns.h ../core/request.h ../core/requesttypes.h +upload.o: ../core/session.h ../core/item.h ../core/error.h ../core/log.h +upload.o: ../core/user.h ../core/rebus.h ../core/plugindata.h +upload.o: ../core/function.h ../core/thread.h ../core/compress.h +upload.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h +upload.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h +uptime.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h +uptime.o: misc.h localefilter.h ../core/locale.h ../confparser/confparser.h +uptime.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h +uptime.o: indexpatterns.h ../core/data.h ../core/dirs.h ../core/item.h +uptime.o: ../core/dircontainer.h ../core/users.h ../core/user.h +uptime.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h +uptime.o: ../core/group.h ../core/functions.h ../core/function.h +uptime.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h +uptime.o: ../core/error.h ../core/rebus.h ../core/loadavg.h +user.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h +user.o: localefilter.h ../core/locale.h ../confparser/confparser.h +user.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h +user.o: indexpatterns.h ../core/data.h ../core/dirs.h ../core/item.h +user.o: ../core/dircontainer.h ../core/users.h ../core/user.h +user.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h +user.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h +user.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h +user.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h +user.o: ../core/session.h ../core/plugindata.h ../core/thread.h +user.o: ../core/compress.h ../core/acceptencodingparser.h +user.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +user.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h +who.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h misc.h +who.o: localefilter.h ../core/locale.h ../confparser/confparser.h +who.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h +who.o: indexpatterns.h ../core/sessioncontainer.h ../core/session.h +who.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h +who.o: ../core/rebus.h ../core/plugindata.h ../core/requestcontroller.h +who.o: ../content/content.h ../templates/templates.h ../core/thread.h +who.o: ../core/ticket.h ../core/db.h ../core/group.h ../core/thread.h +who.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/ticket.h +who.o: ../core/sessionmanager.h ../core/sessioncontainer.h +who.o: ../core/functionparser.h ../core/requesttypes.h ../core/data.h +who.o: ../core/dirs.h ../core/users.h ../core/groups.h ../core/functions.h +who.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h +who.o: ../core/mount.h ../core/loadavg.h ../core/request.h ../core/compress.h who.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h who.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/misc.h -winix.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h -winix.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h -winix.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h -winix.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h -winix.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h -winix.o: ../core/groups.h ../core/group.h ../core/functions.h -winix.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h -winix.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h -winix.o: ../core/request.h ../core/requesttypes.h ../core/session.h -winix.o: ../core/plugindata.h ../core/thread.h ../core/compress.h -winix.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h -winix.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h +winix.o: templates.h ../../ezc/src/ezc.h patterncacher.h ../core/item.h +winix.o: misc.h localefilter.h ../core/locale.h ../confparser/confparser.h +winix.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h +winix.o: indexpatterns.h ../core/data.h ../core/dirs.h ../core/item.h +winix.o: ../core/dircontainer.h ../core/users.h ../core/user.h +winix.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h +winix.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h +winix.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h +winix.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h +winix.o: ../core/session.h ../core/plugindata.h ../core/thread.h +winix.o: ../core/compress.h ../core/acceptencodingparser.h +winix.o: ../core/acceptbaseparser.h ../core/htmlfilter.h +winix.o: ../core/postmultiparser.h ../core/ticket.h diff --git a/templatesnotify/Makefile b/templatesnotify/Makefile index e5cd145..98f1f52 100755 --- a/templatesnotify/Makefile +++ b/templatesnotify/Makefile @@ -12,7 +12,7 @@ all: $(o) depend: - makedepend -Y. -f- *.cpp > Makefile.dep + 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 diff --git a/templatesnotify/Makefile.dep b/templatesnotify/Makefile.dep index aa9c355..eda72a4 100755 --- a/templatesnotify/Makefile.dep +++ b/templatesnotify/Makefile.dep @@ -2,15 +2,15 @@ notify.o: templatesnotify.h ../core/mount.h ../core/locale.h notify.o: ../confparser/confparser.h ../templates/misc.h -notify.o: ../templates/localefilter.h ../core/notify.h +notify.o: ../templates/localefilter.h ../../ezc/src/ezc.h ../core/notify.h notify.o: ../templatesnotify/templatesnotify.h templatesnotify.o: templatesnotify.h ../core/mount.h ../core/locale.h templatesnotify.o: ../confparser/confparser.h ../templates/misc.h -templatesnotify.o: ../templates/localefilter.h ../core/misc.h ../core/item.h -templatesnotify.o: ../core/data.h ../core/dirs.h ../core/dircontainer.h -templatesnotify.o: ../core/users.h ../core/user.h ../core/ugcontainer.h -templatesnotify.o: ../core/log.h ../core/groups.h ../core/group.h -templatesnotify.o: ../core/functions.h ../core/function.h -templatesnotify.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h -templatesnotify.o: ../core/error.h ../core/rebus.h ../core/loadavg.h -templatesnotify.o: ../core/log.h +templatesnotify.o: ../templates/localefilter.h ../../ezc/src/ezc.h +templatesnotify.o: ../core/misc.h ../core/item.h ../core/data.h +templatesnotify.o: ../core/dirs.h ../core/dircontainer.h ../core/users.h +templatesnotify.o: ../core/user.h ../core/ugcontainer.h ../core/log.h +templatesnotify.o: ../core/groups.h ../core/group.h ../core/functions.h +templatesnotify.o: ../core/function.h ../core/lastcontainer.h +templatesnotify.o: ../core/mounts.h ../core/mount.h ../core/error.h +templatesnotify.o: ../core/rebus.h ../core/loadavg.h ../core/log.h