changed path templatesnotifiy/ to notify/

i forgot to add a file: notify/notify.cpp


git-svn-id: svn://ttmath.org/publicrep/winix/trunk@687 e52654a7-88a9-db11-a3e9-0013d4bc506e

core/Makefile.dep

@@ -8,14 +8,14 @@ app.o: textstream.h ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
 app.o: ../core/user.h ../core/group.h ../core/thread.h ../core/dircontainer.h
 app.o: ../core/ugcontainer.h request.h requesttypes.h session.h error.h
 app.o: user.h plugindata.h rebus.h ../templates/htmltextstream.h
-app.o: ../templatesnotify/notify.h ../templatesnotify/notifypool.h
-app.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h
-app.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h
-app.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h ../../ezc/src/pattern.h
+app.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h
+app.o: ../core/confparser.h ../templates/misc.h ../templates/localefilter.h
+app.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+app.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 app.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
 app.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
-app.o: ../templatesnotify/notifythread.h ../core/basethread.h synchro.h
-app.o: ../templatesnotify/templatesnotify.h ../core/config.h ../core/users.h
+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 mount.h mountparser.h users.h
 app.o: groups.h group.h loadavg.h sessionmanager.h sessioncontainer.h
 app.o: ../functions/functions.h ../functions/functionbase.h ../core/request.h
@@ -48,14 +48,14 @@ config.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 config.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
 config.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 config.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
-config.o: ../templatesnotify/notify.h ../templatesnotify/notifypool.h
-config.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h
+config.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h
+config.o: ../core/confparser.h ../templates/misc.h
 config.o: ../templates/localefilter.h ../templates/locale.h
 config.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
 config.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
 config.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
-config.o: ../templates/htmltextstream.h ../templatesnotify/notifythread.h
-config.o: ../core/basethread.h synchro.h ../templatesnotify/templatesnotify.h
+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 mount.h mountparser.h users.h groups.h group.h loadavg.h
 config.o: sessionmanager.h sessioncontainer.h ../functions/functions.h
@@ -84,15 +84,14 @@ dirs.o: log.h textstream.h ../db/dbitemquery.h ../core/item.h
 dirs.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h ../core/thread.h
 dirs.o: ../core/dircontainer.h ../core/ugcontainer.h request.h requesttypes.h
 dirs.o: session.h error.h user.h plugindata.h rebus.h config.h confparser.h
-dirs.o: htmlfilter.h ../templates/htmltextstream.h
-dirs.o: ../templatesnotify/notify.h ../templatesnotify/notifypool.h
-dirs.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h
-dirs.o: ../templates/localefilter.h ../templates/locale.h ../../ezc/src/ezc.h
-dirs.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
+dirs.o: htmlfilter.h ../templates/htmltextstream.h ../notify/notify.h
+dirs.o: ../notify/notifypool.h ../templates/locale.h ../core/confparser.h
+dirs.o: ../templates/misc.h ../templates/localefilter.h ../templates/locale.h
+dirs.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
 dirs.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
 dirs.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
-dirs.o: ../templates/htmltextstream.h ../templatesnotify/notifythread.h
-dirs.o: ../core/basethread.h synchro.h ../templatesnotify/templatesnotify.h
+dirs.o: ../templates/htmltextstream.h ../notify/notifythread.h
+dirs.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h
 dirs.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h
 groups.o: groups.h group.h ugcontainer.h ../db/db.h ../db/dbbase.h
 groups.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h misc.h
@@ -128,16 +127,16 @@ mountparser.o: ../core/user.h ../core/group.h ../core/thread.h
 mountparser.o: ../core/dircontainer.h ../core/ugcontainer.h request.h
 mountparser.o: requesttypes.h session.h user.h plugindata.h rebus.h config.h
 mountparser.o: confparser.h htmlfilter.h ../templates/htmltextstream.h
-mountparser.o: ../templatesnotify/notify.h ../templatesnotify/notifypool.h
+mountparser.o: ../notify/notify.h ../notify/notifypool.h
 mountparser.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h
 mountparser.o: ../templates/localefilter.h ../templates/locale.h
 mountparser.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h
 mountparser.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 mountparser.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
 mountparser.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
-mountparser.o: ../templatesnotify/notifythread.h ../core/basethread.h
-mountparser.o: synchro.h ../templatesnotify/templatesnotify.h
-mountparser.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h
+mountparser.o: ../notify/notifythread.h ../core/basethread.h synchro.h
+mountparser.o: ../notify/templatesnotify.h ../core/config.h ../core/users.h
+mountparser.o: ugcontainer.h lastcontainer.h
 mounts.o: mounts.h mount.h error.h dirs.h item.h dircontainer.h ../db/db.h
 mounts.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 mounts.o: ../core/textstream.h misc.h ../core/error.h log.h textstream.h
@@ -146,14 +145,14 @@ mounts.o: ../core/user.h ../core/group.h ../core/thread.h
 mounts.o: ../core/dircontainer.h ../core/ugcontainer.h request.h
 mounts.o: requesttypes.h session.h user.h plugindata.h rebus.h config.h
 mounts.o: confparser.h htmlfilter.h ../templates/htmltextstream.h
-mounts.o: ../templatesnotify/notify.h ../templatesnotify/notifypool.h
-mounts.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h
+mounts.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h
+mounts.o: ../core/confparser.h ../templates/misc.h
 mounts.o: ../templates/localefilter.h ../templates/locale.h
 mounts.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
 mounts.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
 mounts.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
-mounts.o: ../templates/htmltextstream.h ../templatesnotify/notifythread.h
-mounts.o: ../core/basethread.h synchro.h ../templatesnotify/templatesnotify.h
+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 users.h groups.h
 mounts.o: group.h loadavg.h sessionmanager.h sessioncontainer.h
@@ -183,14 +182,14 @@ plugin.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 plugin.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
 plugin.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 plugin.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
-plugin.o: ../templatesnotify/notify.h ../templatesnotify/notifypool.h
-plugin.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h
+plugin.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h
+plugin.o: ../core/confparser.h ../templates/misc.h
 plugin.o: ../templates/localefilter.h ../templates/locale.h
 plugin.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
 plugin.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
 plugin.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
-plugin.o: ../templates/htmltextstream.h ../templatesnotify/notifythread.h
-plugin.o: ../core/basethread.h synchro.h ../templatesnotify/templatesnotify.h
+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 mount.h mountparser.h users.h groups.h group.h loadavg.h
 plugin.o: sessionmanager.h sessioncontainer.h ../functions/functions.h
@@ -219,18 +218,18 @@ plugindata.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 plugindata.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
 plugindata.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 plugindata.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
-plugindata.o: ../templatesnotify/notify.h ../templatesnotify/notifypool.h
-plugindata.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h
+plugindata.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h
+plugindata.o: ../core/confparser.h ../templates/misc.h
 plugindata.o: ../templates/localefilter.h ../templates/locale.h
 plugindata.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h
 plugindata.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
 plugindata.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
 plugindata.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
-plugindata.o: ../templatesnotify/notifythread.h ../core/basethread.h
-plugindata.o: synchro.h ../templatesnotify/templatesnotify.h ../core/config.h
-plugindata.o: ../core/users.h ugcontainer.h lastcontainer.h mounts.h mount.h
-plugindata.o: mountparser.h users.h groups.h group.h loadavg.h
-plugindata.o: sessionmanager.h sessioncontainer.h ../functions/functions.h
+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 mount.h mountparser.h
+plugindata.o: users.h groups.h group.h loadavg.h sessionmanager.h
+plugindata.o: sessioncontainer.h ../functions/functions.h
 plugindata.o: ../functions/functionbase.h ../core/request.h ../core/system.h
 plugindata.o: ../functions/functionparser.h ../functions/adduser.h
 plugindata.o: ../functions/cat.h ../functions/chmod.h
@@ -264,18 +263,17 @@ request.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
 request.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
 request.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 request.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
-request.o: ../templatesnotify/notify.h ../templatesnotify/notifypool.h
-request.o: ../templates/locale.h ../core/confparser.h ../templates/misc.h
+request.o: ../notify/notify.h ../notify/notifypool.h ../templates/locale.h
+request.o: ../core/confparser.h ../templates/misc.h
 request.o: ../templates/localefilter.h ../templates/locale.h
 request.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
 request.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
 request.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
-request.o: ../templates/htmltextstream.h ../templatesnotify/notifythread.h
-request.o: ../core/basethread.h synchro.h
-request.o: ../templatesnotify/templatesnotify.h ../core/config.h
-request.o: ../core/users.h ugcontainer.h lastcontainer.h mounts.h mount.h
-request.o: mountparser.h users.h groups.h group.h loadavg.h sessionmanager.h
-request.o: sessioncontainer.h ../functions/functions.h
+request.o: ../templates/htmltextstream.h ../notify/notifythread.h
+request.o: ../core/basethread.h synchro.h ../notify/templatesnotify.h
+request.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h
+request.o: mounts.h mount.h mountparser.h users.h groups.h group.h loadavg.h
+request.o: sessionmanager.h sessioncontainer.h ../functions/functions.h
 request.o: ../functions/functionbase.h ../core/request.h ../core/system.h
 request.o: ../functions/functionparser.h ../functions/adduser.h
 request.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
@@ -309,16 +307,15 @@ sessionmanager.o: ../db/dbtextstream.h ../core/error.h log.h
 sessionmanager.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
 sessionmanager.o: ../core/user.h ../core/group.h ../core/thread.h
 sessionmanager.o: ../core/dircontainer.h ../core/ugcontainer.h
-sessionmanager.o: ../templatesnotify/notify.h ../templatesnotify/notifypool.h
+sessionmanager.o: ../notify/notify.h ../notify/notifypool.h
 sessionmanager.o: ../templates/locale.h ../core/confparser.h
 sessionmanager.o: ../templates/misc.h ../templates/localefilter.h
 sessionmanager.o: ../templates/locale.h ../../ezc/src/ezc.h
 sessionmanager.o: ../../ezc/src/utf8.h ../../ezc/src/generator.h
 sessionmanager.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
 sessionmanager.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
-sessionmanager.o: ../templates/htmltextstream.h
-sessionmanager.o: ../templatesnotify/notifythread.h ../core/basethread.h
-sessionmanager.o: synchro.h ../templatesnotify/templatesnotify.h
+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: mount.h mountparser.h users.h groups.h group.h loadavg.h
 sessionmanager.o: sessionparser.h plugin.h pluginmsg.h
@@ -357,20 +354,20 @@ system.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
 system.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
 system.o: request.h requesttypes.h session.h error.h user.h plugindata.h
 system.o: rebus.h config.h confparser.h htmlfilter.h
-system.o: ../templates/htmltextstream.h ../templatesnotify/notify.h
-system.o: ../templatesnotify/notifypool.h ../templates/locale.h
-system.o: ../core/confparser.h ../templates/misc.h
-system.o: ../templates/localefilter.h ../templates/locale.h
-system.o: ../../ezc/src/ezc.h ../../ezc/src/utf8.h ../../ezc/src/generator.h
-system.o: ../../ezc/src/pattern.h ../../ezc/src/functions.h
-system.o: ../../ezc/src/funinfo.h ../../ezc/src/stringconv.h
-system.o: ../templates/htmltextstream.h ../templatesnotify/notifythread.h
-system.o: ../core/basethread.h synchro.h ../templatesnotify/templatesnotify.h
-system.o: ../core/config.h ../core/users.h ugcontainer.h lastcontainer.h
-system.o: mounts.h mount.h mountparser.h users.h groups.h group.h loadavg.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/request.h
-system.o: ../core/system.h ../core/sessionmanager.h
+system.o: ../templates/htmltextstream.h ../notify/notify.h
+system.o: ../notify/notifypool.h ../templates/locale.h ../core/confparser.h
+system.o: ../templates/misc.h ../templates/localefilter.h
+system.o: ../templates/locale.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
+system.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
+system.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
+system.o: ../../ezc/src/stringconv.h ../templates/htmltextstream.h
+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 mount.h mountparser.h
+system.o: users.h groups.h group.h loadavg.h ../templates/templates.h
+system.o: ../templates/patterncacher.h ../templates/ckeditorgetparser.h
+system.o: ../core/httpsimpleparser.h ../core/log.h
+system.o: ../templates/indexpatterns.h ../core/request.h ../core/system.h
+system.o: ../core/sessionmanager.h
 textstream.o: textstream.h misc.h item.h
 users.o: users.h

core/dirs.h

@@ -19,7 +19,7 @@
 #include "dircontainer.h"
 #include "db/db.h"
 #include "request.h"
-#include "templatesnotify/notify.h"
+#include "notify/notify.h"
 
 
 // we do not support '..' in a path (for simplicity and security reasons)

core/system.h

@@ -10,7 +10,7 @@
 #ifndef headerfilecmslucoresystem
 #define headerfilecmslucoresystem
 
-
+#include <ctime>
 #include "dirs.h"
 #include "mounts.h"
 #include "db/db.h"
@@ -21,8 +21,7 @@
 #include "rebus.h"
 #include "loadavg.h"
 #include "synchro.h"
-#include <ctime>
-#include "templatesnotify/notify.h"
+#include "notify/notify.h"