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

some work on dependency injection

Browse Source 
git-svn-id: svn://ttmath.org/publicrep/winix/branches/0.7.x@1147 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2018-11-21 17:51:15 +00:00
parent a2ffc1e81c
commit 89d303f375
64 changed files with 1734 additions and 1161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
winixd/plugins/export/Makefile.dep
View File

@@ -23,7 +23,6 @@ edb.o: ../../../../winix/winixd/core/winixbase.h
edb.o: ../../../../winix/winixd/core/config.h
edb.o: ../../../../pikotools/space/spaceparser.h
edb.o: ../../../../pikotools/space/space.h
edb.o: ../../../../winix/winixd/core/htmlfilter.h
edb.o: ../../../../winix/winixd/core/log.h
edb.o: ../../../../winix/winixd/core/textstream.h
edb.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -65,7 +64,6 @@ exportinfo.o: ../../../../winix/winixd/core/winixbase.h
exportinfo.o: ../../../../winix/winixd/core/config.h
exportinfo.o: ../../../../pikotools/space/spaceparser.h
exportinfo.o: ../../../../pikotools/space/space.h
exportinfo.o: ../../../../winix/winixd/core/htmlfilter.h
exportinfo.o: ../../../../winix/winixd/core/log.h
exportinfo.o: ../../../../winix/winixd/core/textstream.h
exportinfo.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -209,7 +207,6 @@ funexport.o: ../../../../pikotools/space/space.h
funexport.o: ../../../../ezc/src/outstreams.h
funexport.o: ../../../../winix/winixd/core/config.h
funexport.o: ../../../../pikotools/space/spaceparser.h
funexport.o: ../../../../winix/winixd/core/htmlfilter.h
funexport.o: ../../../../winix/winixd/core/log.h
funexport.o: ../../../../winix/winixd/core/logmanipulators.h
funexport.o: ../../../../winix/winixd/core/filelog.h
@@ -296,7 +293,6 @@ init.o: ../../../../winix/winixd/core/winixbase.h
init.o: ../../../../winix/winixd/core/config.h
init.o: ../../../../pikotools/space/spaceparser.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../winix/winixd/core/htmlfilter.h
init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/textstream.h
init.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -390,3 +386,48 @@ init.o: ../../../../winix/winixd/core/system.h
init.o: ../../../../winix/winixd/core/sessionidmanager.h
init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
init.o: ../../../../winix/winixd/core/slog.h
init.o: ../../../../winix/winixd/functions/functions.h
init.o: ../../../../winix/winixd/functions/functionbase.h
init.o: ../../../../winix/winixd/functions/functionparser.h
init.o: ../../../../winix/winixd/functions/account.h
init.o: ../../../../winix/winixd/functions/adduser.h
init.o: ../../../../winix/winixd/functions/cat.h
init.o: ../../../../winix/winixd/functions/chmod.h
init.o: ../../../../winix/winixd/functions/privchanger.h
init.o: ../../../../winix/winixd/functions/chown.h
init.o: ../../../../winix/winixd/functions/ckeditor.h
init.o: ../../../../winix/winixd/functions/cp.h
init.o: ../../../../winix/winixd/functions/default.h
init.o: ../../../../winix/winixd/functions/download.h
init.o: ../../../../winix/winixd/functions/emacs.h
init.o: ../../../../winix/winixd/functions/env.h
init.o: ../../../../winix/winixd/functions/imgcrop.h
init.o: ../../../../winix/winixd/functions/last.h
init.o: ../../../../winix/winixd/functions/login.h
init.o: ../../../../winix/winixd/functions/logout.h
init.o: ../../../../winix/winixd/functions/ln.h
init.o: ../../../../winix/winixd/functions/ls.h
init.o: ../../../../winix/winixd/functions/man.h
init.o: ../../../../winix/winixd/functions/meta.h
init.o: ../../../../winix/winixd/functions/mkdir.h
init.o: ../../../../winix/winixd/functions/mv.h
init.o: ../../../../winix/winixd/functions/nicedit.h
init.o: ../../../../winix/winixd/functions/node.h
init.o: ../../../../winix/winixd/functions/passwd.h
init.o: ../../../../winix/winixd/functions/priv.h
init.o: ../../../../winix/winixd/functions/pw.h
init.o: ../../../../winix/winixd/functions/reload.h
init.o: ../../../../winix/winixd/functions/rm.h
init.o: ../../../../winix/winixd/functions/rmuser.h
init.o: ../../../../winix/winixd/functions/sort.h
init.o: ../../../../winix/winixd/functions/specialdefault.h
init.o: ../../../../winix/winixd/functions/stat.h
init.o: ../../../../winix/winixd/functions/subject.h
init.o: ../../../../winix/winixd/functions/template.h
init.o: ../../../../winix/winixd/functions/tinymce.h
init.o: ../../../../winix/winixd/functions/uname.h
init.o: ../../../../winix/winixd/functions/upload.h
init.o: ../../../../winix/winixd/functions/uptime.h
init.o: ../../../../winix/winixd/functions/who.h
init.o: ../../../../winix/winixd/functions/vim.h
init.o: ../../../../winix/winixd/core/htmlfilter.h

2
winixd/plugins/export/edb.cpp
View File

@@ -204,7 +204,7 @@ bool EDb::GetExportDirs(std::vector<ExportDir> & export_tab, bool clear_tab)
}
else
{
slog << "There is not such a directory: " << dir_temp << " (skipping)" << logend;
//slog << "There is not such a directory: " << dir_temp << " (skipping)" << logend;
}
}
}

1
winixd/plugins/export/exportinfo.cpp
View File

@@ -32,6 +32,7 @@
*
*/
#include <algorithm>
#include "core/log.h"
#include "exportinfo.h"
#include "convert/text.h"

7
winixd/plugins/export/exportinfo.h
View File

