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

start working on 0.7.x branch

Browse Source 
- added FileLog which stores content to the file log
- now Log is only a wrapper - it puts messages to the local buffer and when logsave is used then the buffer is put to FileLog
- new base classes:
  WinixBase (Log, Config*, Synchro*)
  WinixModel : public WinixBase (morm::ModelConnector*, Plugin*)
  WinixSystem : public WinixModel (System*)
  WinixRequest : public WinixSystem (SLog, Cur*)
- singletons: log, slog, plugin are depracated - now references to them are in base classses (WinixBase, WinixModel)
- DbBase,  DbConn and Db are depracated - now we are using Morm project (in WinixModel there is a model_connector pointer)
  each thread will have its own ModelConnector





git-svn-id: svn://ttmath.org/publicrep/winix/branches/0.7.x@1146 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2018-11-21 11:03:53 +00:00
parent a7c47140ae
commit a2ffc1e81c
121 changed files with 7832 additions and 6662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

266
winixd/notify/Makefile.dep
View File

@@ -23,17 +23,29 @@ notify.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
notify.o: ../../../ezc/src/outstreams.h ../../../ezc/src/expressionparser.h
notify.o: ../../../ezc/src/patternparser.h notifythread.h
notify.o: ../../../winix/winixd/core/basethread.h
notify.o: ../../../winix/winixd/core/synchro.h templatesnotify.h
notify.o: ../../../winix/winixd/core/textstream.h
notify.o: ../../../winix/winixd/core/synchro.h
notify.o: ../../../winix/winixd/core/winixmodel.h
notify.o: ../../../winix/winixd/core/winixbase.h
notify.o: ../../../winix/winixd/core/config.h
notify.o: ../../../winix/winixd/core/htmlfilter.h
notify.o: ../../../winix/winixd/core/users.h
notify.o: ../../../winix/winixd/core/user.h
notify.o: ../../../winix/winixd/core/ugcontainer.h
notify.o: ../../../winix/winixd/core/log.h
notify.o: ../../../winix/winixd/core/textstream.h
notify.o: ../../../winix/winixd/core/logmanipulators.h
notify.o: ../../../winix/winixd/core/slog.h ../../../winix/winixd/core/cur.h
notify.o: ../../../winix/winixd/core/filelog.h
notify.o: ../../../winix/winixd/core/synchro.h
notify.o: ../../../winix/winixd/core/log.h
notify.o: ../../../winix/winixd/core/filelog.h
notify.o: ../../../winix/winixd/core/lock.h
notify.o: ../../../winix/winixd/core/plugin.h
notify.o: ../../../winix/winixd/core/pluginmsg.h
notify.o: ../../../winix/winixd/core/plugindata.h
notify.o: ../../../winix/winixd/core/winixbase.h templatesnotify.h
notify.o: ../../../winix/winixd/core/textstream.h
notify.o: ../../../winix/winixd/core/users.h
notify.o: ../../../winix/winixd/core/user.h
notify.o: ../../../winix/winixd/core/ugcontainer.h
notify.o: ../../../winix/winixd/core/lastcontainer.h
notify.o: ../../../winix/winixd/core/cur.h
notify.o: ../../../winix/winixd/core/request.h
notify.o: ../../../winix/winixd/core/requesttypes.h
notify.o: ../../../winix/winixd/core/error.h
@@ -41,13 +53,10 @@ notify.o: ../../../winix/winixd/core/config.h
notify.o: ../../../winix/winixd/templates/htmltextstream.h
notify.o: ../../../pikotools/space/spacetojson.h
notify.o: ../../../winix/winixd/core/session.h
notify.o: ../../../winix/winixd/core/plugindata.h
notify.o: ../../../winix/winixd/core/rebus.h
notify.o: ../../../winix/winixd/core/ipban.h
notify.o: ../../../winix/winixd/core/mount.h
notify.o: ../../../winix/winixd/core/lastcontainer.h
notify.o: ../../../winix/winixd/db/db.h ../../../winix/winixd/db/dbbase.h
notify.o: ../../../winix/winixd/db/dbconn.h
notify.o: ../../../winix/winixd/core/mount.h ../../../winix/winixd/db/db.h
notify.o: ../../../winix/winixd/db/dbbase.h ../../../winix/winixd/db/dbconn.h
notify.o: ../../../winix/winixd/db/dbtextstream.h
notify.o: ../../../winix/winixd/core/error.h
notify.o: ../../../winix/winixd/db/dbitemquery.h
@@ -57,6 +66,7 @@ notify.o: ../../../winix/winixd/core/user.h
notify.o: ../../../winix/winixd/core/group.h
notify.o: ../../../winix/winixd/core/dircontainer.h
notify.o: ../../../winix/winixd/core/ugcontainer.h
notify.o: ../../../winix/winixd/core/winixmodel.h
notify.o: ../../../winix/winixd/templates/templates.h
notify.o: ../../../winix/winixd/templates/patterncacher.h
notify.o: ../../../winix/winixd/templates/indexpatterns.h
@@ -69,7 +79,6 @@ notify.o: ../../../winix/winixd/core/job.h
notify.o: ../../../winix/winixd/core/basethread.h
notify.o: ../../../winix/winixd/core/dirs.h
notify.o: ../../../winix/winixd/core/dircontainer.h
notify.o: ../../../winix/winixd/notify/notify.h
notify.o: ../../../winix/winixd/core/mounts.h
notify.o: ../../../winix/winixd/core/mountparser.h
notify.o: ../../../winix/winixd/core/crypt.h ../../../winix/winixd/core/run.h
@@ -79,6 +88,7 @@ notify.o: ../../../winix/winixd/core/group.h
notify.o: ../../../winix/winixd/core/loadavg.h
notify.o: ../../../winix/winixd/core/image.h
notify.o: ../../../winix/winixd/core/threadmanager.h
notify.o: ../../../winix/winixd/notify/notify.h
notify.o: ../../../winix/winixd/core/timezones.h
notify.o: ../../../winix/winixd/core/timezone.h
notify.o: ../../../winix/winixd/core/sessionmanager.h
@@ -91,53 +101,6 @@ notify.o: ../../../winix/winixd/core/htmlfilter.h
notify.o: ../../../winix/winixd/core/request.h
notify.o: ../../../winix/winixd/core/dirs.h
notify.o: ../../../winix/winixd/core/plugin.h
notify.o: ../../../winix/winixd/core/pluginmsg.h
notify.o: ../../../winix/winixd/core/sessionmanager.h
notify.o: ../../../winix/winixd/functions/functions.h
notify.o: ../../../winix/winixd/functions/functionbase.h
notify.o: ../../../winix/winixd/core/synchro.h
notify.o: ../../../winix/winixd/functions/functionparser.h
notify.o: ../../../winix/winixd/functions/account.h
notify.o: ../../../winix/winixd/functions/adduser.h
notify.o: ../../../winix/winixd/functions/cat.h
notify.o: ../../../winix/winixd/functions/chmod.h
notify.o: ../../../winix/winixd/functions/privchanger.h
notify.o: ../../../winix/winixd/functions/chown.h
notify.o: ../../../winix/winixd/functions/ckeditor.h
notify.o: ../../../winix/winixd/functions/cp.h
notify.o: ../../../winix/winixd/functions/default.h
notify.o: ../../../winix/winixd/functions/download.h
notify.o: ../../../winix/winixd/functions/emacs.h
notify.o: ../../../winix/winixd/functions/env.h
notify.o: ../../../winix/winixd/functions/imgcrop.h
notify.o: ../../../winix/winixd/functions/last.h
notify.o: ../../../winix/winixd/functions/login.h
notify.o: ../../../winix/winixd/functions/logout.h
notify.o: ../../../winix/winixd/functions/ln.h
notify.o: ../../../winix/winixd/functions/ls.h
notify.o: ../../../winix/winixd/functions/man.h
notify.o: ../../../winix/winixd/functions/meta.h
notify.o: ../../../winix/winixd/functions/mkdir.h
notify.o: ../../../winix/winixd/functions/mv.h
notify.o: ../../../winix/winixd/functions/nicedit.h
notify.o: ../../../winix/winixd/functions/node.h
notify.o: ../../../winix/winixd/functions/passwd.h
notify.o: ../../../winix/winixd/functions/priv.h
notify.o: ../../../winix/winixd/functions/pw.h
notify.o: ../../../winix/winixd/functions/reload.h
notify.o: ../../../winix/winixd/functions/rm.h
notify.o: ../../../winix/winixd/functions/rmuser.h
notify.o: ../../../winix/winixd/functions/sort.h
notify.o: ../../../winix/winixd/functions/specialdefault.h
notify.o: ../../../winix/winixd/functions/stat.h
notify.o: ../../../winix/winixd/functions/subject.h
notify.o: ../../../winix/winixd/functions/template.h
notify.o: ../../../winix/winixd/functions/tinymce.h
notify.o: ../../../winix/winixd/functions/uname.h
notify.o: ../../../winix/winixd/functions/upload.h
notify.o: ../../../winix/winixd/functions/uptime.h
notify.o: ../../../winix/winixd/functions/who.h
notify.o: ../../../winix/winixd/functions/vim.h
notifypool.o: notifypool.h ../../../winix/winixd/templates/locale.h
notifypool.o: ../../../pikotools/space/spaceparser.h
notifypool.o: ../../../pikotools/space/space.h
@@ -152,15 +115,15 @@ notifypool.o: ../../../pikotools/convert/misc.h
notifypool.o: ../../../pikotools/membuffer/membuffer.h
notifypool.o: ../../../pikotools/textstream/types.h
notifythread.o: notifythread.h ../../../winix/winixd/core/basethread.h
notifythread.o: ../../../winix/winixd/core/synchro.h templatesnotify.h
notifythread.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
notifythread.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
notifythread.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
notifythread.o: ../../../pikotools/utf8/utf8.h ../../../ezc/src/funinfo.h
notifythread.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
notifythread.o: ../../../ezc/src/outstreams.h
notifythread.o: ../../../ezc/src/expressionparser.h
notifythread.o: ../../../ezc/src/patternparser.h
notifythread.o: ../../../winix/winixd/core/synchro.h
notifythread.o: ../../../winix/winixd/core/winixmodel.h
notifythread.o: ../../../winix/winixd/core/winixbase.h
notifythread.o: ../../../winix/winixd/core/config.h
notifythread.o: ../../../pikotools/space/spaceparser.h
notifythread.o: ../../../pikotools/space/space.h
notifythread.o: ../../../pikotools/textstream/types.h
notifythread.o: ../../../winix/winixd/core/htmlfilter.h
notifythread.o: ../../../winix/winixd/core/log.h
notifythread.o: ../../../winix/winixd/core/textstream.h
notifythread.o: ../../../pikotools/convert/misc.h
notifythread.o: ../../../pikotools/convert/text.h
@@ -171,20 +134,31 @@ notifythread.o: ../../../pikotools/convert/inttostr.h
notifythread.o: ../../../pikotools/convert/strtoint.h
notifythread.o: ../../../pikotools/textstream/textstream.h
notifythread.o: ../../../pikotools/membuffer/membuffer.h
notifythread.o: ../../../pikotools/textstream/types.h notifypool.h
notifythread.o: ../../../winix/winixd/templates/locale.h
notifythread.o: ../../../pikotools/space/spaceparser.h
notifythread.o: ../../../pikotools/space/space.h
notifythread.o: ../../../pikotools/textstream/types.h
notifythread.o: ../../../winix/winixd/core/config.h
notifythread.o: ../../../winix/winixd/core/htmlfilter.h
notifythread.o: ../../../pikotools/utf8/utf8.h
notifythread.o: ../../../winix/winixd/core/logmanipulators.h
notifythread.o: ../../../winix/winixd/core/filelog.h
notifythread.o: ../../../winix/winixd/core/synchro.h
notifythread.o: ../../../winix/winixd/core/log.h
notifythread.o: ../../../winix/winixd/core/filelog.h
notifythread.o: ../../../winix/winixd/core/lock.h
notifythread.o: ../../../winix/winixd/core/plugin.h
notifythread.o: ../../../winix/winixd/core/pluginmsg.h
notifythread.o: ../../../winix/winixd/core/plugindata.h
notifythread.o: ../../../winix/winixd/core/winixbase.h templatesnotify.h
notifythread.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
notifythread.o: ../../../ezc/src/blocks.h ../../../ezc/src/item.h
notifythread.o: ../../../ezc/src/cache.h ../../../ezc/src/functions.h
notifythread.o: ../../../ezc/src/funinfo.h ../../../ezc/src/objects.h
notifythread.o: ../../../ezc/src/pattern.h ../../../ezc/src/outstreams.h
notifythread.o: ../../../ezc/src/expressionparser.h
notifythread.o: ../../../ezc/src/patternparser.h
notifythread.o: ../../../winix/winixd/core/textstream.h notifypool.h
notifythread.o: ../../../winix/winixd/templates/locale.h
notifythread.o: ../../../winix/winixd/core/users.h
notifythread.o: ../../../winix/winixd/core/user.h
notifythread.o: ../../../winix/winixd/core/ugcontainer.h
notifythread.o: ../../../winix/winixd/core/log.h
notifythread.o: ../../../winix/winixd/core/textstream.h
notifythread.o: ../../../winix/winixd/core/logmanipulators.h
notifythread.o: ../../../winix/winixd/core/slog.h
notifythread.o: ../../../winix/winixd/core/lastcontainer.h
notifythread.o: ../../../winix/winixd/core/cur.h
notifythread.o: ../../../winix/winixd/core/request.h
notifythread.o: ../../../winix/winixd/core/requesttypes.h
@@ -193,11 +167,9 @@ notifythread.o: ../../../winix/winixd/core/config.h
notifythread.o: ../../../winix/winixd/templates/htmltextstream.h
notifythread.o: ../../../pikotools/space/spacetojson.h
notifythread.o: ../../../winix/winixd/core/session.h
notifythread.o: ../../../winix/winixd/core/plugindata.h
notifythread.o: ../../../winix/winixd/core/rebus.h
notifythread.o: ../../../winix/winixd/core/ipban.h
notifythread.o: ../../../winix/winixd/core/mount.h
notifythread.o: ../../../winix/winixd/core/lastcontainer.h
notifythread.o: ../../../winix/winixd/db/db.h
notifythread.o: ../../../winix/winixd/db/dbbase.h
notifythread.o: ../../../winix/winixd/db/dbconn.h
@@ -222,137 +194,21 @@ templatesnotify.o: ../../../ezc/src/objects.h ../../../ezc/src/pattern.h
templatesnotify.o: ../../../ezc/src/outstreams.h
templatesnotify.o: ../../../ezc/src/expressionparser.h
templatesnotify.o: ../../../ezc/src/patternparser.h
templatesnotify.o: ../../../winix/winixd/core/textstream.h
templatesnotify.o: ../../../pikotools/convert/misc.h
templatesnotify.o: ../../../pikotools/convert/text.h
templatesnotify.o: ../../../winix/winixd/core/textstream.h notifypool.h
templatesnotify.o: ../../../winix/winixd/templates/locale.h
templatesnotify.o: ../../../pikotools/space/spaceparser.h
templatesnotify.o: ../../../pikotools/space/space.h
templatesnotify.o: ../../../pikotools/textstream/types.h
templatesnotify.o: ../../../pikotools/textstream/textstream.h
templatesnotify.o: ../../../pikotools/space/space.h
templatesnotify.o: ../../../pikotools/date/date.h
templatesnotify.o: ../../../pikotools/convert/convert.h
templatesnotify.o: ../../../pikotools/convert/inttostr.h
templatesnotify.o: ../../../pikotools/convert/strtoint.h
templatesnotify.o: ../../../pikotools/textstream/textstream.h
templatesnotify.o: ../../../pikotools/convert/text.h
templatesnotify.o: ../../../pikotools/convert/misc.h
templatesnotify.o: ../../../pikotools/membuffer/membuffer.h
templatesnotify.o: ../../../pikotools/textstream/types.h notifypool.h
templatesnotify.o: ../../../winix/winixd/templates/locale.h
templatesnotify.o: ../../../pikotools/space/spaceparser.h
templatesnotify.o: ../../../pikotools/space/space.h
templatesnotify.o: ../../../pikotools/textstream/types.h
templatesnotify.o: ../../../winix/winixd/core/plugin.h
templatesnotify.o: ../../../winix/winixd/core/pluginmsg.h
templatesnotify.o: ../../../winix/winixd/core/log.h
templatesnotify.o: ../../../winix/winixd/core/textstream.h
templatesnotify.o: ../../../winix/winixd/core/logmanipulators.h
templatesnotify.o: ../../../winix/winixd/core/slog.h
templatesnotify.o: ../../../winix/winixd/core/cur.h
templatesnotify.o: ../../../winix/winixd/core/request.h
templatesnotify.o: ../../../winix/winixd/core/requesttypes.h
templatesnotify.o: ../../../winix/winixd/core/error.h
templatesnotify.o: ../../../winix/winixd/core/config.h
templatesnotify.o: ../../../winix/winixd/templates/htmltextstream.h
templatesnotify.o: ../../../pikotools/space/spacetojson.h
templatesnotify.o: ../../../winix/winixd/core/session.h
templatesnotify.o: ../../../winix/winixd/core/user.h
templatesnotify.o: ../../../winix/winixd/core/plugindata.h
templatesnotify.o: ../../../winix/winixd/core/rebus.h
templatesnotify.o: ../../../winix/winixd/core/ipban.h
templatesnotify.o: ../../../winix/winixd/core/mount.h
templatesnotify.o: ../../../winix/winixd/core/system.h
templatesnotify.o: ../../../winix/winixd/core/sessionmanager.h
templatesnotify.o: ../../../winix/winixd/core/synchro.h
templatesnotify.o: ../../../winix/winixd/functions/functions.h
templatesnotify.o: ../../../winix/winixd/functions/functionbase.h
templatesnotify.o: ../../../winix/winixd/core/item.h
templatesnotify.o: ../../../winix/winixd/db/db.h
templatesnotify.o: ../../../winix/winixd/db/dbbase.h
templatesnotify.o: ../../../winix/winixd/db/dbconn.h
templatesnotify.o: ../../../winix/winixd/db/dbtextstream.h
templatesnotify.o: ../../../winix/winixd/core/error.h
templatesnotify.o: ../../../winix/winixd/db/dbitemquery.h
templatesnotify.o: ../../../winix/winixd/db/dbitemcolumns.h
templatesnotify.o: ../../../winix/winixd/core/user.h
templatesnotify.o: ../../../winix/winixd/core/group.h
templatesnotify.o: ../../../winix/winixd/core/dircontainer.h
templatesnotify.o: ../../../winix/winixd/core/ugcontainer.h
templatesnotify.o: ../../../winix/winixd/core/request.h
templatesnotify.o: ../../../winix/winixd/core/config.h
templatesnotify.o: ../../../winix/winixd/core/htmlfilter.h
templatesnotify.o: ../../../winix/winixd/core/system.h
templatesnotify.o: ../../../winix/winixd/core/job.h
templatesnotify.o: ../../../winix/winixd/core/basethread.h
templatesnotify.o: ../../../winix/winixd/core/dirs.h
templatesnotify.o: ../../../winix/winixd/core/dircontainer.h
templatesnotify.o: ../../../winix/winixd/notify/notify.h
templatesnotify.o: ../../../winix/winixd/core/mounts.h
templatesnotify.o: ../../../winix/winixd/core/mountparser.h
templatesnotify.o: ../../../winix/winixd/core/crypt.h
templatesnotify.o: ../../../winix/winixd/core/run.h
templatesnotify.o: ../../../winix/winixd/core/users.h
templatesnotify.o: ../../../winix/winixd/core/groups.h
templatesnotify.o: ../../../winix/winixd/core/group.h
templatesnotify.o: ../../../winix/winixd/core/ugcontainer.h
templatesnotify.o: ../../../winix/winixd/core/loadavg.h
templatesnotify.o: ../../../winix/winixd/core/image.h
templatesnotify.o: ../../../winix/winixd/core/threadmanager.h
templatesnotify.o: ../../../winix/winixd/core/timezones.h
templatesnotify.o: ../../../winix/winixd/core/timezone.h
templatesnotify.o: ../../../winix/winixd/core/synchro.h
templatesnotify.o: ../../../winix/winixd/functions/functionparser.h
templatesnotify.o: ../../../winix/winixd/core/cur.h
templatesnotify.o: ../../../winix/winixd/functions/account.h
templatesnotify.o: ../../../winix/winixd/functions/adduser.h
templatesnotify.o: ../../../winix/winixd/functions/cat.h
templatesnotify.o: ../../../winix/winixd/functions/chmod.h
templatesnotify.o: ../../../winix/winixd/functions/privchanger.h
templatesnotify.o: ../../../winix/winixd/functions/chown.h
templatesnotify.o: ../../../winix/winixd/functions/ckeditor.h
templatesnotify.o: ../../../winix/winixd/functions/cp.h
templatesnotify.o: ../../../winix/winixd/functions/default.h
templatesnotify.o: ../../../winix/winixd/functions/download.h
templatesnotify.o: ../../../winix/winixd/functions/emacs.h
templatesnotify.o: ../../../winix/winixd/functions/env.h
templatesnotify.o: ../../../winix/winixd/functions/imgcrop.h
templatesnotify.o: ../../../winix/winixd/functions/last.h
templatesnotify.o: ../../../winix/winixd/templates/locale.h
templatesnotify.o: ../../../winix/winixd/functions/login.h
templatesnotify.o: ../../../winix/winixd/functions/logout.h
templatesnotify.o: ../../../winix/winixd/functions/ln.h
templatesnotify.o: ../../../winix/winixd/functions/ls.h
templatesnotify.o: ../../../winix/winixd/functions/man.h
templatesnotify.o: ../../../winix/winixd/functions/meta.h
templatesnotify.o: ../../../winix/winixd/functions/mkdir.h
templatesnotify.o: ../../../winix/winixd/functions/mv.h
templatesnotify.o: ../../../winix/winixd/functions/nicedit.h
templatesnotify.o: ../../../winix/winixd/functions/node.h
templatesnotify.o: ../../../winix/winixd/functions/passwd.h
templatesnotify.o: ../../../winix/winixd/functions/priv.h
templatesnotify.o: ../../../winix/winixd/functions/pw.h
templatesnotify.o: ../../../winix/winixd/functions/reload.h
templatesnotify.o: ../../../winix/winixd/functions/rm.h
templatesnotify.o: ../../../winix/winixd/functions/rmuser.h
templatesnotify.o: ../../../winix/winixd/functions/sort.h
templatesnotify.o: ../../../winix/winixd/functions/specialdefault.h
templatesnotify.o: ../../../winix/winixd/functions/stat.h
templatesnotify.o: ../../../winix/winixd/functions/subject.h
templatesnotify.o: ../../../winix/winixd/functions/template.h
templatesnotify.o: ../../../winix/winixd/functions/tinymce.h
templatesnotify.o: ../../../winix/winixd/functions/uname.h
templatesnotify.o: ../../../winix/winixd/functions/upload.h
templatesnotify.o: ../../../winix/winixd/functions/uptime.h
templatesnotify.o: ../../../winix/winixd/functions/who.h
templatesnotify.o: ../../../winix/winixd/functions/vim.h
templatesnotify.o: ../../../winix/winixd/core/htmlfilter.h
templatesnotify.o: ../../../winix/winixd/templates/templates.h
templatesnotify.o: ../../../winix/winixd/templates/patterncacher.h
templatesnotify.o: ../../../winix/winixd/templates/indexpatterns.h
templatesnotify.o: ../../../winix/winixd/templates/patterns.h
templatesnotify.o: ../../../winix/winixd/templates/changepatterns.h
templatesnotify.o: ../../../winix/winixd/templates/htmltextstream.h
templatesnotify.o: ../../../winix/winixd/templates/localefilter.h
templatesnotify.o: ../../../winix/winixd/core/sessionmanager.h
templatesnotify.o: ../../../winix/winixd/core/sessioncontainer.h
templatesnotify.o: ../../../winix/winixd/core/ipbancontainer.h
templatesnotify.o: ../../../winix/winixd/core/lastcontainer.h
templatesnotify.o: ../../../winix/winixd/core/sessionidmanager.h
templatesnotify.o: ../../../tito/src/base64.h ../../../tito/src/aes.h
templatesnotify.o: ../../../winix/winixd/core/misc.h
templatesnotify.o: ../../../winix/winixd/core/requesttypes.h
templatesnotify.o: ../../../winix/winixd/core/winix_const.h

23
winixd/notify/notify.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2014, Tomasz Sowa
* Copyright (c) 2008-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -55,10 +55,10 @@ void Notify::SetCur(Cur * pcur)
}
void Notify::SetConfig(Config * pconfig)
{
config = pconfig;
}
//void Notify::SetConfig(Config * pconfig)
//{
// config = pconfig;
//}
void Notify::SetUsers(Users * pusers)
@@ -77,12 +77,21 @@ void Notify::SetThreadManager(ThreadManager * pmanager)
}
//void Notify::SetFileLog(FileLog * file_log)
//{
// this->file_log = file_log;
//}
void Notify::Init()
{
notify_thread.SetConfig(config);
//notify_thread.SetConfig(config);
notify_thread.SetUsers(users);
notify_thread.SetNotifyPool(&notify_pool);
notify_thread.SetPatterns(&patterns);
//notify_thread.SetFileLog(file_log);
thread_manager->Add(&notify_thread, L"notifications");
patterns.SetDirectories(config->txt_templates_dir, config->txt_templates_dir_default);
@@ -93,7 +102,7 @@ void Notify::Init()
notify_template_activate_account = AddTemplate(L"notify_confirm_account.txt");
notify_template_reset_password = AddTemplate(L"notify_reset_password.txt");
plugin.Call((Session*)0, WINIX_NOTIFY_ADD_TEMPLATE);
plugin->Call((Session*)0, WINIX_NOTIFY_ADD_TEMPLATE);
}

12
winixd/notify/notify.h
View File

@@ -40,6 +40,9 @@
#include "notifypool.h"
#include "templates/patterns.h"
#include "notifythread.h"
#include "core/winixmodel.h"
namespace Winix
{
@@ -50,19 +53,21 @@ class Config;
class Users;
class Dirs;
class ThreadManager;
class FileLog;
class Notify
class Notify : public WinixModel
{
public:
Notify();
void SetCur(Cur * pcur);
void SetConfig(Config * pconfig);
//void SetConfig(Config * pconfig);
void SetUsers(Users * pusers);
void SetDirs(Dirs * pdirs);
void SetThreadManager(ThreadManager * pmanager);
//void SetFileLog(FileLog * file_log);
void Init();
@@ -77,9 +82,10 @@ public:
private:
Cur * cur;
Config * config;
//Config * config;
Dirs * dirs;
Users * users;
//FileLog * file_log;
ThreadManager * thread_manager;
NotifyThread notify_thread;

28
winixd/notify/notifythread.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2014, Tomasz Sowa
* Copyright (c) 2008-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -47,10 +47,10 @@ NotifyThread::NotifyThread()
// first thread (objects are locked)
void NotifyThread::SetConfig(Config * pconfig)
{
config = pconfig;
}
//void NotifyThread::SetConfig(Config * pconfig)
//{
// config = pconfig;
//}
@@ -83,10 +83,18 @@ void NotifyThread::PatternsChanged()
}
//void NotifyThread::SetFileLog(FileLog * file_log)
//{
// log.SetFileLog(file_log);
// log.Init(config->log_level, false, 1);
//}
// first thread (objects are locked)
bool NotifyThread::Init()
{
TemplatesNotifyFunctions::CreateFunctions();
plugin->Call((Session*)0, WINIX_NOTIFY_TEMPLATES_CREATEFUNCTIONS, &TemplatesNotifyFunctions::ezc_functions);
return true;
}
@@ -192,6 +200,8 @@ bool queue_end;
queue_end = (i == notify_user.end());
Unlock();
}
log << logsave;
}
}
@@ -248,11 +258,11 @@ void NotifyThread::SendMail()
// second thread
void NotifyThread::SendMail(const std::wstring & email, const std::wstring & message)
{
nlog << log1 << PT::Date(std::time(0)) << ' ';
log << log1 << PT::Date(std::time(0)) << ' ';
if( !ValidateEmail(email) )
{
nlog << log1 << "NotifyThread: email adress: " << email << " is not correct" << logend;
log << log1 << "NotifyThread: email adress: " << email << " is not correct" << logend;
return;
}
@@ -262,14 +272,14 @@ void NotifyThread::SendMail(const std::wstring & email, const std::wstring & mes
if( !sendmail )
{
nlog << log1 << "NotifyThread: can't run sendmail" << logend;
log << log1 << "NotifyThread: can't run sendmail" << logend;
return;
}
SendMail(sendmail, message);
pclose(sendmail);
nlog << log1 << "NotifyThread: email to: " << email << " has been sent" << logend << logsave;
log << log1 << "NotifyThread: email to: " << email << " has been sent" << logend << logsave;
}

11
winixd/notify/notifythread.h
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2014, Tomasz Sowa
* Copyright (c) 2008-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -41,6 +41,8 @@
#include "core/config.h"
#include "core/users.h"
#include "templates/patterns.h"
#include "core/filelog.h"
namespace Winix
{
@@ -54,15 +56,18 @@ public:
NotifyThread();
void SetConfig(Config * pconfig);
//void SetConfig(Config * pconfig);
void SetUsers(Users * pusers);
void SetNotifyPool(NotifyPool * pool);
void SetPatterns(Patterns * pat);
//void SetFileLog(FileLog * file_log);
void PatternsChanged();
private:
Config * config;
//Log log;
//Config * config;
Users * users;
NotifyPool * notify_pool;
Patterns * pat_global;

5
winixd/notify/templatesnotify.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2014, Tomasz Sowa
* Copyright (c) 2008-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -33,7 +33,6 @@
*/
#include "templatesnotify.h"
#include "core/plugin.h"
#include "core/misc.h"
namespace Winix
@@ -136,8 +135,6 @@ void CreateFunctions()
ezc_functions.Insert("notify_to_name", notify_to_name);
ezc_functions.Insert("notify_item_link", notify_item_link);
ezc_functions.Insert("notify_dir_link", notify_dir_link);
plugin.Call((Session*)0, WINIX_NOTIFY_TEMPLATES_CREATEFUNCTIONS, &ezc_functions);
}