@@ -41,17 +41,18 @@
#include "edb.h"
#include "message.h"
#include "exportthread.h"
#include "core/winixbase.h"
namespace Winix
{
namespace Export
{
class ExportInfo
class ExportInfo : public WinixBase
{
public:

12
winixd/plugins/export/init.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -39,12 +39,13 @@
#include "exportinfo.h"
#include "edb.h"
#include "funexport.h"
#include "functions/functions.h"
namespace Winix
{
extern "C" void Init(PluginInfo &);
@@ -71,9 +72,7 @@ void AddWinixFunctions(PluginInfo & info)
void AddMountParams(PluginInfo & info)
{
using TemplatesFunctions::system;
mount_par_export_conf = system->mounts.AddMountPar(L"export_conf");
mount_par_export_conf = info.system->mounts.AddMountPar(L"export_conf");
}
@@ -252,9 +251,12 @@ void Init(PluginInfo & info)
{
using namespace Export;
info.set_dependency_for(edb);
edb.SetConn(info.db->GetConn());
edb.LogQueries(info.config->log_db_query);
edb.SetDirs(&info.system->dirs);
info.set_dependency_for(export_info);
export_info.SetSystem(info.system);
export_info.SetConfig(info.config);
export_info.SetEDb(&edb);

48
winixd/plugins/gallery/Makefile.dep
View File

@@ -23,7 +23,6 @@ gallery.o: ../../../../winix/winixd/core/winixbase.h
gallery.o: ../../../../winix/winixd/core/config.h
gallery.o: ../../../../pikotools/space/spaceparser.h
gallery.o: ../../../../pikotools/space/space.h
gallery.o: ../../../../winix/winixd/core/htmlfilter.h
gallery.o: ../../../../winix/winixd/core/log.h
gallery.o: ../../../../winix/winixd/core/textstream.h
gallery.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -137,7 +136,6 @@ init.o: ../../../../winix/winixd/core/winixbase.h
init.o: ../../../../winix/winixd/core/config.h
init.o: ../../../../pikotools/space/spaceparser.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../winix/winixd/core/htmlfilter.h
init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/textstream.h
init.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -221,6 +219,51 @@ init.o: ../../../../winix/winixd/core/sessionidmanager.h
init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
init.o: ../../../../winix/winixd/core/slog.h galleryinfo.h
init.o: ../../../../winix/winixd/core/plugin.h
init.o: ../../../../winix/winixd/functions/functions.h
init.o: ../../../../winix/winixd/functions/functionbase.h
init.o: ../../../../winix/winixd/functions/functionparser.h
init.o: ../../../../winix/winixd/functions/account.h
init.o: ../../../../winix/winixd/functions/adduser.h
init.o: ../../../../winix/winixd/functions/cat.h
init.o: ../../../../winix/winixd/functions/chmod.h
init.o: ../../../../winix/winixd/functions/privchanger.h
init.o: ../../../../winix/winixd/functions/chown.h
init.o: ../../../../winix/winixd/functions/ckeditor.h
init.o: ../../../../winix/winixd/functions/cp.h
init.o: ../../../../winix/winixd/functions/default.h
init.o: ../../../../winix/winixd/functions/download.h
init.o: ../../../../winix/winixd/functions/emacs.h
init.o: ../../../../winix/winixd/functions/env.h
init.o: ../../../../winix/winixd/functions/imgcrop.h
init.o: ../../../../winix/winixd/functions/last.h
init.o: ../../../../winix/winixd/functions/login.h
init.o: ../../../../winix/winixd/functions/logout.h
init.o: ../../../../winix/winixd/functions/ln.h
init.o: ../../../../winix/winixd/functions/ls.h
init.o: ../../../../winix/winixd/functions/man.h
init.o: ../../../../winix/winixd/functions/meta.h
init.o: ../../../../winix/winixd/functions/mkdir.h
init.o: ../../../../winix/winixd/functions/mv.h
init.o: ../../../../winix/winixd/functions/nicedit.h
init.o: ../../../../winix/winixd/functions/node.h
init.o: ../../../../winix/winixd/functions/passwd.h
init.o: ../../../../winix/winixd/functions/priv.h
init.o: ../../../../winix/winixd/functions/pw.h
init.o: ../../../../winix/winixd/functions/reload.h
init.o: ../../../../winix/winixd/functions/rm.h
init.o: ../../../../winix/winixd/functions/rmuser.h
init.o: ../../../../winix/winixd/functions/sort.h
init.o: ../../../../winix/winixd/functions/specialdefault.h
init.o: ../../../../winix/winixd/functions/stat.h
init.o: ../../../../winix/winixd/functions/subject.h
init.o: ../../../../winix/winixd/functions/template.h
init.o: ../../../../winix/winixd/functions/tinymce.h
init.o: ../../../../winix/winixd/functions/uname.h
init.o: ../../../../winix/winixd/functions/upload.h
init.o: ../../../../winix/winixd/functions/uptime.h
init.o: ../../../../winix/winixd/functions/who.h
init.o: ../../../../winix/winixd/functions/vim.h
init.o: ../../../../winix/winixd/core/htmlfilter.h
templates.o: gallery.h ../../../../winix/winixd/functions/functionbase.h
templates.o: ../../../../winix/winixd/core/item.h
templates.o: ../../../../pikotools/space/space.h
@@ -244,7 +287,6 @@ templates.o: ../../../../winix/winixd/core/winixbase.h
templates.o: ../../../../winix/winixd/core/config.h
templates.o: ../../../../pikotools/space/spaceparser.h
templates.o: ../../../../pikotools/space/space.h
templates.o: ../../../../winix/winixd/core/htmlfilter.h
templates.o: ../../../../winix/winixd/core/log.h
templates.o: ../../../../winix/winixd/core/textstream.h
templates.o: ../../../../winix/winixd/core/logmanipulators.h

4
winixd/plugins/gallery/init.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -35,6 +35,8 @@
#include "gallery.h"
#include "core/log.h"
#include "core/plugin.h"
#include "functions/functions.h"
namespace Winix
{

338
winixd/plugins/group/Makefile.dep
View File

@@ -3,6 +3,14 @@
groupinfo.o: groupinfo.h groups.h ../../../../pikotools/space/spaceparser.h
groupinfo.o: ../../../../pikotools/space/space.h
groupinfo.o: ../../../../pikotools/textstream/types.h
groupinfo.o: ../../../../winix/winixd/core/winixrequest.h
groupinfo.o: ../../../../winix/winixd/core/winixsystem.h
groupinfo.o: ../../../../winix/winixd/core/winixmodel.h
groupinfo.o: ../../../../winix/winixd/core/winixbase.h
groupinfo.o: ../../../../winix/winixd/core/config.h
groupinfo.o: ../../../../winix/winixd/core/log.h
groupinfo.o: ../../../../winix/winixd/core/textstream.h
groupinfo.o: ../../../../winix/winixd/core/misc.h
groupinfo.o: ../../../../winix/winixd/core/item.h
groupinfo.o: ../../../../pikotools/space/space.h
groupinfo.o: ../../../../pikotools/date/date.h
@@ -10,33 +18,28 @@ groupinfo.o: ../../../../pikotools/convert/convert.h
groupinfo.o: ../../../../pikotools/convert/inttostr.h
groupinfo.o: ../../../../pikotools/convert/strtoint.h
groupinfo.o: ../../../../pikotools/convert/text.h
groupinfo.o: ../../../../pikotools/convert/misc.h
groupinfo.o: ../../../../winix/winixd/core/system.h
groupinfo.o: ../../../../winix/winixd/core/job.h
groupinfo.o: ../../../../winix/winixd/core/basethread.h
groupinfo.o: ../../../../winix/winixd/core/synchro.h
groupinfo.o: ../../../../winix/winixd/core/winixmodel.h
groupinfo.o: ../../../../winix/winixd/core/winixbase.h
groupinfo.o: ../../../../winix/winixd/core/config.h
groupinfo.o: ../../../../winix/winixd/core/htmlfilter.h
groupinfo.o: ../../../../winix/winixd/core/log.h
groupinfo.o: ../../../../winix/winixd/core/textstream.h
groupinfo.o: ../../../../winix/winixd/core/requesttypes.h
groupinfo.o: ../../../../pikotools/textstream/textstream.h
groupinfo.o: ../../../../pikotools/membuffer/membuffer.h
groupinfo.o: ../../../../pikotools/textstream/types.h
groupinfo.o: ../../../../pikotools/utf8/utf8.h
groupinfo.o: ../../../../winix/winixd/core/winix_const.h
groupinfo.o: ../../../../winix/winixd/core/logmanipulators.h
groupinfo.o: ../../../../winix/winixd/core/filelog.h
groupinfo.o: ../../../../winix/winixd/core/synchro.h
groupinfo.o: ../../../../winix/winixd/core/log.h
groupinfo.o: ../../../../winix/winixd/core/filelog.h
groupinfo.o: ../../../../winix/winixd/core/lock.h
groupinfo.o: ../../../../winix/winixd/core/synchro.h
groupinfo.o: ../../../../winix/winixd/core/plugin.h
groupinfo.o: ../../../../winix/winixd/core/pluginmsg.h
groupinfo.o: ../../../../winix/winixd/core/plugindata.h
groupinfo.o: ../../../../winix/winixd/core/winixbase.h
groupinfo.o: ../../../../winix/winixd/core/system.h
groupinfo.o: ../../../../winix/winixd/core/job.h
groupinfo.o: ../../../../winix/winixd/core/basethread.h
groupinfo.o: ../../../../winix/winixd/core/winixmodel.h
groupinfo.o: ../../../../winix/winixd/core/dirs.h
groupinfo.o: ../../../../winix/winixd/core/item.h
groupinfo.o: ../../../../winix/winixd/core/dircontainer.h
groupinfo.o: ../../../../winix/winixd/db/db.h
groupinfo.o: ../../../../winix/winixd/db/dbbase.h
@@ -45,13 +48,13 @@ groupinfo.o: ../../../../winix/winixd/db/dbtextstream.h
groupinfo.o: ../../../../winix/winixd/core/textstream.h
groupinfo.o: ../../../../winix/winixd/core/error.h
groupinfo.o: ../../../../winix/winixd/db/dbitemquery.h
groupinfo.o: ../../../../winix/winixd/core/item.h
groupinfo.o: ../../../../winix/winixd/db/dbitemcolumns.h
groupinfo.o: ../../../../winix/winixd/core/user.h
groupinfo.o: ../../../../winix/winixd/core/group.h
groupinfo.o: ../../../../winix/winixd/core/dircontainer.h
groupinfo.o: ../../../../winix/winixd/core/ugcontainer.h
groupinfo.o: ../../../../winix/winixd/core/request.h
groupinfo.o: ../../../../winix/winixd/core/requesttypes.h
groupinfo.o: ../../../../winix/winixd/core/error.h
groupinfo.o: ../../../../winix/winixd/core/config.h
groupinfo.o: ../../../../winix/winixd/templates/htmltextstream.h
@@ -89,13 +92,118 @@ groupinfo.o: ../../../../winix/winixd/notify/notifythread.h
groupinfo.o: ../../../../winix/winixd/core/basethread.h
groupinfo.o: ../../../../winix/winixd/notify/templatesnotify.h
groupinfo.o: ../../../../winix/winixd/core/users.h
groupinfo.o: ../../../../winix/winixd/core/winixmodel.h
groupinfo.o: ../../../../winix/winixd/core/timezones.h
groupinfo.o: ../../../../winix/winixd/core/timezone.h
groupinfo.o: ../../../../winix/winixd/core/cur.h
groupinfo.o: ../../../../winix/winixd/core/sessionmanager.h
groupinfo.o: ../../../../winix/winixd/core/sessioncontainer.h
groupinfo.o: ../../../../winix/winixd/core/ipbancontainer.h
groupinfo.o: ../../../../winix/winixd/core/system.h
groupinfo.o: ../../../../winix/winixd/core/sessionidmanager.h
groupinfo.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
groupinfo.o: ../../../../winix/winixd/core/slog.h
groups.o: groups.h ../../../../pikotools/space/spaceparser.h
groups.o: ../../../../pikotools/space/space.h
groups.o: ../../../../pikotools/textstream/types.h
groups.o: ../../../../winix/winixd/core/winixrequest.h
groups.o: ../../../../winix/winixd/core/winixsystem.h
groups.o: ../../../../winix/winixd/core/winixmodel.h
groups.o: ../../../../winix/winixd/core/winixbase.h
groups.o: ../../../../winix/winixd/core/config.h
groups.o: ../../../../winix/winixd/core/log.h
groups.o: ../../../../winix/winixd/core/textstream.h
groups.o: ../../../../winix/winixd/core/misc.h
groups.o: ../../../../winix/winixd/core/item.h
groups.o: ../../../../pikotools/space/space.h
groups.o: ../../../../pikotools/date/date.h
groups.o: ../../../../pikotools/convert/convert.h
groups.o: ../../../../pikotools/convert/inttostr.h
groups.o: ../../../../pikotools/convert/strtoint.h
groups.o: ../../../../pikotools/convert/text.h
groups.o: ../../../../winix/winixd/core/requesttypes.h
groups.o: ../../../../pikotools/textstream/textstream.h
groups.o: ../../../../pikotools/membuffer/membuffer.h
groups.o: ../../../../pikotools/textstream/types.h
groups.o: ../../../../pikotools/utf8/utf8.h
groups.o: ../../../../winix/winixd/core/winix_const.h
groups.o: ../../../../winix/winixd/core/logmanipulators.h
groups.o: ../../../../winix/winixd/core/filelog.h
groups.o: ../../../../winix/winixd/core/synchro.h
groups.o: ../../../../winix/winixd/core/log.h
groups.o: ../../../../winix/winixd/core/filelog.h
groups.o: ../../../../winix/winixd/core/lock.h
groups.o: ../../../../winix/winixd/core/synchro.h
groups.o: ../../../../winix/winixd/core/plugin.h
groups.o: ../../../../winix/winixd/core/pluginmsg.h
groups.o: ../../../../winix/winixd/core/plugindata.h
groups.o: ../../../../winix/winixd/core/winixbase.h
groups.o: ../../../../winix/winixd/core/system.h
groups.o: ../../../../winix/winixd/core/job.h
groups.o: ../../../../winix/winixd/core/basethread.h
groups.o: ../../../../winix/winixd/core/winixmodel.h
groups.o: ../../../../winix/winixd/core/dirs.h
groups.o: ../../../../winix/winixd/core/dircontainer.h
groups.o: ../../../../winix/winixd/db/db.h
groups.o: ../../../../winix/winixd/db/dbbase.h
groups.o: ../../../../winix/winixd/db/dbconn.h
groups.o: ../../../../winix/winixd/db/dbtextstream.h
groups.o: ../../../../winix/winixd/core/textstream.h
groups.o: ../../../../winix/winixd/core/error.h
groups.o: ../../../../winix/winixd/db/dbitemquery.h
groups.o: ../../../../winix/winixd/core/item.h
groups.o: ../../../../winix/winixd/db/dbitemcolumns.h
groups.o: ../../../../winix/winixd/core/user.h
groups.o: ../../../../winix/winixd/core/group.h
groups.o: ../../../../winix/winixd/core/dircontainer.h
groups.o: ../../../../winix/winixd/core/ugcontainer.h
groups.o: ../../../../winix/winixd/core/request.h
groups.o: ../../../../winix/winixd/core/error.h
groups.o: ../../../../winix/winixd/core/config.h
groups.o: ../../../../winix/winixd/templates/htmltextstream.h
groups.o: ../../../../pikotools/space/spacetojson.h
groups.o: ../../../../ezc/src/outstreams.h
groups.o: ../../../../winix/winixd/core/mounts.h
groups.o: ../../../../winix/winixd/core/mount.h
groups.o: ../../../../winix/winixd/core/mountparser.h
groups.o: ../../../../winix/winixd/core/crypt.h
groups.o: ../../../../winix/winixd/core/run.h
groups.o: ../../../../winix/winixd/core/user.h
groups.o: ../../../../winix/winixd/core/users.h
groups.o: ../../../../winix/winixd/core/ugcontainer.h
groups.o: ../../../../winix/winixd/core/lastcontainer.h
groups.o: ../../../../winix/winixd/core/cur.h
groups.o: ../../../../winix/winixd/core/session.h
groups.o: ../../../../winix/winixd/core/rebus.h
groups.o: ../../../../winix/winixd/core/ipban.h
groups.o: ../../../../winix/winixd/core/loadavg.h
groups.o: ../../../../winix/winixd/core/image.h
groups.o: ../../../../winix/winixd/core/threadmanager.h
groups.o: ../../../../winix/winixd/notify/notify.h
groups.o: ../../../../winix/winixd/notify/notifypool.h
groups.o: ../../../../winix/winixd/templates/locale.h
groups.o: ../../../../winix/winixd/templates/patterns.h
groups.o: ../../../../winix/winixd/templates/locale.h
groups.o: ../../../../winix/winixd/templates/localefilter.h
groups.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
groups.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
groups.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
groups.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
groups.o: ../../../../ezc/src/expressionparser.h
groups.o: ../../../../ezc/src/patternparser.h
groups.o: ../../../../winix/winixd/notify/notifythread.h
groups.o: ../../../../winix/winixd/core/basethread.h
groups.o: ../../../../winix/winixd/notify/templatesnotify.h
groups.o: ../../../../winix/winixd/core/users.h
groups.o: ../../../../winix/winixd/core/timezones.h
groups.o: ../../../../winix/winixd/core/timezone.h
groups.o: ../../../../winix/winixd/core/cur.h
groups.o: ../../../../winix/winixd/core/sessionmanager.h
groups.o: ../../../../winix/winixd/core/sessioncontainer.h
groups.o: ../../../../winix/winixd/core/ipbancontainer.h
groups.o: ../../../../winix/winixd/core/system.h
groups.o: ../../../../winix/winixd/core/sessionidmanager.h
groups.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
groups.o: ../../../../winix/winixd/core/slog.h
init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/plugin.h
init.o: ../../../../winix/winixd/core/pluginmsg.h
@@ -104,35 +212,38 @@ init.o: ../../../../winix/winixd/core/winixbase.h groupinfo.h groups.h
init.o: ../../../../pikotools/space/spaceparser.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../winix/winixd/core/winixrequest.h
init.o: ../../../../winix/winixd/core/winixsystem.h
init.o: ../../../../winix/winixd/core/winixmodel.h
init.o: ../../../../winix/winixd/core/winixbase.h
init.o: ../../../../winix/winixd/core/config.h
init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/textstream.h
init.o: ../../../../winix/winixd/core/misc.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../pikotools/space/space.h ../../../../pikotools/date/date.h
init.o: ../../../../pikotools/convert/convert.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../pikotools/convert/strtoint.h
init.o: ../../../../pikotools/convert/text.h
init.o: ../../../../pikotools/convert/misc.h
init.o: ../../../../winix/winixd/core/system.h
init.o: ../../../../winix/winixd/core/job.h
init.o: ../../../../winix/winixd/core/basethread.h
init.o: ../../../../winix/winixd/core/synchro.h
init.o: ../../../../winix/winixd/core/winixmodel.h
init.o: ../../../../winix/winixd/core/winixbase.h
init.o: ../../../../winix/winixd/core/config.h
init.o: ../../../../winix/winixd/core/htmlfilter.h
init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/textstream.h
init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../pikotools/textstream/textstream.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/utf8/utf8.h
init.o: ../../../../winix/winixd/core/winix_const.h
init.o: ../../../../winix/winixd/core/logmanipulators.h
init.o: ../../../../winix/winixd/core/filelog.h
init.o: ../../../../winix/winixd/core/synchro.h
init.o: ../../../../winix/winixd/core/filelog.h
init.o: ../../../../winix/winixd/core/lock.h
init.o: ../../../../winix/winixd/core/synchro.h
init.o: ../../../../winix/winixd/core/plugin.h
init.o: ../../../../winix/winixd/core/system.h
init.o: ../../../../winix/winixd/core/job.h
init.o: ../../../../winix/winixd/core/basethread.h
init.o: ../../../../winix/winixd/core/winixmodel.h
init.o: ../../../../winix/winixd/core/dirs.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/dircontainer.h
init.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h
init.o: ../../../../winix/winixd/db/dbconn.h
@@ -140,13 +251,13 @@ init.o: ../../../../winix/winixd/db/dbtextstream.h
init.o: ../../../../winix/winixd/core/textstream.h
init.o: ../../../../winix/winixd/core/error.h
init.o: ../../../../winix/winixd/db/dbitemquery.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/db/dbitemcolumns.h
init.o: ../../../../winix/winixd/core/user.h
init.o: ../../../../winix/winixd/core/group.h
init.o: ../../../../winix/winixd/core/dircontainer.h
init.o: ../../../../winix/winixd/core/ugcontainer.h
init.o: ../../../../winix/winixd/core/request.h
init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../winix/winixd/core/error.h
init.o: ../../../../winix/winixd/core/config.h
init.o: ../../../../winix/winixd/templates/htmltextstream.h
@@ -184,28 +295,100 @@ init.o: ../../../../winix/winixd/notify/notifythread.h
init.o: ../../../../winix/winixd/core/basethread.h
init.o: ../../../../winix/winixd/notify/templatesnotify.h
init.o: ../../../../winix/winixd/core/users.h
init.o: ../../../../winix/winixd/core/winixmodel.h
init.o: ../../../../winix/winixd/core/timezones.h
init.o: ../../../../winix/winixd/core/timezone.h
init.o: ../../../../winix/winixd/core/cur.h
init.o: ../../../../winix/winixd/core/sessionmanager.h
init.o: ../../../../winix/winixd/core/sessioncontainer.h
init.o: ../../../../winix/winixd/core/ipbancontainer.h
init.o: ../../../../winix/winixd/core/system.h
init.o: ../../../../winix/winixd/core/sessionidmanager.h
init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
init.o: ../../../../winix/winixd/core/slog.h
init.o: ../../../../winix/winixd/functions/functions.h
init.o: ../../../../winix/winixd/functions/functionbase.h
init.o: ../../../../winix/winixd/core/request.h
init.o: ../../../../winix/winixd/functions/functionparser.h
init.o: ../../../../winix/winixd/functions/account.h
init.o: ../../../../winix/winixd/functions/adduser.h
init.o: ../../../../winix/winixd/functions/cat.h
init.o: ../../../../winix/winixd/functions/chmod.h
init.o: ../../../../winix/winixd/functions/privchanger.h
init.o: ../../../../winix/winixd/functions/chown.h
init.o: ../../../../winix/winixd/functions/ckeditor.h
init.o: ../../../../winix/winixd/functions/cp.h
init.o: ../../../../winix/winixd/functions/default.h
init.o: ../../../../winix/winixd/functions/download.h
init.o: ../../../../winix/winixd/functions/emacs.h
init.o: ../../../../winix/winixd/functions/env.h
init.o: ../../../../winix/winixd/functions/imgcrop.h
init.o: ../../../../winix/winixd/functions/last.h
init.o: ../../../../winix/winixd/functions/login.h
init.o: ../../../../winix/winixd/functions/logout.h
init.o: ../../../../winix/winixd/functions/ln.h
init.o: ../../../../winix/winixd/functions/ls.h
init.o: ../../../../winix/winixd/functions/man.h
init.o: ../../../../winix/winixd/functions/meta.h
init.o: ../../../../winix/winixd/functions/mkdir.h
init.o: ../../../../winix/winixd/functions/mv.h
init.o: ../../../../winix/winixd/functions/nicedit.h
init.o: ../../../../winix/winixd/functions/node.h
init.o: ../../../../winix/winixd/functions/passwd.h
init.o: ../../../../winix/winixd/functions/priv.h
init.o: ../../../../winix/winixd/functions/pw.h
init.o: ../../../../winix/winixd/functions/reload.h
init.o: ../../../../winix/winixd/functions/rm.h
init.o: ../../../../winix/winixd/functions/rmuser.h
init.o: ../../../../winix/winixd/functions/sort.h
init.o: ../../../../winix/winixd/functions/specialdefault.h
init.o: ../../../../winix/winixd/functions/stat.h
init.o: ../../../../winix/winixd/functions/subject.h
init.o: ../../../../winix/winixd/functions/template.h
init.o: ../../../../winix/winixd/functions/tinymce.h
init.o: ../../../../winix/winixd/functions/uname.h
init.o: ../../../../winix/winixd/functions/upload.h
init.o: ../../../../winix/winixd/functions/uptime.h
init.o: ../../../../winix/winixd/functions/who.h
init.o: ../../../../winix/winixd/functions/vim.h
init.o: ../../../../winix/winixd/core/htmlfilter.h
templates.o: ../../../../winix/winixd/templates/templates.h
templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
templates.o: ../../../../ezc/src/blocks.h
templates.o: ../../../../winix/winixd/core/item.h ../../../../ezc/src/cache.h
templates.o: ../../../../ezc/src/functions.h
templates.o: ../../../../pikotools/utf8/utf8.h ../../../../ezc/src/funinfo.h
templates.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
templates.o: ../../../../ezc/src/outstreams.h
templates.o: ../../../../ezc/src/expressionparser.h
templates.o: ../../../../ezc/src/patternparser.h
templates.o: ../../../../pikotools/convert/misc.h
templates.o: ../../../../pikotools/convert/text.h
templates.o: ../../../../winix/winixd/templates/patterncacher.h
templates.o: ../../../../winix/winixd/core/item.h
templates.o: ../../../../pikotools/space/space.h
templates.o: ../../../../pikotools/date/date.h
templates.o: ../../../../pikotools/convert/convert.h
templates.o: ../../../../pikotools/convert/inttostr.h
templates.o: ../../../../pikotools/convert/strtoint.h
templates.o: ../../../../pikotools/convert/text.h
templates.o: ../../../../winix/winixd/core/misc.h
templates.o: ../../../../winix/winixd/core/requesttypes.h
templates.o: ../../../../pikotools/textstream/textstream.h
templates.o: ../../../../pikotools/membuffer/membuffer.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../pikotools/utf8/utf8.h
templates.o: ../../../../winix/winixd/core/winix_const.h
templates.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
templates.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
templates.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h
templates.o: ../../../../ezc/src/expressionparser.h
templates.o: ../../../../ezc/src/patternparser.h
templates.o: ../../../../winix/winixd/templates/patterncacher.h
templates.o: ../../../../winix/winixd/core/item.h
templates.o: ../../../../winix/winixd/core/winixbase.h
templates.o: ../../../../winix/winixd/core/config.h
templates.o: ../../../../pikotools/space/spaceparser.h
templates.o: ../../../../pikotools/space/space.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../winix/winixd/core/log.h
templates.o: ../../../../winix/winixd/core/textstream.h
templates.o: ../../../../winix/winixd/core/logmanipulators.h
templates.o: ../../../../winix/winixd/core/filelog.h
templates.o: ../../../../winix/winixd/core/synchro.h
templates.o: ../../../../winix/winixd/core/log.h
templates.o: ../../../../winix/winixd/core/filelog.h
templates.o: ../../../../winix/winixd/core/lock.h
templates.o: ../../../../winix/winixd/core/synchro.h
templates.o: ../../../../winix/winixd/templates/indexpatterns.h
templates.o: ../../../../winix/winixd/templates/patterns.h
templates.o: ../../../../winix/winixd/templates/locale.h
@@ -213,46 +396,14 @@ templates.o: ../../../../winix/winixd/templates/localefilter.h
templates.o: ../../../../winix/winixd/templates/changepatterns.h
templates.o: ../../../../winix/winixd/templates/htmltextstream.h
templates.o: ../../../../winix/winixd/core/textstream.h
templates.o: ../../../../winix/winixd/core/config.h
templates.o: ../../../../pikotools/space/spaceparser.h
templates.o: ../../../../pikotools/space/space.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../winix/winixd/core/htmlfilter.h
templates.o: ../../../../winix/winixd/core/log.h
templates.o: ../../../../winix/winixd/core/textstream.h
templates.o: ../../../../pikotools/textstream/textstream.h
templates.o: ../../../../pikotools/membuffer/membuffer.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../winix/winixd/core/logmanipulators.h
templates.o: ../../../../winix/winixd/core/filelog.h
templates.o: ../../../../winix/winixd/core/synchro.h
templates.o: ../../../../winix/winixd/core/cur.h
templates.o: ../../../../winix/winixd/core/request.h
templates.o: ../../../../winix/winixd/core/requesttypes.h
templates.o: ../../../../winix/winixd/core/error.h
templates.o: ../../../../winix/winixd/core/config.h
templates.o: ../../../../winix/winixd/templates/htmltextstream.h
templates.o: ../../../../pikotools/space/spacetojson.h
templates.o: ../../../../winix/winixd/core/session.h
templates.o: ../../../../winix/winixd/core/user.h
templates.o: ../../../../winix/winixd/core/plugindata.h
templates.o: ../../../../winix/winixd/core/rebus.h
templates.o: ../../../../winix/winixd/core/winixbase.h
templates.o: ../../../../winix/winixd/core/ipban.h
templates.o: ../../../../winix/winixd/core/mount.h
templates.o: ../../../../winix/winixd/core/system.h
templates.o: ../../../../winix/winixd/core/job.h
templates.o: ../../../../winix/winixd/core/basethread.h
templates.o: ../../../../winix/winixd/core/synchro.h
templates.o: ../../../../winix/winixd/core/winixmodel.h
templates.o: ../../../../winix/winixd/core/winixbase.h
templates.o: ../../../../winix/winixd/core/log.h
templates.o: ../../../../winix/winixd/core/filelog.h
templates.o: ../../../../winix/winixd/core/lock.h
templates.o: ../../../../winix/winixd/core/plugin.h
templates.o: ../../../../winix/winixd/core/pluginmsg.h
templates.o: ../../../../winix/winixd/core/dirs.h
templates.o: ../../../../winix/winixd/core/dircontainer.h
templates.o: ../../../../winix/winixd/core/winixbase.h
templates.o: ../../../../winix/winixd/db/db.h
templates.o: ../../../../winix/winixd/db/dbbase.h
templates.o: ../../../../winix/winixd/db/dbconn.h
@@ -264,35 +415,50 @@ templates.o: ../../../../winix/winixd/core/user.h
templates.o: ../../../../winix/winixd/core/group.h
templates.o: ../../../../winix/winixd/core/dircontainer.h
templates.o: ../../../../winix/winixd/core/ugcontainer.h
templates.o: ../../../../winix/winixd/core/request.h
templates.o: ../../../../winix/winixd/core/error.h
templates.o: ../../../../winix/winixd/core/config.h
templates.o: ../../../../winix/winixd/templates/htmltextstream.h
templates.o: ../../../../pikotools/space/spacetojson.h
templates.o: ../../../../winix/winixd/core/mounts.h
templates.o: ../../../../winix/winixd/core/mount.h
templates.o: ../../../../winix/winixd/core/mountparser.h
templates.o: ../../../../winix/winixd/core/crypt.h
templates.o: ../../../../winix/winixd/core/run.h
templates.o: ../../../../winix/winixd/core/user.h
templates.o: ../../../../winix/winixd/core/users.h
templates.o: ../../../../winix/winixd/core/ugcontainer.h
templates.o: ../../../../winix/winixd/core/lastcontainer.h
templates.o: ../../../../winix/winixd/core/cur.h groups.h
templates.o: ../../../../winix/winixd/core/loadavg.h
templates.o: ../../../../winix/winixd/core/image.h
templates.o: ../../../../winix/winixd/core/threadmanager.h
templates.o: ../../../../winix/winixd/notify/notify.h
templates.o: ../../../../winix/winixd/notify/notifypool.h
templates.o: ../../../../winix/winixd/templates/locale.h
templates.o: ../../../../winix/winixd/templates/patterns.h
templates.o: ../../../../winix/winixd/notify/notifythread.h
templates.o: ../../../../winix/winixd/core/basethread.h
templates.o: ../../../../winix/winixd/notify/templatesnotify.h
templates.o: ../../../../winix/winixd/core/users.h
templates.o: ../../../../winix/winixd/core/cur.h
templates.o: ../../../../winix/winixd/core/session.h
templates.o: ../../../../winix/winixd/core/plugindata.h
templates.o: ../../../../winix/winixd/core/rebus.h
templates.o: ../../../../winix/winixd/core/ipban.h groups.h
templates.o: ../../../../winix/winixd/core/winixrequest.h
templates.o: ../../../../winix/winixd/core/winixsystem.h
templates.o: ../../../../winix/winixd/core/winixmodel.h
templates.o: ../../../../winix/winixd/core/timezones.h
templates.o: ../../../../winix/winixd/core/timezone.h
templates.o: ../../../../winix/winixd/core/plugin.h
templates.o: ../../../../winix/winixd/core/pluginmsg.h
templates.o: ../../../../winix/winixd/core/sessionmanager.h
templates.o: ../../../../winix/winixd/core/sessioncontainer.h
templates.o: ../../../../winix/winixd/core/ipbancontainer.h
templates.o: ../../../../winix/winixd/core/system.h
templates.o: ../../../../winix/winixd/core/sessionidmanager.h
templates.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
templates.o: ../../../../winix/winixd/core/slog.h
templates.o: ../../../../winix/winixd/templates/locale.h
templates.o: ../../../../winix/winixd/core/loadavg.h
templates.o: ../../../../winix/winixd/core/image.h
templates.o: ../../../../winix/winixd/core/threadmanager.h
templates.o: ../../../../winix/winixd/notify/notify.h
templates.o: ../../../../winix/winixd/notify/notifypool.h
templates.o: ../../../../winix/winixd/templates/patterns.h
templates.o: ../../../../winix/winixd/notify/notifythread.h
templates.o: ../../../../winix/winixd/core/basethread.h
templates.o: ../../../../winix/winixd/notify/templatesnotify.h
templates.o: ../../../../winix/winixd/core/users.h
templates.o: ../../../../winix/winixd/core/timezones.h
templates.o: ../../../../winix/winixd/core/timezone.h
templates.o: ../../../../winix/winixd/core/htmlfilter.h
templates.o: ../../../../winix/winixd/core/plugin.h groupinfo.h
templates.o: ../../../../winix/winixd/core/misc.h
templates.o: ../../../../winix/winixd/core/winix_const.h

1
winixd/plugins/group/groupinfo.cpp
View File

@@ -171,6 +171,7 @@ void GroupInfo::ReadGroupsConf(Mounts & mounts, bool skip_existing_configs)
{
log << log3 << "GroupItem: parsing conf file: " << config_file.url << logend;
groups_wrap[mount.dir_id].file_name = file_name;
groups_wrap[mount.dir_id].groups.set_dependency(this);
if( !ParseGroups(config_file.content, groups_wrap[mount.dir_id].groups) )
groups_wrap[mount.dir_id].to_delete = true;

4
winixd/plugins/group/groupinfo.h
View File

@@ -42,6 +42,8 @@
#include "core/item.h"
#include "core/system.h"
#include "core/config.h"
#include "core/winixrequest.h"
namespace Winix
{
@@ -66,7 +68,7 @@ struct GroupsWrapItem
class GroupInfo
class GroupInfo : public WinixRequest
{
public:

1
winixd/plugins/group/groups.cpp
View File

@@ -32,6 +32,7 @@
*
*/
#include <algorithm>
#include <limits>
#include "groups.h"
#include "core/log.h"

4
winixd/plugins/group/groups.h
View File

@@ -39,6 +39,8 @@
#include <vector>
#include <string>
#include "space/spaceparser.h"
#include "core/winixrequest.h"
namespace Winix
{
@@ -47,7 +49,7 @@ namespace GroupItem
{
class Groups
class Groups : public WinixRequest
{
public:

5
winixd/plugins/group/init.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -35,6 +35,8 @@
#include "core/log.h"
#include "core/plugin.h"
#include "groupinfo.h"
#include "functions/functions.h"
namespace Winix
{
@@ -95,6 +97,7 @@ using namespace GroupItem;
info.plugin->Assign(WINIX_FSTAB_CHANGED, FstabChanged);
info.plugin->Assign(WINIX_PROCESS_REQUEST, ProcessRequest);
info.set_dependency_for(group_info);
group_info.SetSystem(info.system);
group_info.SetConfig(info.config);

84
winixd/plugins/mailregister/Makefile.dep
View File

@@ -24,7 +24,6 @@ funregistermail_showusers.o: ../../../../winix/winixd/core/winixbase.h
funregistermail_showusers.o: ../../../../winix/winixd/core/config.h
funregistermail_showusers.o: ../../../../pikotools/space/spaceparser.h
funregistermail_showusers.o: ../../../../pikotools/space/space.h
funregistermail_showusers.o: ../../../../winix/winixd/core/htmlfilter.h
funregistermail_showusers.o: ../../../../winix/winixd/core/log.h
funregistermail_showusers.o: ../../../../winix/winixd/core/textstream.h
funregistermail_showusers.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -139,7 +138,6 @@ funregistermail.o: ../../../../winix/winixd/core/winixbase.h
funregistermail.o: ../../../../winix/winixd/core/config.h
funregistermail.o: ../../../../pikotools/space/spaceparser.h
funregistermail.o: ../../../../pikotools/space/space.h
funregistermail.o: ../../../../winix/winixd/core/htmlfilter.h
funregistermail.o: ../../../../winix/winixd/core/log.h
funregistermail.o: ../../../../winix/winixd/core/textstream.h
funregistermail.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -255,7 +253,6 @@ init.o: ../../../../winix/winixd/core/winixbase.h
init.o: ../../../../winix/winixd/core/config.h
init.o: ../../../../pikotools/space/spaceparser.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../winix/winixd/core/htmlfilter.h
init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/textstream.h
init.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -335,6 +332,51 @@ init.o: ../../../../winix/winixd/core/sessionidmanager.h
init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
init.o: ../../../../winix/winixd/core/slog.h registermail_info.h
init.o: funregistermail_showusers.h
init.o: ../../../../winix/winixd/functions/functions.h
init.o: ../../../../winix/winixd/functions/functionbase.h
init.o: ../../../../winix/winixd/functions/functionparser.h
init.o: ../../../../winix/winixd/functions/account.h
init.o: ../../../../winix/winixd/functions/adduser.h
init.o: ../../../../winix/winixd/functions/cat.h
init.o: ../../../../winix/winixd/functions/chmod.h
init.o: ../../../../winix/winixd/functions/privchanger.h
init.o: ../../../../winix/winixd/functions/chown.h
init.o: ../../../../winix/winixd/functions/ckeditor.h
init.o: ../../../../winix/winixd/functions/cp.h
init.o: ../../../../winix/winixd/functions/default.h
init.o: ../../../../winix/winixd/functions/download.h
init.o: ../../../../winix/winixd/functions/emacs.h
init.o: ../../../../winix/winixd/functions/env.h
init.o: ../../../../winix/winixd/functions/imgcrop.h
init.o: ../../../../winix/winixd/functions/last.h
init.o: ../../../../winix/winixd/functions/login.h
init.o: ../../../../winix/winixd/functions/logout.h
init.o: ../../../../winix/winixd/functions/ln.h
init.o: ../../../../winix/winixd/functions/ls.h
init.o: ../../../../winix/winixd/functions/man.h
init.o: ../../../../winix/winixd/functions/meta.h
init.o: ../../../../winix/winixd/functions/mkdir.h
init.o: ../../../../winix/winixd/functions/mv.h
init.o: ../../../../winix/winixd/functions/nicedit.h
init.o: ../../../../winix/winixd/functions/node.h
init.o: ../../../../winix/winixd/functions/passwd.h
init.o: ../../../../winix/winixd/functions/priv.h
init.o: ../../../../winix/winixd/functions/pw.h
init.o: ../../../../winix/winixd/functions/reload.h
init.o: ../../../../winix/winixd/functions/rm.h
init.o: ../../../../winix/winixd/functions/rmuser.h
init.o: ../../../../winix/winixd/functions/sort.h
init.o: ../../../../winix/winixd/functions/specialdefault.h
init.o: ../../../../winix/winixd/functions/stat.h
init.o: ../../../../winix/winixd/functions/subject.h
init.o: ../../../../winix/winixd/functions/template.h
init.o: ../../../../winix/winixd/functions/tinymce.h
init.o: ../../../../winix/winixd/functions/uname.h
init.o: ../../../../winix/winixd/functions/upload.h
init.o: ../../../../winix/winixd/functions/uptime.h
init.o: ../../../../winix/winixd/functions/who.h
init.o: ../../../../winix/winixd/functions/vim.h
init.o: ../../../../winix/winixd/core/htmlfilter.h
mdb.o: mdb.h ../../../../winix/winixd/db/dbbase.h
mdb.o: ../../../../winix/winixd/core/dirs.h
mdb.o: ../../../../winix/winixd/core/log.h
@@ -359,6 +401,22 @@ templates.o: ../../../../pikotools/date/date.h
templates.o: ../../../../pikotools/convert/convert.h
templates.o: ../../../../pikotools/convert/inttostr.h
templates.o: ../../../../pikotools/convert/strtoint.h
templates.o: ../../../../winix/winixd/core/winixbase.h
templates.o: ../../../../winix/winixd/core/config.h
templates.o: ../../../../pikotools/space/spaceparser.h
templates.o: ../../../../pikotools/space/space.h
templates.o: ../../../../winix/winixd/core/log.h
templates.o: ../../../../winix/winixd/core/textstream.h
templates.o: ../../../../winix/winixd/core/logmanipulators.h
templates.o: ../../../../pikotools/textstream/textstream.h
templates.o: ../../../../pikotools/membuffer/membuffer.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../winix/winixd/core/filelog.h
templates.o: ../../../../winix/winixd/core/synchro.h
templates.o: ../../../../winix/winixd/core/log.h
templates.o: ../../../../winix/winixd/core/filelog.h
templates.o: ../../../../winix/winixd/core/lock.h
templates.o: ../../../../winix/winixd/core/synchro.h
templates.o: ../../../../winix/winixd/templates/indexpatterns.h
templates.o: ../../../../winix/winixd/templates/patterns.h
templates.o: ../../../../winix/winixd/templates/locale.h
@@ -366,28 +424,11 @@ templates.o: ../../../../winix/winixd/templates/localefilter.h
templates.o: ../../../../winix/winixd/templates/changepatterns.h
templates.o: ../../../../winix/winixd/templates/htmltextstream.h
templates.o: ../../../../winix/winixd/core/textstream.h
templates.o: ../../../../pikotools/textstream/textstream.h
templates.o: ../../../../pikotools/membuffer/membuffer.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../winix/winixd/core/config.h
templates.o: ../../../../pikotools/space/spaceparser.h
templates.o: ../../../../pikotools/space/space.h
templates.o: ../../../../winix/winixd/core/htmlfilter.h
templates.o: ../../../../winix/winixd/core/log.h
templates.o: ../../../../winix/winixd/core/textstream.h
templates.o: ../../../../winix/winixd/core/logmanipulators.h
templates.o: ../../../../winix/winixd/core/filelog.h
templates.o: ../../../../winix/winixd/core/synchro.h
templates.o: ../../../../winix/winixd/core/cur.h
templates.o: ../../../../winix/winixd/core/system.h
templates.o: ../../../../winix/winixd/core/job.h
templates.o: ../../../../winix/winixd/core/basethread.h
templates.o: ../../../../winix/winixd/core/synchro.h
templates.o: ../../../../winix/winixd/core/winixmodel.h
templates.o: ../../../../winix/winixd/core/winixbase.h
templates.o: ../../../../winix/winixd/core/log.h
templates.o: ../../../../winix/winixd/core/filelog.h
templates.o: ../../../../winix/winixd/core/lock.h
templates.o: ../../../../winix/winixd/core/plugin.h
templates.o: ../../../../winix/winixd/core/pluginmsg.h
templates.o: ../../../../winix/winixd/core/plugindata.h
@@ -444,6 +485,9 @@ templates.o: ../../../../winix/winixd/core/system.h
templates.o: ../../../../winix/winixd/core/sessionidmanager.h
templates.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
templates.o: ../../../../winix/winixd/core/htmlfilter.h
templates.o: ../../../../winix/winixd/core/winixrequest.h
templates.o: ../../../../winix/winixd/core/winixsystem.h
templates.o: ../../../../winix/winixd/core/slog.h
templates.o: ../../../../winix/winixd/core/plugin.h
templates.o: ../../../../winix/winixd/core/misc.h
templates.o: ../../../../winix/winixd/core/requesttypes.h

1
winixd/plugins/mailregister/init.cpp
View File

@@ -39,6 +39,7 @@
#include "funregistermail.h"
#include "registermail_info.h"
#include "funregistermail_showusers.h"
#include "functions/functions.h"
namespace Winix

108
winixd/plugins/menu/Makefile.dep
View File

@@ -16,7 +16,6 @@ cache.o: ../../../../winix/winixd/core/winixbase.h
cache.o: ../../../../winix/winixd/core/config.h
cache.o: ../../../../pikotools/space/spaceparser.h
cache.o: ../../../../pikotools/space/space.h
cache.o: ../../../../winix/winixd/core/htmlfilter.h
cache.o: ../../../../winix/winixd/core/log.h
cache.o: ../../../../winix/winixd/core/textstream.h
cache.o: ../../../../pikotools/textstream/textstream.h
@@ -64,7 +63,6 @@ init.o: ../../../../winix/winixd/core/winixbase.h
init.o: ../../../../winix/winixd/core/config.h
init.o: ../../../../pikotools/space/spaceparser.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../winix/winixd/core/htmlfilter.h
init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/textstream.h
init.o: ../../../../pikotools/convert/misc.h
@@ -110,6 +108,108 @@ init.o: ../../../../pikotools/space/spacetojson.h
init.o: ../../../../ezc/src/outstreams.h
init.o: ../../../../winix/winixd/core/winixmodel.h
init.o: ../../../../winix/winixd/core/plugin.h
init.o: ../../../../winix/winixd/templates/templates.h
init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/pattern.h
init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/patternparser.h
init.o: ../../../../winix/winixd/templates/patterncacher.h
init.o: ../../../../winix/winixd/templates/indexpatterns.h
init.o: ../../../../winix/winixd/templates/patterns.h
init.o: ../../../../winix/winixd/templates/locale.h
init.o: ../../../../winix/winixd/templates/localefilter.h
init.o: ../../../../winix/winixd/templates/changepatterns.h
init.o: ../../../../winix/winixd/templates/htmltextstream.h
init.o: ../../../../winix/winixd/core/cur.h
init.o: ../../../../winix/winixd/core/session.h
init.o: ../../../../winix/winixd/core/user.h
init.o: ../../../../winix/winixd/core/rebus.h
init.o: ../../../../winix/winixd/core/ipban.h
init.o: ../../../../winix/winixd/core/mount.h
init.o: ../../../../winix/winixd/core/system.h
init.o: ../../../../winix/winixd/core/job.h
init.o: ../../../../winix/winixd/core/basethread.h
init.o: ../../../../winix/winixd/core/dirs.h
init.o: ../../../../winix/winixd/core/mounts.h
init.o: ../../../../winix/winixd/core/mountparser.h
init.o: ../../../../winix/winixd/core/crypt.h
init.o: ../../../../winix/winixd/core/run.h
init.o: ../../../../winix/winixd/core/users.h
init.o: ../../../../winix/winixd/core/ugcontainer.h
init.o: ../../../../winix/winixd/core/lastcontainer.h
init.o: ../../../../winix/winixd/core/cur.h
init.o: ../../../../winix/winixd/core/groups.h
init.o: ../../../../winix/winixd/core/group.h
init.o: ../../../../winix/winixd/core/loadavg.h
init.o: ../../../../winix/winixd/core/image.h
init.o: ../../../../winix/winixd/core/threadmanager.h
init.o: ../../../../winix/winixd/notify/notify.h
init.o: ../../../../winix/winixd/notify/notifypool.h
init.o: ../../../../winix/winixd/templates/locale.h
init.o: ../../../../winix/winixd/templates/patterns.h
init.o: ../../../../winix/winixd/notify/notifythread.h
init.o: ../../../../winix/winixd/core/basethread.h
init.o: ../../../../winix/winixd/notify/templatesnotify.h
init.o: ../../../../winix/winixd/core/users.h
init.o: ../../../../winix/winixd/core/winixmodel.h
init.o: ../../../../winix/winixd/core/timezones.h
init.o: ../../../../winix/winixd/core/timezone.h
init.o: ../../../../winix/winixd/core/sessionmanager.h
init.o: ../../../../winix/winixd/core/sessioncontainer.h
init.o: ../../../../winix/winixd/core/ipbancontainer.h
init.o: ../../../../winix/winixd/core/system.h
init.o: ../../../../winix/winixd/core/sessionidmanager.h
init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
init.o: ../../../../winix/winixd/core/htmlfilter.h
init.o: ../../../../winix/winixd/core/winixrequest.h
init.o: ../../../../winix/winixd/core/winixsystem.h
init.o: ../../../../winix/winixd/core/slog.h
init.o: ../../../../winix/winixd/functions/functions.h
init.o: ../../../../winix/winixd/functions/functionbase.h
init.o: ../../../../winix/winixd/core/request.h
init.o: ../../../../winix/winixd/functions/functionparser.h
init.o: ../../../../winix/winixd/functions/account.h
init.o: ../../../../winix/winixd/functions/adduser.h
init.o: ../../../../winix/winixd/functions/cat.h
init.o: ../../../../winix/winixd/functions/chmod.h
init.o: ../../../../winix/winixd/functions/privchanger.h
init.o: ../../../../winix/winixd/functions/chown.h
init.o: ../../../../winix/winixd/functions/ckeditor.h
init.o: ../../../../winix/winixd/functions/cp.h
init.o: ../../../../winix/winixd/functions/default.h
init.o: ../../../../winix/winixd/functions/download.h
init.o: ../../../../winix/winixd/functions/emacs.h
init.o: ../../../../winix/winixd/functions/env.h
init.o: ../../../../winix/winixd/functions/imgcrop.h
init.o: ../../../../winix/winixd/functions/last.h
init.o: ../../../../winix/winixd/functions/login.h
init.o: ../../../../winix/winixd/functions/logout.h
init.o: ../../../../winix/winixd/functions/ln.h
init.o: ../../../../winix/winixd/functions/ls.h
init.o: ../../../../winix/winixd/functions/man.h
init.o: ../../../../winix/winixd/functions/meta.h
init.o: ../../../../winix/winixd/functions/mkdir.h
init.o: ../../../../winix/winixd/functions/mv.h
init.o: ../../../../winix/winixd/functions/nicedit.h
init.o: ../../../../winix/winixd/functions/node.h
init.o: ../../../../winix/winixd/functions/passwd.h
init.o: ../../../../winix/winixd/functions/priv.h
init.o: ../../../../winix/winixd/functions/pw.h
init.o: ../../../../winix/winixd/functions/reload.h
init.o: ../../../../winix/winixd/functions/rm.h
init.o: ../../../../winix/winixd/functions/rmuser.h
init.o: ../../../../winix/winixd/functions/sort.h
init.o: ../../../../winix/winixd/functions/specialdefault.h
init.o: ../../../../winix/winixd/functions/stat.h
init.o: ../../../../winix/winixd/functions/subject.h
init.o: ../../../../winix/winixd/functions/template.h
init.o: ../../../../winix/winixd/functions/tinymce.h
init.o: ../../../../winix/winixd/functions/uname.h
init.o: ../../../../winix/winixd/functions/upload.h
init.o: ../../../../winix/winixd/functions/uptime.h
init.o: ../../../../winix/winixd/functions/who.h
init.o: ../../../../winix/winixd/functions/vim.h
templates.o: ../../../../winix/winixd/templates/templates.h
templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
templates.o: ../../../../ezc/src/blocks.h
@@ -129,7 +229,6 @@ templates.o: ../../../../winix/winixd/core/winixbase.h
templates.o: ../../../../winix/winixd/core/config.h
templates.o: ../../../../pikotools/space/spaceparser.h
templates.o: ../../../../pikotools/space/space.h
templates.o: ../../../../winix/winixd/core/htmlfilter.h
templates.o: ../../../../winix/winixd/core/log.h
templates.o: ../../../../winix/winixd/core/textstream.h
templates.o: ../../../../pikotools/textstream/textstream.h
@@ -219,6 +318,9 @@ templates.o: ../../../../winix/winixd/core/system.h
templates.o: ../../../../winix/winixd/core/sessionidmanager.h
templates.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
templates.o: ../../../../winix/winixd/core/htmlfilter.h
templates.o: ../../../../winix/winixd/core/winixrequest.h
templates.o: ../../../../winix/winixd/core/winixsystem.h
templates.o: ../../../../winix/winixd/core/slog.h
templates.o: ../../../../winix/winixd/core/plugin.h
templates.o: ../../../../winix/winixd/core/misc.h
templates.o: ../../../../winix/winixd/core/winix_const.h

5
winixd/plugins/menu/init.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -35,6 +35,9 @@
#include "core/log.h"
#include "core/plugin.h"
#include "cache.h"
#include "templates/templates.h"
#include "functions/functions.h"
namespace Winix
{

1
winixd/plugins/stats/Makefile.dep
View File

@@ -26,7 +26,6 @@ init.o: ../../../../winix/winixd/core/error.h
init.o: ../../../../winix/winixd/core/config.h
init.o: ../../../../pikotools/space/spaceparser.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../winix/winixd/core/htmlfilter.h
init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/templates/htmltextstream.h
init.o: ../../../../winix/winixd/core/textstream.h

2
winixd/plugins/stats/init.cpp
View File

@@ -234,7 +234,7 @@ using namespace Stats;
info.plugin->Assign(WINIX_FILE_REMOVED, RemoveFile);
info.plugin->Assign(WINIX_DIR_PREPARE_TO_REMOVE, RemoveDir);
stats.set_dependency(reinterpret_cast<WinixModel*>(info.winix_system));
info.set_dependency_for(stats);
stats.ReadConfig(info.config);
stats.ReadStats();

60
winixd/plugins/thread/Makefile.dep
View File

@@ -24,7 +24,6 @@ createthread.o: ../../../../winix/winixd/core/winixbase.h
createthread.o: ../../../../winix/winixd/core/config.h
createthread.o: ../../../../pikotools/space/spaceparser.h
createthread.o: ../../../../pikotools/space/space.h
createthread.o: ../../../../winix/winixd/core/htmlfilter.h
createthread.o: ../../../../winix/winixd/core/log.h
createthread.o: ../../../../winix/winixd/core/textstream.h
createthread.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -179,7 +178,6 @@ funthread.o: ../../../../winix/winixd/core/winixbase.h
funthread.o: ../../../../winix/winixd/core/config.h
funthread.o: ../../../../pikotools/space/spaceparser.h
funthread.o: ../../../../pikotools/space/space.h
funthread.o: ../../../../winix/winixd/core/htmlfilter.h
funthread.o: ../../../../winix/winixd/core/log.h
funthread.o: ../../../../winix/winixd/core/textstream.h
funthread.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -284,7 +282,6 @@ init.o: ../../../../winix/winixd/core/winixbase.h
init.o: ../../../../winix/winixd/core/config.h
init.o: ../../../../pikotools/space/spaceparser.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../winix/winixd/core/htmlfilter.h
init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/textstream.h
init.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -365,10 +362,54 @@ init.o: ../../../../winix/winixd/core/system.h
init.o: ../../../../winix/winixd/core/sessionidmanager.h
init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
init.o: ../../../../winix/winixd/core/slog.h threadinfo.h funthread.h
init.o: createthread.h showthreads.h ../../../../winix/winixd/core/plugin.h
init.o: templates.h
reply.o: ../../../../winix/winixd/core/plugin.h reply.h
reply.o: ../../../../winix/winixd/functions/functionbase.h
init.o: createthread.h showthreads.h templates.h
init.o: ../../../../winix/winixd/core/plugin.h
init.o: ../../../../winix/winixd/functions/functions.h
init.o: ../../../../winix/winixd/functions/functionbase.h
init.o: ../../../../winix/winixd/functions/functionparser.h
init.o: ../../../../winix/winixd/functions/account.h
init.o: ../../../../winix/winixd/functions/adduser.h
init.o: ../../../../winix/winixd/functions/cat.h
init.o: ../../../../winix/winixd/functions/chmod.h
init.o: ../../../../winix/winixd/functions/privchanger.h
init.o: ../../../../winix/winixd/functions/chown.h
init.o: ../../../../winix/winixd/functions/ckeditor.h
init.o: ../../../../winix/winixd/functions/cp.h
init.o: ../../../../winix/winixd/functions/default.h
init.o: ../../../../winix/winixd/functions/download.h
init.o: ../../../../winix/winixd/functions/emacs.h
init.o: ../../../../winix/winixd/functions/env.h
init.o: ../../../../winix/winixd/functions/imgcrop.h
init.o: ../../../../winix/winixd/functions/last.h
init.o: ../../../../winix/winixd/functions/login.h
init.o: ../../../../winix/winixd/functions/logout.h
init.o: ../../../../winix/winixd/functions/ln.h
init.o: ../../../../winix/winixd/functions/ls.h
init.o: ../../../../winix/winixd/functions/man.h
init.o: ../../../../winix/winixd/functions/meta.h
init.o: ../../../../winix/winixd/functions/mkdir.h
init.o: ../../../../winix/winixd/functions/mv.h
init.o: ../../../../winix/winixd/functions/nicedit.h
init.o: ../../../../winix/winixd/functions/node.h
init.o: ../../../../winix/winixd/functions/passwd.h
init.o: ../../../../winix/winixd/functions/priv.h
init.o: ../../../../winix/winixd/functions/pw.h
init.o: ../../../../winix/winixd/functions/reload.h
init.o: ../../../../winix/winixd/functions/rm.h
init.o: ../../../../winix/winixd/functions/rmuser.h
init.o: ../../../../winix/winixd/functions/sort.h
init.o: ../../../../winix/winixd/functions/specialdefault.h
init.o: ../../../../winix/winixd/functions/stat.h
init.o: ../../../../winix/winixd/functions/subject.h
init.o: ../../../../winix/winixd/functions/template.h
init.o: ../../../../winix/winixd/functions/tinymce.h
init.o: ../../../../winix/winixd/functions/uname.h
init.o: ../../../../winix/winixd/functions/upload.h
init.o: ../../../../winix/winixd/functions/uptime.h
init.o: ../../../../winix/winixd/functions/who.h
init.o: ../../../../winix/winixd/functions/vim.h
init.o: ../../../../winix/winixd/core/htmlfilter.h
reply.o: reply.h ../../../../winix/winixd/functions/functionbase.h
reply.o: ../../../../winix/winixd/core/item.h
reply.o: ../../../../pikotools/space/space.h
reply.o: ../../../../pikotools/textstream/types.h
@@ -391,7 +432,6 @@ reply.o: ../../../../winix/winixd/core/winixbase.h
reply.o: ../../../../winix/winixd/core/config.h
reply.o: ../../../../pikotools/space/spaceparser.h
reply.o: ../../../../pikotools/space/space.h
reply.o: ../../../../winix/winixd/core/htmlfilter.h
reply.o: ../../../../winix/winixd/core/log.h
reply.o: ../../../../winix/winixd/core/textstream.h
reply.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -545,7 +585,6 @@ showthreads.o: ../../../../winix/winixd/core/winixbase.h
showthreads.o: ../../../../winix/winixd/core/config.h
showthreads.o: ../../../../pikotools/space/spaceparser.h
showthreads.o: ../../../../pikotools/space/space.h
showthreads.o: ../../../../winix/winixd/core/htmlfilter.h
showthreads.o: ../../../../winix/winixd/core/log.h
showthreads.o: ../../../../winix/winixd/core/textstream.h
showthreads.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -655,7 +694,6 @@ templates.o: ../../../../winix/winixd/core/winixbase.h
templates.o: ../../../../winix/winixd/core/config.h
templates.o: ../../../../pikotools/space/spaceparser.h
templates.o: ../../../../pikotools/space/space.h
templates.o: ../../../../winix/winixd/core/htmlfilter.h
templates.o: ../../../../winix/winixd/core/log.h
templates.o: ../../../../winix/winixd/core/textstream.h
templates.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -815,7 +853,6 @@ threadinfo.o: ../../../../winix/winixd/core/winixbase.h
threadinfo.o: ../../../../winix/winixd/core/config.h
threadinfo.o: ../../../../pikotools/space/spaceparser.h
threadinfo.o: ../../../../pikotools/space/space.h
threadinfo.o: ../../../../winix/winixd/core/htmlfilter.h
threadinfo.o: ../../../../winix/winixd/core/log.h
threadinfo.o: ../../../../winix/winixd/core/textstream.h
threadinfo.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -888,4 +925,3 @@ threadinfo.o: ../../../../winix/winixd/core/winixmodel.h
threadinfo.o: ../../../../winix/winixd/core/timezones.h
threadinfo.o: ../../../../winix/winixd/core/timezone.h thread.h tdb.h
threadinfo.o: ../../../../winix/winixd/db/dbbase.h
threadinfo.o: ../../../../winix/winixd/core/plugin.h

38
winixd/plugins/thread/init.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2014, Tomasz Sowa
* Copyright (c) 2010-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -38,9 +38,11 @@
#include "createthread.h"
#include "showthreads.h"
#include "core/log.h"
#include "core/plugin.h"
#include "pluginmsg.h"
#include "templates.h"
#include "functions/functions.h"
namespace Winix
{
@@ -124,7 +126,7 @@ void SetSortTab(PluginInfo & info)
{
if( !info.p1 )
{
log << log1 << "Thread: sort_tab pointer is not set" << logend;
info.log << log1 << "Thread: sort_tab pointer is not set" << logend;
return;
}
@@ -168,9 +170,9 @@ void Rescan(PluginInfo & info)
{
if( info.config->Bool(L"thread_rescan", false) == true )
{
log << log1 << "---------- rescanning thread db ------------- " << logend;
info.log << log1 << "---------- rescanning thread db ------------- " << logend;
thread_info.Repair();
log << log1 << "---------- thread db rescanning is finished ------------- " << logend;
info.log << log1 << "---------- thread db rescanning is finished ------------- " << logend;
}
}
@@ -185,27 +187,29 @@ void Init(PluginInfo & info)
{
using namespace Thread;
plugin.Assign(WINIX_CREATE_FUNCTIONS, AddFunctions);
plugin.Assign(WINIX_SELECT_DEFAULT_FUNCTION, SelectDefaultFunction);
plugin.Assign(WINIX_ADD_MOUNTS, AddMounts);
plugin.Assign(WINIX_FILE_REMOVED, RemoveThread);
plugin.Assign(WINIX_NOTIFY_ADD_TEMPLATE, AddNotifyTemplate);
plugin.Assign(WINIX_TEMPLATES_CREATEFUNCTIONS, AddEzcFunctions);
plugin.Assign(WINIX_END_REQUEST, EndRequest);
info.plugin->Assign(WINIX_CREATE_FUNCTIONS, AddFunctions);
info.plugin->Assign(WINIX_SELECT_DEFAULT_FUNCTION, SelectDefaultFunction);
info.plugin->Assign(WINIX_ADD_MOUNTS, AddMounts);
info.plugin->Assign(WINIX_FILE_REMOVED, RemoveThread);
info.plugin->Assign(WINIX_NOTIFY_ADD_TEMPLATE, AddNotifyTemplate);
info.plugin->Assign(WINIX_TEMPLATES_CREATEFUNCTIONS, AddEzcFunctions);
info.plugin->Assign(WINIX_END_REQUEST, EndRequest);
// for other plugins
plugin.Assign(WINIX_PL_THREAD_SET_SORTTAB, SetSortTab);
plugin.Assign(WINIX_PL_THREAD_READ_THREADS, ReadThreads);
plugin.Assign(WINIX_PL_THREAD_SET_SORTTAB_INDEX, SetSortTabIndex);
plugin.Assign(WINIX_PL_THREAD_PREPARE_THREAD, PrepareThread);
info.plugin->Assign(WINIX_PL_THREAD_SET_SORTTAB, SetSortTab);
info.plugin->Assign(WINIX_PL_THREAD_READ_THREADS, ReadThreads);
info.plugin->Assign(WINIX_PL_THREAD_SET_SORTTAB_INDEX, SetSortTabIndex);
info.plugin->Assign(WINIX_PL_THREAD_PREPARE_THREAD, PrepareThread);
// temporarily
plugin.Assign(WINIX_PLUGIN_INIT, Rescan);
info.plugin->Assign(WINIX_PLUGIN_INIT, Rescan);
tdb.SetConn(info.db->GetConn());
tdb.LogQueries(info.config->log_db_query);
// thread_info and fun_show_threads are used in 'ticket' plugins too
info.set_dependency_for(thread_info);
thread_info.SetDb(info.db);
thread_info.SetTDb(&tdb);
thread_info.SetSystem(info.system);

6
winixd/plugins/thread/reply.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2014, Tomasz Sowa
* Copyright (c) 2010-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -32,11 +32,9 @@
*
*/
#include "core/plugin.h"
#include "reply.h"
#include "functions/functions.h"
#include "core/misc.h"
#include "core/plugin.h"
#include "pluginmsg.h"
namespace Winix
@@ -135,7 +133,7 @@ void Reply::MakePost()
if( functions->CheckAbuse() )
return;
plugin.Call(WINIX_PL_THREAD_PREPARE_TO_REPLY_IN_THREAD, &answer);
plugin->Call(WINIX_PL_THREAD_PREPARE_TO_REPLY_IN_THREAD, &answer);
cur->request->status = system->AddFile(answer);

8
winixd/plugins/thread/threadinfo.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2014, Tomasz Sowa
* Copyright (c) 2010-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -33,9 +33,9 @@
*/
#include "threadinfo.h"
#include "core/plugin.h"
#include "pluginmsg.h"
namespace Winix
{
@@ -74,7 +74,7 @@ void ThreadInfo::Clear()
Item * ThreadInfo::FindThreadDir()
{
Item * plugin_dir = 0;
plugin.Call(WINIX_PL_THREAD_SEARCH_THREAD_DIR, &plugin_dir);
plugin->Call(WINIX_PL_THREAD_SEARCH_THREAD_DIR, &plugin_dir);
if( plugin_dir )
return plugin_dir;
@@ -171,7 +171,7 @@ void ThreadInfo::Repair()
void ThreadInfo::MakeRedirectIfPossible(const Item & item)
{
PluginRes res = plugin.Call(WINIX_PL_THREAD_CAN_MAKE_REDIRECT);
PluginRes res = plugin->Call(WINIX_PL_THREAD_CAN_MAKE_REDIRECT);
if( res.res_false > 0 )
{

5
winixd/plugins/thread/threadinfo.h
View File

@@ -41,6 +41,9 @@
#include "db/db.h"
#include "thread.h"
#include "tdb.h"
#include "core/winixmodel.h"
namespace Winix
{
@@ -49,7 +52,7 @@ namespace Winix
namespace Thread
{
class ThreadInfo
class ThreadInfo : public WinixModel
{
public:

325
winixd/plugins/ticket/Makefile.dep
View File

@@ -1,18 +1,14 @@
# DO NOT DELETE
createticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
createticket.o: ../../../../winix/winixd/core/plugindata.h
createticket.o: ../../../../winix/winixd/core/winixbase.h
createticket.o: ../../../../winix/winixd/core/config.h
createticket.o: ../../../../pikotools/space/spaceparser.h
createticket.o: ../../../../pikotools/space/space.h
createticket.o: ../../../../pikotools/textstream/types.h
createticket.o: ../../../../winix/winixd/core/htmlfilter.h
createticket.o: ../../../../winix/winixd/core/log.h
createticket.o: createticket.h tdb.h ticket.h
createticket.o: ../../../../winix/winixd/db/dbbase.h
createticket.o: ../../../../winix/winixd/db/dbconn.h
createticket.o: ../../../../winix/winixd/db/dbtextstream.h
createticket.o: ../../../../winix/winixd/core/textstream.h
createticket.o: ../../../../winix/winixd/core/misc.h
createticket.o: ../../../../winix/winixd/core/item.h
createticket.o: ../../../../pikotools/space/space.h
createticket.o: ../../../../pikotools/textstream/types.h
createticket.o: ../../../../pikotools/date/date.h
createticket.o: ../../../../pikotools/convert/convert.h
createticket.o: ../../../../pikotools/convert/inttostr.h
@@ -24,18 +20,19 @@ createticket.o: ../../../../pikotools/membuffer/membuffer.h
createticket.o: ../../../../pikotools/textstream/types.h
createticket.o: ../../../../pikotools/utf8/utf8.h
createticket.o: ../../../../winix/winixd/core/winix_const.h
createticket.o: ../../../../winix/winixd/core/winixbase.h
createticket.o: ../../../../winix/winixd/core/config.h
createticket.o: ../../../../pikotools/space/spaceparser.h
createticket.o: ../../../../pikotools/space/space.h
createticket.o: ../../../../winix/winixd/core/log.h
createticket.o: ../../../../winix/winixd/core/textstream.h
createticket.o: ../../../../winix/winixd/core/logmanipulators.h
createticket.o: ../../../../winix/winixd/core/filelog.h
createticket.o: ../../../../winix/winixd/core/synchro.h
createticket.o: ../../../../winix/winixd/core/log.h
createticket.o: ../../../../winix/winixd/core/filelog.h
createticket.o: ../../../../winix/winixd/core/lock.h
createticket.o: ../../../../winix/winixd/core/synchro.h createticket.h tdb.h
createticket.o: ticket.h ../../../../winix/winixd/db/dbbase.h
createticket.o: ../../../../winix/winixd/db/dbconn.h
createticket.o: ../../../../winix/winixd/db/dbtextstream.h
createticket.o: ../../../../winix/winixd/core/textstream.h
createticket.o: ../../../../winix/winixd/core/winixbase.h
createticket.o: ../../../../winix/winixd/core/synchro.h
createticket.o: ../../../../winix/winixd/core/error.h
createticket.o: ../../../../winix/winixd/functions/functionbase.h
createticket.o: ../../../../winix/winixd/core/item.h
@@ -46,6 +43,7 @@ createticket.o: ../../../../winix/winixd/db/dbitemcolumns.h
createticket.o: ../../../../winix/winixd/core/user.h
createticket.o: ../../../../winix/winixd/core/group.h
createticket.o: ../../../../winix/winixd/core/dircontainer.h
createticket.o: ../../../../winix/winixd/core/winixbase.h
createticket.o: ../../../../winix/winixd/core/ugcontainer.h
createticket.o: ../../../../winix/winixd/core/request.h
createticket.o: ../../../../winix/winixd/core/error.h
@@ -57,7 +55,8 @@ createticket.o: ../../../../winix/winixd/core/system.h
createticket.o: ../../../../winix/winixd/core/job.h
createticket.o: ../../../../winix/winixd/core/basethread.h
createticket.o: ../../../../winix/winixd/core/winixmodel.h
createticket.o: ../../../../winix/winixd/core/plugin.h
createticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
createticket.o: ../../../../winix/winixd/core/plugindata.h
createticket.o: ../../../../winix/winixd/core/dirs.h
createticket.o: ../../../../winix/winixd/core/dircontainer.h
createticket.o: ../../../../winix/winixd/core/request.h
@@ -160,32 +159,43 @@ editticket.o: ../../../../winix/winixd/db/dbbase.h
editticket.o: ../../../../winix/winixd/db/dbconn.h
editticket.o: ../../../../winix/winixd/db/dbtextstream.h
editticket.o: ../../../../winix/winixd/core/textstream.h
editticket.o: ../../../../pikotools/textstream/textstream.h
editticket.o: ../../../../winix/winixd/core/misc.h
editticket.o: ../../../../winix/winixd/core/item.h
editticket.o: ../../../../pikotools/space/space.h
editticket.o: ../../../../pikotools/textstream/types.h
editticket.o: ../../../../pikotools/date/date.h
editticket.o: ../../../../pikotools/convert/convert.h
editticket.o: ../../../../pikotools/convert/inttostr.h
editticket.o: ../../../../pikotools/convert/strtoint.h
editticket.o: ../../../../pikotools/convert/text.h
editticket.o: ../../../../winix/winixd/core/misc.h
editticket.o: ../../../../winix/winixd/core/item.h
editticket.o: ../../../../winix/winixd/core/requesttypes.h
editticket.o: ../../../../pikotools/utf8/utf8.h
editticket.o: ../../../../winix/winixd/core/winix_const.h
editticket.o: ../../../../pikotools/textstream/textstream.h
editticket.o: ../../../../pikotools/membuffer/membuffer.h
editticket.o: ../../../../pikotools/textstream/types.h
editticket.o: ../../../../pikotools/utf8/utf8.h
editticket.o: ../../../../winix/winixd/core/winix_const.h
editticket.o: ../../../../winix/winixd/core/winixbase.h
editticket.o: ../../../../winix/winixd/core/error.h
editticket.o: ../../../../winix/winixd/core/config.h
editticket.o: ../../../../pikotools/space/spaceparser.h
editticket.o: ../../../../pikotools/space/space.h
editticket.o: ../../../../pikotools/textstream/types.h ticketinfo.h
editticket.o: ../../../../winix/winixd/core/log.h
editticket.o: ../../../../winix/winixd/core/textstream.h
editticket.o: ../../../../winix/winixd/core/logmanipulators.h
editticket.o: ../../../../winix/winixd/core/filelog.h
editticket.o: ../../../../winix/winixd/core/synchro.h
editticket.o: ../../../../winix/winixd/core/log.h
editticket.o: ../../../../winix/winixd/core/filelog.h
editticket.o: ../../../../winix/winixd/core/lock.h
editticket.o: ../../../../winix/winixd/core/synchro.h
editticket.o: ../../../../winix/winixd/core/error.h ticketinfo.h
editticket.o: ../../../../winix/winixd/core/item.h
editticket.o: ../../../../winix/winixd/core/system.h
editticket.o: ../../../../winix/winixd/core/job.h
editticket.o: ../../../../winix/winixd/core/basethread.h
editticket.o: ../../../../winix/winixd/core/synchro.h
editticket.o: ../../../../winix/winixd/core/winixmodel.h
editticket.o: ../../../../winix/winixd/core/plugin.h
editticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
editticket.o: ../../../../winix/winixd/core/plugindata.h
editticket.o: ../../../../winix/winixd/core/winixbase.h
editticket.o: ../../../../winix/winixd/core/dirs.h
editticket.o: ../../../../winix/winixd/core/dircontainer.h
editticket.o: ../../../../winix/winixd/db/db.h
@@ -195,17 +205,6 @@ editticket.o: ../../../../winix/winixd/db/dbitemcolumns.h
editticket.o: ../../../../winix/winixd/core/user.h
editticket.o: ../../../../winix/winixd/core/group.h
editticket.o: ../../../../winix/winixd/core/dircontainer.h
editticket.o: ../../../../winix/winixd/core/winixbase.h
editticket.o: ../../../../winix/winixd/core/config.h
editticket.o: ../../../../winix/winixd/core/htmlfilter.h
editticket.o: ../../../../winix/winixd/core/log.h
editticket.o: ../../../../winix/winixd/core/textstream.h
editticket.o: ../../../../winix/winixd/core/logmanipulators.h
editticket.o: ../../../../winix/winixd/core/filelog.h
editticket.o: ../../../../winix/winixd/core/synchro.h
editticket.o: ../../../../winix/winixd/core/log.h
editticket.o: ../../../../winix/winixd/core/filelog.h
editticket.o: ../../../../winix/winixd/core/lock.h
editticket.o: ../../../../winix/winixd/core/ugcontainer.h
editticket.o: ../../../../winix/winixd/core/request.h
editticket.o: ../../../../winix/winixd/core/mounts.h
@@ -221,7 +220,6 @@ editticket.o: ../../../../winix/winixd/core/ugcontainer.h
editticket.o: ../../../../winix/winixd/core/lastcontainer.h
editticket.o: ../../../../winix/winixd/core/cur.h
editticket.o: ../../../../winix/winixd/core/session.h
editticket.o: ../../../../winix/winixd/core/plugindata.h
editticket.o: ../../../../winix/winixd/core/rebus.h
editticket.o: ../../../../winix/winixd/core/ipban.h
editticket.o: ../../../../winix/winixd/core/groups.h
@@ -310,37 +308,47 @@ editticket.o: ../../../../winix/winixd/core/slog.h
editticket.o: ../../../../winix/winixd/functions/functionbase.h sessiondata.h
editticket.o: ../../../../winix/winixd/core/plugindata.h
editticket.o: ../../../../winix/winixd/functions/rm.h
editticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
funticket.o: funticket.h tdb.h ticket.h ../../../../winix/winixd/db/dbbase.h
funticket.o: ../../../../winix/winixd/db/dbconn.h
funticket.o: ../../../../winix/winixd/db/dbtextstream.h
funticket.o: ../../../../winix/winixd/core/textstream.h
funticket.o: ../../../../pikotools/textstream/textstream.h
funticket.o: ../../../../winix/winixd/core/misc.h
funticket.o: ../../../../winix/winixd/core/item.h
funticket.o: ../../../../pikotools/space/space.h
funticket.o: ../../../../pikotools/textstream/types.h
funticket.o: ../../../../pikotools/date/date.h
funticket.o: ../../../../pikotools/convert/convert.h
funticket.o: ../../../../pikotools/convert/inttostr.h
funticket.o: ../../../../pikotools/convert/strtoint.h
funticket.o: ../../../../pikotools/convert/text.h
funticket.o: ../../../../winix/winixd/core/misc.h
funticket.o: ../../../../winix/winixd/core/item.h
funticket.o: ../../../../winix/winixd/core/requesttypes.h
funticket.o: ../../../../pikotools/utf8/utf8.h
funticket.o: ../../../../winix/winixd/core/winix_const.h
funticket.o: ../../../../pikotools/textstream/textstream.h
funticket.o: ../../../../pikotools/membuffer/membuffer.h
funticket.o: ../../../../pikotools/textstream/types.h
funticket.o: ../../../../pikotools/utf8/utf8.h
funticket.o: ../../../../winix/winixd/core/winix_const.h
funticket.o: ../../../../winix/winixd/core/winixbase.h
funticket.o: ../../../../winix/winixd/core/error.h
funticket.o: ../../../../winix/winixd/core/config.h
funticket.o: ../../../../pikotools/space/spaceparser.h
funticket.o: ../../../../pikotools/space/space.h
funticket.o: ../../../../pikotools/textstream/types.h ticketinfo.h
funticket.o: ../../../../winix/winixd/core/log.h
funticket.o: ../../../../winix/winixd/core/textstream.h
funticket.o: ../../../../winix/winixd/core/logmanipulators.h
funticket.o: ../../../../winix/winixd/core/filelog.h
funticket.o: ../../../../winix/winixd/core/synchro.h
funticket.o: ../../../../winix/winixd/core/log.h
funticket.o: ../../../../winix/winixd/core/filelog.h
funticket.o: ../../../../winix/winixd/core/lock.h
funticket.o: ../../../../winix/winixd/core/synchro.h
funticket.o: ../../../../winix/winixd/core/error.h ticketinfo.h
funticket.o: ../../../../winix/winixd/core/item.h
funticket.o: ../../../../winix/winixd/core/system.h
funticket.o: ../../../../winix/winixd/core/job.h
funticket.o: ../../../../winix/winixd/core/basethread.h
funticket.o: ../../../../winix/winixd/core/synchro.h
funticket.o: ../../../../winix/winixd/core/winixmodel.h
funticket.o: ../../../../winix/winixd/core/plugin.h
funticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
funticket.o: ../../../../winix/winixd/core/plugindata.h
funticket.o: ../../../../winix/winixd/core/winixbase.h
funticket.o: ../../../../winix/winixd/core/dirs.h
funticket.o: ../../../../winix/winixd/core/dircontainer.h
funticket.o: ../../../../winix/winixd/db/db.h
@@ -350,17 +358,6 @@ funticket.o: ../../../../winix/winixd/db/dbitemcolumns.h
funticket.o: ../../../../winix/winixd/core/user.h
funticket.o: ../../../../winix/winixd/core/group.h
funticket.o: ../../../../winix/winixd/core/dircontainer.h
funticket.o: ../../../../winix/winixd/core/winixbase.h
funticket.o: ../../../../winix/winixd/core/config.h
funticket.o: ../../../../winix/winixd/core/htmlfilter.h
funticket.o: ../../../../winix/winixd/core/log.h
funticket.o: ../../../../winix/winixd/core/textstream.h
funticket.o: ../../../../winix/winixd/core/logmanipulators.h
funticket.o: ../../../../winix/winixd/core/filelog.h
funticket.o: ../../../../winix/winixd/core/synchro.h
funticket.o: ../../../../winix/winixd/core/log.h
funticket.o: ../../../../winix/winixd/core/filelog.h
funticket.o: ../../../../winix/winixd/core/lock.h
funticket.o: ../../../../winix/winixd/core/ugcontainer.h
funticket.o: ../../../../winix/winixd/core/request.h
funticket.o: ../../../../winix/winixd/core/mounts.h
@@ -376,7 +373,6 @@ funticket.o: ../../../../winix/winixd/core/ugcontainer.h
funticket.o: ../../../../winix/winixd/core/lastcontainer.h
funticket.o: ../../../../winix/winixd/core/cur.h
funticket.o: ../../../../winix/winixd/core/session.h
funticket.o: ../../../../winix/winixd/core/plugindata.h
funticket.o: ../../../../winix/winixd/core/rebus.h
funticket.o: ../../../../winix/winixd/core/ipban.h
funticket.o: ../../../../winix/winixd/core/groups.h
@@ -463,48 +459,30 @@ funticket.o: ../../../../winix/winixd/core/sessionidmanager.h
funticket.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
funticket.o: ../../../../winix/winixd/core/slog.h
funticket.o: ../../../../winix/winixd/functions/functionbase.h
funticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
funticket.o: ../../../../winix/winixd/plugins/thread/pluginmsg.h
init.o: tdb.h ticket.h ../../../../winix/winixd/db/dbbase.h
init.o: ../../../../winix/winixd/db/dbconn.h
init.o: ../../../../winix/winixd/db/dbtextstream.h
init.o: ../../../../winix/winixd/core/textstream.h
init.o: ../../../../pikotools/textstream/textstream.h
init.o: ../../../../pikotools/space/space.h ../../../../pikotools/date/date.h
init.o: ../../../../winix/winixd/core/misc.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/date/date.h
init.o: ../../../../pikotools/convert/convert.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../pikotools/convert/strtoint.h
init.o: ../../../../pikotools/convert/text.h
init.o: ../../../../winix/winixd/core/misc.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../pikotools/utf8/utf8.h
init.o: ../../../../winix/winixd/core/winix_const.h
init.o: ../../../../pikotools/textstream/textstream.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../winix/winixd/core/winixbase.h
init.o: ../../../../winix/winixd/core/error.h
init.o: ../../../../pikotools/space/spaceparser.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../pikotools/textstream/types.h funticket.h ticketinfo.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/system.h
init.o: ../../../../winix/winixd/core/job.h
init.o: ../../../../winix/winixd/core/basethread.h
init.o: ../../../../winix/winixd/core/synchro.h
init.o: ../../../../winix/winixd/core/winixmodel.h
init.o: ../../../../winix/winixd/core/plugin.h
init.o: ../../../../winix/winixd/core/dirs.h
init.o: ../../../../winix/winixd/core/dircontainer.h
init.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h
init.o: ../../../../winix/winixd/db/dbitemquery.h
init.o: ../../../../winix/winixd/db/dbitemcolumns.h
init.o: ../../../../winix/winixd/core/user.h
init.o: ../../../../winix/winixd/core/group.h
init.o: ../../../../winix/winixd/core/dircontainer.h
init.o: ../../../../pikotools/utf8/utf8.h
init.o: ../../../../winix/winixd/core/winix_const.h
init.o: ../../../../winix/winixd/core/winixbase.h
init.o: ../../../../winix/winixd/core/config.h
init.o: ../../../../winix/winixd/core/htmlfilter.h
init.o: ../../../../pikotools/space/spaceparser.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/textstream.h
init.o: ../../../../winix/winixd/core/logmanipulators.h
@@ -513,6 +491,24 @@ init.o: ../../../../winix/winixd/core/synchro.h
init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/filelog.h
init.o: ../../../../winix/winixd/core/lock.h
init.o: ../../../../winix/winixd/core/synchro.h
init.o: ../../../../winix/winixd/core/error.h funticket.h ticketinfo.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/system.h
init.o: ../../../../winix/winixd/core/job.h
init.o: ../../../../winix/winixd/core/basethread.h
init.o: ../../../../winix/winixd/core/winixmodel.h
init.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
init.o: ../../../../winix/winixd/core/plugindata.h
init.o: ../../../../winix/winixd/core/winixbase.h
init.o: ../../../../winix/winixd/core/dirs.h
init.o: ../../../../winix/winixd/core/dircontainer.h
init.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h
init.o: ../../../../winix/winixd/db/dbitemquery.h
init.o: ../../../../winix/winixd/db/dbitemcolumns.h
init.o: ../../../../winix/winixd/core/user.h
init.o: ../../../../winix/winixd/core/group.h
init.o: ../../../../winix/winixd/core/dircontainer.h
init.o: ../../../../winix/winixd/core/ugcontainer.h
init.o: ../../../../winix/winixd/core/request.h
init.o: ../../../../winix/winixd/core/mounts.h
@@ -528,7 +524,6 @@ init.o: ../../../../winix/winixd/core/ugcontainer.h
init.o: ../../../../winix/winixd/core/lastcontainer.h
init.o: ../../../../winix/winixd/core/cur.h
init.o: ../../../../winix/winixd/core/session.h
init.o: ../../../../winix/winixd/core/plugindata.h
init.o: ../../../../winix/winixd/core/rebus.h
init.o: ../../../../winix/winixd/core/ipban.h
init.o: ../../../../winix/winixd/core/groups.h
@@ -615,8 +610,8 @@ init.o: ../../../../winix/winixd/core/sessionidmanager.h
init.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
init.o: ../../../../winix/winixd/core/slog.h
init.o: ../../../../winix/winixd/functions/functionbase.h editticket.h
init.o: createticket.h showtickets.h ../../../../winix/winixd/core/plugin.h
init.o: pluginmsg.h sessiondata.h ../../../../winix/winixd/core/plugindata.h
init.o: createticket.h showtickets.h sessiondata.h
init.o: ../../../../winix/winixd/core/plugindata.h
init.o: ../../../../winix/winixd/functions/rm.h
init.o: ../../../../winix/winixd/plugins/thread/showthreads.h
init.o: ../../../../winix/winixd/plugins/thread/threadinfo.h
@@ -625,37 +620,49 @@ init.o: ../../../../winix/winixd/plugins/thread/pluginmsg.h
sessiondata.o: sessiondata.h ../../../../winix/winixd/core/plugindata.h
sessiondata.o: ticket.h ../../../../winix/winixd/functions/rm.h
sessiondata.o: ../../../../pikotools/space/space.h
sessiondata.o: ../../../../pikotools/textstream/types.h
showtickets.o: showtickets.h tdb.h ticket.h
showtickets.o: ../../../../winix/winixd/db/dbbase.h
showtickets.o: ../../../../winix/winixd/db/dbconn.h
showtickets.o: ../../../../winix/winixd/db/dbtextstream.h
showtickets.o: ../../../../winix/winixd/core/textstream.h
showtickets.o: ../../../../pikotools/textstream/textstream.h
showtickets.o: ../../../../winix/winixd/core/misc.h
showtickets.o: ../../../../winix/winixd/core/item.h
showtickets.o: ../../../../pikotools/space/space.h
showtickets.o: ../../../../pikotools/textstream/types.h
showtickets.o: ../../../../pikotools/date/date.h
showtickets.o: ../../../../pikotools/convert/convert.h
showtickets.o: ../../../../pikotools/convert/inttostr.h
showtickets.o: ../../../../pikotools/convert/strtoint.h
showtickets.o: ../../../../pikotools/convert/text.h
showtickets.o: ../../../../winix/winixd/core/misc.h
showtickets.o: ../../../../winix/winixd/core/item.h
showtickets.o: ../../../../winix/winixd/core/requesttypes.h
showtickets.o: ../../../../pikotools/utf8/utf8.h
showtickets.o: ../../../../winix/winixd/core/winix_const.h
showtickets.o: ../../../../pikotools/textstream/textstream.h
showtickets.o: ../../../../pikotools/membuffer/membuffer.h
showtickets.o: ../../../../pikotools/textstream/types.h
showtickets.o: ../../../../pikotools/utf8/utf8.h
showtickets.o: ../../../../winix/winixd/core/winix_const.h
showtickets.o: ../../../../winix/winixd/core/winixbase.h
showtickets.o: ../../../../winix/winixd/core/error.h
showtickets.o: ../../../../winix/winixd/core/config.h
showtickets.o: ../../../../pikotools/space/spaceparser.h
showtickets.o: ../../../../pikotools/space/space.h
showtickets.o: ../../../../pikotools/textstream/types.h ticketinfo.h
showtickets.o: ../../../../winix/winixd/core/log.h
showtickets.o: ../../../../winix/winixd/core/textstream.h
showtickets.o: ../../../../winix/winixd/core/logmanipulators.h
showtickets.o: ../../../../winix/winixd/core/filelog.h
showtickets.o: ../../../../winix/winixd/core/synchro.h
showtickets.o: ../../../../winix/winixd/core/log.h
showtickets.o: ../../../../winix/winixd/core/filelog.h
showtickets.o: ../../../../winix/winixd/core/lock.h
showtickets.o: ../../../../winix/winixd/core/synchro.h
showtickets.o: ../../../../winix/winixd/core/error.h ticketinfo.h
showtickets.o: ../../../../winix/winixd/core/item.h
showtickets.o: ../../../../winix/winixd/core/system.h
showtickets.o: ../../../../winix/winixd/core/job.h
showtickets.o: ../../../../winix/winixd/core/basethread.h
showtickets.o: ../../../../winix/winixd/core/synchro.h
showtickets.o: ../../../../winix/winixd/core/winixmodel.h
showtickets.o: ../../../../winix/winixd/core/plugin.h
showtickets.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
showtickets.o: ../../../../winix/winixd/core/plugindata.h
showtickets.o: ../../../../winix/winixd/core/winixbase.h
showtickets.o: ../../../../winix/winixd/core/dirs.h
showtickets.o: ../../../../winix/winixd/core/dircontainer.h
showtickets.o: ../../../../winix/winixd/db/db.h
@@ -665,17 +672,6 @@ showtickets.o: ../../../../winix/winixd/db/dbitemcolumns.h
showtickets.o: ../../../../winix/winixd/core/user.h
showtickets.o: ../../../../winix/winixd/core/group.h
showtickets.o: ../../../../winix/winixd/core/dircontainer.h
showtickets.o: ../../../../winix/winixd/core/winixbase.h
showtickets.o: ../../../../winix/winixd/core/config.h
showtickets.o: ../../../../winix/winixd/core/htmlfilter.h
showtickets.o: ../../../../winix/winixd/core/log.h
showtickets.o: ../../../../winix/winixd/core/textstream.h
showtickets.o: ../../../../winix/winixd/core/logmanipulators.h
showtickets.o: ../../../../winix/winixd/core/filelog.h
showtickets.o: ../../../../winix/winixd/core/synchro.h
showtickets.o: ../../../../winix/winixd/core/log.h
showtickets.o: ../../../../winix/winixd/core/filelog.h
showtickets.o: ../../../../winix/winixd/core/lock.h
showtickets.o: ../../../../winix/winixd/core/ugcontainer.h
showtickets.o: ../../../../winix/winixd/core/request.h
showtickets.o: ../../../../winix/winixd/core/mounts.h
@@ -691,7 +687,6 @@ showtickets.o: ../../../../winix/winixd/core/ugcontainer.h
showtickets.o: ../../../../winix/winixd/core/lastcontainer.h
showtickets.o: ../../../../winix/winixd/core/cur.h
showtickets.o: ../../../../winix/winixd/core/session.h
showtickets.o: ../../../../winix/winixd/core/plugindata.h
showtickets.o: ../../../../winix/winixd/core/rebus.h
showtickets.o: ../../../../winix/winixd/core/ipban.h
showtickets.o: ../../../../winix/winixd/core/groups.h
@@ -777,36 +772,46 @@ showtickets.o: ../../../../winix/winixd/core/system.h
showtickets.o: ../../../../winix/winixd/core/sessionidmanager.h
showtickets.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
showtickets.o: ../../../../winix/winixd/core/slog.h
showtickets.o: ../../../../winix/winixd/functions/functionbase.h pluginmsg.h
showtickets.o: ../../../../winix/winixd/functions/functionbase.h
showtickets.o: ../../../../winix/winixd/plugins/thread/pluginmsg.h
showtickets.o: ../../../../winix/winixd/core/plugin.h
tdb.o: tdb.h ticket.h ../../../../winix/winixd/db/dbbase.h
tdb.o: ../../../../winix/winixd/db/dbconn.h
tdb.o: ../../../../winix/winixd/db/dbtextstream.h
tdb.o: ../../../../winix/winixd/core/textstream.h
tdb.o: ../../../../pikotools/textstream/textstream.h
tdb.o: ../../../../pikotools/space/space.h ../../../../pikotools/date/date.h
tdb.o: ../../../../winix/winixd/core/misc.h
tdb.o: ../../../../winix/winixd/core/item.h
tdb.o: ../../../../pikotools/space/space.h
tdb.o: ../../../../pikotools/textstream/types.h
tdb.o: ../../../../pikotools/date/date.h
tdb.o: ../../../../pikotools/convert/convert.h
tdb.o: ../../../../pikotools/convert/inttostr.h
tdb.o: ../../../../pikotools/convert/strtoint.h
tdb.o: ../../../../pikotools/convert/text.h
tdb.o: ../../../../winix/winixd/core/misc.h
tdb.o: ../../../../winix/winixd/core/item.h
tdb.o: ../../../../winix/winixd/core/requesttypes.h
tdb.o: ../../../../pikotools/utf8/utf8.h
tdb.o: ../../../../winix/winixd/core/winix_const.h
tdb.o: ../../../../pikotools/textstream/textstream.h
tdb.o: ../../../../pikotools/membuffer/membuffer.h
tdb.o: ../../../../pikotools/textstream/types.h
tdb.o: ../../../../pikotools/utf8/utf8.h
tdb.o: ../../../../winix/winixd/core/winix_const.h
tdb.o: ../../../../winix/winixd/core/winixbase.h
tdb.o: ../../../../winix/winixd/core/error.h
tdb.o: ../../../../winix/winixd/core/config.h
tdb.o: ../../../../pikotools/space/spaceparser.h
tdb.o: ../../../../pikotools/space/space.h
tdb.o: ../../../../pikotools/textstream/types.h
tdb.o: ../../../../winix/winixd/core/log.h
tdb.o: ../../../../winix/winixd/core/textstream.h
tdb.o: ../../../../winix/winixd/core/logmanipulators.h
tdb.o: ../../../../winix/winixd/core/filelog.h
tdb.o: ../../../../winix/winixd/core/synchro.h
tdb.o: ../../../../winix/winixd/core/log.h
tdb.o: ../../../../winix/winixd/core/filelog.h
tdb.o: ../../../../winix/winixd/core/lock.h
tdb.o: ../../../../winix/winixd/core/synchro.h
tdb.o: ../../../../winix/winixd/core/error.h
templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
templates.o: ../../../../ezc/src/blocks.h
templates.o: ../../../../winix/winixd/core/item.h
templates.o: ../../../../pikotools/space/space.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../pikotools/date/date.h
templates.o: ../../../../pikotools/convert/convert.h
templates.o: ../../../../pikotools/convert/inttostr.h
@@ -831,7 +836,20 @@ templates.o: ../../../../winix/winixd/core/basethread.h
templates.o: ../../../../winix/winixd/core/synchro.h
templates.o: ../../../../winix/winixd/core/winixmodel.h
templates.o: ../../../../winix/winixd/core/winixbase.h
templates.o: ../../../../winix/winixd/core/plugin.h
templates.o: ../../../../winix/winixd/core/config.h
templates.o: ../../../../pikotools/space/spaceparser.h
templates.o: ../../../../pikotools/space/space.h
templates.o: ../../../../winix/winixd/core/log.h
templates.o: ../../../../winix/winixd/core/textstream.h
templates.o: ../../../../winix/winixd/core/logmanipulators.h
templates.o: ../../../../winix/winixd/core/filelog.h
templates.o: ../../../../winix/winixd/core/synchro.h
templates.o: ../../../../winix/winixd/core/log.h
templates.o: ../../../../winix/winixd/core/filelog.h
templates.o: ../../../../winix/winixd/core/lock.h
templates.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
templates.o: ../../../../winix/winixd/core/plugindata.h
templates.o: ../../../../winix/winixd/core/winixbase.h
templates.o: ../../../../winix/winixd/core/dirs.h
templates.o: ../../../../winix/winixd/core/dircontainer.h
templates.o: ../../../../winix/winixd/db/db.h
@@ -841,20 +859,6 @@ templates.o: ../../../../winix/winixd/db/dbitemcolumns.h
templates.o: ../../../../winix/winixd/core/user.h
templates.o: ../../../../winix/winixd/core/group.h
templates.o: ../../../../winix/winixd/core/dircontainer.h
templates.o: ../../../../winix/winixd/core/winixbase.h
templates.o: ../../../../winix/winixd/core/config.h
templates.o: ../../../../pikotools/space/spaceparser.h
templates.o: ../../../../pikotools/space/space.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../winix/winixd/core/htmlfilter.h
templates.o: ../../../../winix/winixd/core/log.h
templates.o: ../../../../winix/winixd/core/textstream.h
templates.o: ../../../../winix/winixd/core/logmanipulators.h
templates.o: ../../../../winix/winixd/core/filelog.h
templates.o: ../../../../winix/winixd/core/synchro.h
templates.o: ../../../../winix/winixd/core/log.h
templates.o: ../../../../winix/winixd/core/filelog.h
templates.o: ../../../../winix/winixd/core/lock.h
templates.o: ../../../../winix/winixd/core/ugcontainer.h
templates.o: ../../../../winix/winixd/core/request.h
templates.o: ../../../../winix/winixd/core/mounts.h
@@ -870,7 +874,6 @@ templates.o: ../../../../winix/winixd/core/ugcontainer.h
templates.o: ../../../../winix/winixd/core/lastcontainer.h
templates.o: ../../../../winix/winixd/core/cur.h
templates.o: ../../../../winix/winixd/core/session.h
templates.o: ../../../../winix/winixd/core/plugindata.h
templates.o: ../../../../winix/winixd/core/rebus.h
templates.o: ../../../../winix/winixd/core/ipban.h
templates.o: ../../../../winix/winixd/core/groups.h
@@ -956,7 +959,7 @@ templates.o: ../../../../winix/winixd/db/dbtextstream.h
templates.o: ../../../../winix/winixd/core/error.h editticket.h
templates.o: ../../../../winix/winixd/functions/functionbase.h createticket.h
templates.o: ../../../../winix/winixd/core/misc.h
templates.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
templates.o: ../../../../winix/winixd/core/plugin.h
templates.o: ../../../../winix/winixd/templates/templates.h
templates.o: ../../../../winix/winixd/templates/patterncacher.h
templates.o: ../../../../winix/winixd/templates/indexpatterns.h
@@ -975,22 +978,36 @@ ticketinfo.o: ../../../../winix/winixd/core/basethread.h
ticketinfo.o: ../../../../winix/winixd/core/synchro.h
ticketinfo.o: ../../../../winix/winixd/core/winixmodel.h
ticketinfo.o: ../../../../winix/winixd/core/winixbase.h
ticketinfo.o: ../../../../winix/winixd/core/plugin.h
ticketinfo.o: ../../../../winix/winixd/core/config.h
ticketinfo.o: ../../../../pikotools/space/spaceparser.h
ticketinfo.o: ../../../../pikotools/space/space.h
ticketinfo.o: ../../../../winix/winixd/core/dirs.h
ticketinfo.o: ../../../../winix/winixd/core/item.h
ticketinfo.o: ../../../../winix/winixd/core/log.h
ticketinfo.o: ../../../../winix/winixd/core/textstream.h
ticketinfo.o: ../../../../winix/winixd/core/logmanipulators.h
ticketinfo.o: ../../../../pikotools/textstream/textstream.h
ticketinfo.o: ../../../../pikotools/space/space.h
ticketinfo.o: ../../../../pikotools/textstream/types.h
ticketinfo.o: ../../../../pikotools/date/date.h
ticketinfo.o: ../../../../pikotools/convert/convert.h
ticketinfo.o: ../../../../pikotools/convert/inttostr.h
ticketinfo.o: ../../../../pikotools/convert/strtoint.h
ticketinfo.o: ../../../../pikotools/convert/text.h
ticketinfo.o: ../../../../winix/winixd/core/misc.h
ticketinfo.o: ../../../../winix/winixd/core/item.h
ticketinfo.o: ../../../../winix/winixd/core/requesttypes.h
ticketinfo.o: ../../../../pikotools/textstream/textstream.h
ticketinfo.o: ../../../../pikotools/membuffer/membuffer.h
ticketinfo.o: ../../../../pikotools/textstream/types.h
ticketinfo.o: ../../../../pikotools/utf8/utf8.h
ticketinfo.o: ../../../../winix/winixd/core/winix_const.h
ticketinfo.o: ../../../../pikotools/membuffer/membuffer.h
ticketinfo.o: ../../../../pikotools/textstream/types.h
ticketinfo.o: ../../../../winix/winixd/core/filelog.h
ticketinfo.o: ../../../../winix/winixd/core/synchro.h
ticketinfo.o: ../../../../winix/winixd/core/log.h
ticketinfo.o: ../../../../winix/winixd/core/filelog.h
ticketinfo.o: ../../../../winix/winixd/core/lock.h
ticketinfo.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
ticketinfo.o: ../../../../winix/winixd/core/plugindata.h
ticketinfo.o: ../../../../winix/winixd/core/winixbase.h
ticketinfo.o: ../../../../winix/winixd/core/dirs.h
ticketinfo.o: ../../../../winix/winixd/core/dircontainer.h
ticketinfo.o: ../../../../winix/winixd/db/db.h
ticketinfo.o: ../../../../winix/winixd/db/dbbase.h
@@ -999,20 +1016,6 @@ ticketinfo.o: ../../../../winix/winixd/db/dbitemcolumns.h
ticketinfo.o: ../../../../winix/winixd/core/user.h
ticketinfo.o: ../../../../winix/winixd/core/group.h
ticketinfo.o: ../../../../winix/winixd/core/dircontainer.h
ticketinfo.o: ../../../../winix/winixd/core/winixbase.h
ticketinfo.o: ../../../../winix/winixd/core/config.h
ticketinfo.o: ../../../../pikotools/space/spaceparser.h
ticketinfo.o: ../../../../pikotools/space/space.h
ticketinfo.o: ../../../../pikotools/textstream/types.h
ticketinfo.o: ../../../../winix/winixd/core/htmlfilter.h
ticketinfo.o: ../../../../winix/winixd/core/log.h
ticketinfo.o: ../../../../winix/winixd/core/textstream.h
ticketinfo.o: ../../../../winix/winixd/core/logmanipulators.h
ticketinfo.o: ../../../../winix/winixd/core/filelog.h
ticketinfo.o: ../../../../winix/winixd/core/synchro.h
ticketinfo.o: ../../../../winix/winixd/core/log.h
ticketinfo.o: ../../../../winix/winixd/core/filelog.h
ticketinfo.o: ../../../../winix/winixd/core/lock.h
ticketinfo.o: ../../../../winix/winixd/core/ugcontainer.h
ticketinfo.o: ../../../../winix/winixd/core/request.h
ticketinfo.o: ../../../../winix/winixd/core/mounts.h
@@ -1028,7 +1031,6 @@ ticketinfo.o: ../../../../winix/winixd/core/ugcontainer.h
ticketinfo.o: ../../../../winix/winixd/core/lastcontainer.h
ticketinfo.o: ../../../../winix/winixd/core/cur.h
ticketinfo.o: ../../../../winix/winixd/core/session.h
ticketinfo.o: ../../../../winix/winixd/core/plugindata.h
ticketinfo.o: ../../../../winix/winixd/core/rebus.h
ticketinfo.o: ../../../../winix/winixd/core/ipban.h
ticketinfo.o: ../../../../winix/winixd/core/groups.h
@@ -1119,8 +1121,7 @@ ticketinfo.o: ../../../../winix/winixd/db/dbbase.h
ticketinfo.o: ../../../../winix/winixd/db/dbconn.h
ticketinfo.o: ../../../../winix/winixd/db/dbtextstream.h
ticketinfo.o: ../../../../winix/winixd/core/error.h
ticketinfo.o: ../../../../winix/winixd/core/misc.h
ticketinfo.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
ticketinfo.o: sessiondata.h ../../../../winix/winixd/core/plugindata.h
ticketinfo.o: ../../../../winix/winixd/core/misc.h sessiondata.h
ticketinfo.o: ../../../../winix/winixd/core/plugindata.h
ticketinfo.o: ../../../../winix/winixd/functions/rm.h
ticketinfo.o: ../../../../pikotools/convert/text.h

5
winixd/plugins/ticket/createticket.cpp
View File

@@ -32,7 +32,6 @@
*
*/
#include "core/plugin.h"
#include "createticket.h"
#include "functions/functions.h"
#include "sessiondata.h"
@@ -100,7 +99,7 @@ void CreateTicket::AddTicket(Ticket & ticket, Item & item)
system->notify.ItemChanged(notify_msg);
// sending a message
plugin.Call(WINIX_PL_TICKET_ADDED_NEW, &ticket, &item);
plugin->Call(WINIX_PL_TICKET_ADDED_NEW, &ticket, &item);
}
}
@@ -116,7 +115,7 @@ void CreateTicket::Submit(Ticket & ticket, Item & item)
item.privileges = system->NewFilePrivileges();
item.parent_id = cur->request->dir_tab.back()->id;
plugin.Call(WINIX_PL_TICKET_PREPARE_TO_ADD_TICKET, &item, &ticket);
plugin->Call(WINIX_PL_TICKET_PREPARE_TO_ADD_TICKET, &item, &ticket);
// adding without notificating
cur->request->status = system->AddFile(item, false);

7
winixd/plugins/ticket/editticket.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
@@ -35,7 +35,6 @@
#include "editticket.h"
#include "functions/functions.h"
#include "sessiondata.h"
#include "core/plugin.h"
#include "pluginmsg.h"
namespace Winix
@@ -107,7 +106,7 @@ void EditTicket::ChangeTicket(Ticket & ticket, Item & item)
system->notify.ItemChanged(notify_msg);
// sending a message
plugin.Call(WINIX_PL_TICKET_CHANGED, &ticket, &item);
plugin->Call(WINIX_PL_TICKET_CHANGED, &ticket, &item);
}
}
@@ -234,7 +233,7 @@ void EditTicket::MakePost()
if( cur->request->IsParam(L"close") )
{
if( CloseTicket() )
plugin.Call(WINIX_PL_TICKET_CLOSED, ticket_info->item, ticket_info->ticket);
plugin->Call(WINIX_PL_TICKET_CLOSED, ticket_info->item, ticket_info->ticket);
ticket_info->MakeRedirectIfPossible(*cur->request->last_item);
}

5
winixd/plugins/ticket/funticket.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 "funticket.h"
#include "core/plugin.h"
#include "plugins/thread/pluginmsg.h"
namespace Winix
@@ -79,7 +78,7 @@ void FunTicket::MakeGet()
tdb->GetTicket(cur->request->item.id, ticket);
plugin.Call(WINIX_PL_THREAD_PREPARE_THREAD, cur->request->item.id);
plugin->Call(WINIX_PL_THREAD_PREPARE_THREAD, cur->request->item.id);
}

35
winixd/plugins/ticket/init.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2014, Tomasz Sowa
* Copyright (c) 2010-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -37,8 +37,6 @@
#include "editticket.h"
#include "createticket.h"
#include "showtickets.h"
#include "core/log.h"
#include "core/plugin.h"
#include "sessiondata.h"
#include "plugins/thread/showthreads.h"
#include "plugins/thread/pluginmsg.h"
@@ -147,7 +145,7 @@ void CreateSession(PluginInfo & info)
p->fun_rm = &info.functions->fun_rm;
info.session->plugin_data.Assign(info.plugin->current_plugin, p);
log << log4 << "Ticket: created ticket plugin data: " << (void*)p << logend;
info.log << log4 << "Ticket: created ticket plugin data: " << (void*)p << logend;
}
@@ -157,7 +155,7 @@ void RemoveSession(PluginInfo & info)
{
info.plugin_data_base->Clear();
delete info.plugin_data_base;
log << log4 << "Ticket: removed ticket plugin data: " << (void*)info.plugin_data_base << logend;
info.log << log4 << "Ticket: removed ticket plugin data: " << (void*)info.plugin_data_base << logend;
}
}
@@ -188,24 +186,25 @@ void Init(PluginInfo & info)
{
using namespace Ticket;
plugin.Assign(WINIX_PLUGIN_INIT, InitTicket);
plugin.Assign(WINIX_TEMPLATES_CREATEFUNCTIONS, AddEzcFunctions);
plugin.Assign(WINIX_CREATE_FUNCTIONS, AddFunctions);
plugin.Assign(WINIX_SELECT_DEFAULT_FUNCTION, SelectDefaultFunction);
plugin.Assign(WINIX_ADD_MOUNTS, AddMounts);
plugin.Assign(WINIX_FSTAB_CHANGED, FstabChanged);
plugin.Assign(WINIX_PROCESS_REQUEST, ProcessRequest);
plugin.Assign(WINIX_FILE_REMOVED, RemoveTicket);
plugin.Assign(WINIX_NOTIFY_ADD_TEMPLATE, AddNotifyTemplate);
plugin.Assign(WINIX_SESSION_CREATED, CreateSession);
plugin.Assign(WINIX_PLUGIN_SESSION_DATA_REMOVE, RemoveSession);
plugin.Assign(WINIX_END_REQUEST, EndRequest);
plugin.Assign(WINIX_PL_TICKET_LOAD_TICKETS, ShowTicketsFromDir);
info.plugin->Assign(WINIX_PLUGIN_INIT, InitTicket);
info.plugin->Assign(WINIX_TEMPLATES_CREATEFUNCTIONS, AddEzcFunctions);
info.plugin->Assign(WINIX_CREATE_FUNCTIONS, AddFunctions);
info.plugin->Assign(WINIX_SELECT_DEFAULT_FUNCTION, SelectDefaultFunction);
info.plugin->Assign(WINIX_ADD_MOUNTS, AddMounts);
info.plugin->Assign(WINIX_FSTAB_CHANGED, FstabChanged);
info.plugin->Assign(WINIX_PROCESS_REQUEST, ProcessRequest);
info.plugin->Assign(WINIX_FILE_REMOVED, RemoveTicket);
info.plugin->Assign(WINIX_NOTIFY_ADD_TEMPLATE, AddNotifyTemplate);
info.plugin->Assign(WINIX_SESSION_CREATED, CreateSession);
info.plugin->Assign(WINIX_PLUGIN_SESSION_DATA_REMOVE, RemoveSession);
info.plugin->Assign(WINIX_END_REQUEST, EndRequest);
info.plugin->Assign(WINIX_PL_TICKET_LOAD_TICKETS, ShowTicketsFromDir);
tdb.SetConn(info.db->GetConn());
tdb.LogQueries(info.config->log_db_query);
info.set_dependency_for(ticket_info);
ticket_info.SetDb(info.db);
ticket_info.SetTDb(&tdb);
ticket_info.SetConfig(info.config);

12
winixd/plugins/ticket/showtickets.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2014, Tomasz Sowa
* Copyright (c) 2010-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@
#include "showtickets.h"
#include "pluginmsg.h"
#include "plugins/thread/pluginmsg.h"
#include "core/plugin.h"
namespace Winix
{
@@ -134,7 +134,7 @@ void ShowTickets::CreatePointers()
void ShowTickets::SortPointers()
{
PluginRes res = plugin.Call(WINIX_PL_TICKET_SORT_POINTERS, &ticket_info->item_sort_tab);
PluginRes res = plugin->Call(WINIX_PL_TICKET_SORT_POINTERS, &ticket_info->item_sort_tab);
if( res.res_true > 0 )
return;
@@ -172,11 +172,11 @@ void ShowTickets::ShowTicketsFromDir(long dir_id)
SortPointers();
ReadTickets();
plugin.Call(WINIX_PL_TICKET_TICKETS_LOADED, &ticket_info->ticket_tab, &ticket_info->item_sort_tab);
plugin->Call(WINIX_PL_TICKET_TICKETS_LOADED, &ticket_info->ticket_tab, &ticket_info->item_sort_tab);
// !! IMPROVE ME may a better name instead of WINIX_PL_THREAD_SET_SORTTAB?
plugin.Call(WINIX_PL_THREAD_SET_SORTTAB, &ticket_info->item_sort_tab);
plugin.Call(WINIX_PL_THREAD_READ_THREADS);
plugin->Call(WINIX_PL_THREAD_SET_SORTTAB, &ticket_info->item_sort_tab);
plugin->Call(WINIX_PL_THREAD_READ_THREADS);
}

4
winixd/plugins/ticket/templates.cpp
View File

@@ -522,7 +522,7 @@ void tickets_tab(Info & i)
// may we add en ampty ticket and tickets_value.ticket will be pointing to it?
// !! IMPROVEME change the name of the message
plugin.Call(WINIX_PL_TICKET_TICKETS_TAB_IS_NEXT, tickets_value.item);
plugin->Call(WINIX_PL_TICKET_TICKETS_TAB_IS_NEXT, tickets_value.item);
if( find_ticket(file_id, ticket_info.ticket_tab, ticket_index) )
{
@@ -534,7 +534,7 @@ void tickets_tab(Info & i)
log << log1 << "Ticket: I cannot find a ticket for file_id: " << file_id << logend;
}
plugin.Call(WINIX_PL_THREAD_SET_SORTTAB_INDEX, item_sort_index);
plugin->Call(WINIX_PL_THREAD_SET_SORTTAB_INDEX, item_sort_index);
}
}

3
winixd/plugins/ticket/ticketinfo.cpp
View File

@@ -38,7 +38,6 @@
#include "core/error.h"
#include "core/log.h"
#include "core/misc.h"
#include "core/plugin.h"
#include "pluginmsg.h"
#include "sessiondata.h"
#include "convert/text.h"
@@ -626,7 +625,7 @@ void TicketInfo::CopyTicketSpace(PT::Space & ticket_space, Item & item)
void TicketInfo::MakeRedirectIfPossible(const Item & item)
{
PluginRes res = plugin.Call(WINIX_PL_TICKET_CAN_MAKE_REDIRECT);
PluginRes res = plugin->Call(WINIX_PL_TICKET_CAN_MAKE_REDIRECT);
if( res.res_false > 0 )
{

6
winixd/plugins/ticket/ticketinfo.h
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2014, Tomasz Sowa
* Copyright (c) 2010-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -43,6 +43,8 @@
#include "db/db.h"
#include "tdb.h"
#include "space/spaceparser.h"
#include "core/winixmodel.h"
namespace Winix
{
@@ -65,7 +67,7 @@ struct TicketConfWrap
};
class TicketInfo
class TicketInfo : public WinixModel
{
public: