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

Item class has been moved to a new directory 'models', a new class has been added: ItemContent

Browse Source 
and same fields from Item were moved to ItemContent

Item
- id
- parent_id
- type (file, dir, symlink)
- url
- subject
- template (html template)
- sort_index
- content_id

ItemContent
- id
- ref -> references (renamed)
- user_id
- modification_user_id
- group_id
- privileges
- date_creation
- date_modification
- guest_name
- link_to
- link_redirect
- file_path
- file_fs
- file_type
- file_size
- has_thumb -> file_has_thumb (renamed)
- hash -> file_hash (renamed)
- hash_type -> file_hash_type (renamed)
- content -> content_raw (renamed)
- content_type -> content_raw_type (renamed)
- content_parsed
- content_parsed_type
- meta
- ameta -> meta_admin (renamed)
- modify_index (removed)

WIP: #4
This commit is contained in:
Tomasz Sowa
2021-02-24 01:19:47 +01:00
parent 3d7ece15f8
commit 32e93a04c5
118 changed files with 5795 additions and 4514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,13 +5,12 @@ edb.o: ../../../../winix/winixd/db/dbconn.h
edb.o: ../../../../winix/winixd/db/dbtextstream.h
edb.o: ../../../../winix/winixd/core/textstream.h
edb.o: ../../../../winix/winixd/core/misc.h
edb.o: ../../../../winix/winixd/core/item.h
edb.o: ../../../../winix/winixd/core/requesttypes.h
edb.o: ../../../../pikotools/textstream/textstream.h
edb.o: ../../../../pikotools/space/space.h
edb.o: ../../../../pikotools/textstream/types.h
edb.o: ../../../../pikotools/date/date.h
edb.o: ../../../../pikotools/convert/inttostr.h
edb.o: ../../../../winix/winixd/core/requesttypes.h
edb.o: ../../../../pikotools/textstream/textstream.h
edb.o: ../../../../pikotools/membuffer/membuffer.h
edb.o: ../../../../pikotools/textstream/types.h
edb.o: ../../../../pikotools/utf8/utf8.h
@@ -37,9 +36,20 @@ edb.o: ../../../../winix/winixd/core/error.h export.h
edb.o: ../../../../winix/winixd/core/dirs.h
edb.o: ../../../../winix/winixd/core/dircontainer.h
edb.o: ../../../../winix/winixd/core/winixbase.h
edb.o: ../../../../winix/winixd/models/item.h ../../../../morm/src/model.h
edb.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
edb.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
edb.o: ../../../../morm/src/flatconnector.h
edb.o: ../../../../morm/src/dbexpression.h
edb.o: ../../../../morm/src/baseexpression.h
edb.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h
edb.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
edb.o: ../../../../morm/src/finderhelper.h
edb.o: ../../../../morm/src/fieldvaluehelper.h
edb.o: ../../../../morm/src/flatexpression.h
edb.o: ../../../../winix/winixd/models/itemcontent.h
edb.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h
edb.o: ../../../../winix/winixd/db/dbitemquery.h
edb.o: ../../../../winix/winixd/core/item.h
edb.o: ../../../../winix/winixd/db/dbitemcolumns.h
edb.o: ../../../../winix/winixd/core/user.h
edb.o: ../../../../winix/winixd/core/group.h
@@ -56,17 +66,8 @@ edb.o: ../../../../winix/winixd/core/winixmodel.h
edb.o: ../../../../winix/winixd/core/plugin.h
edb.o: ../../../../winix/winixd/core/pluginmsg.h
edb.o: ../../../../winix/winixd/core/plugindata.h ../../../../morm/src/morm.h
edb.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
edb.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
edb.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
edb.o: ../../../../morm/src/flatconnector.h
edb.o: ../../../../morm/src/dbexpression.h
edb.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
edb.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
edb.o: ../../../../morm/src/finderhelper.h
edb.o: ../../../../morm/src/fieldvaluehelper.h
edb.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
edb.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
edb.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
edb.o: ../../../../morm/src/jsonexpression.h
edb.o: ../../../../morm/src/postgresqlexpression.h
edb.o: ../../../../morm/src/jsonconnector.h
edb.o: ../../../../morm/src/postgresqlconnector.h
@@ -99,13 +100,13 @@ exportinfo.o: ../../../../winix/winixd/core/plugin.h
exportinfo.o: ../../../../winix/winixd/core/pluginmsg.h
exportinfo.o: ../../../../winix/winixd/core/plugindata.h
exportinfo.o: ../../../../winix/winixd/core/winixbase.h
exportinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
exportinfo.o: ../../../../morm/src/model.h
exportinfo.o: ../../../../morm/src/modelconnector.h
exportinfo.o: ../../../../morm/src/clearer.h
exportinfo.o: ../../../../morm/src/dbconnector.h
exportinfo.o: ../../../../morm/src/queryresult.h
exportinfo.o: ../../../../morm/src/flatconnector.h
exportinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
exportinfo.o: ../../../../morm/src/model.h
exportinfo.o: ../../../../morm/src/dbexpression.h
exportinfo.o: ../../../../morm/src/baseexpression.h
exportinfo.o: ../../../../morm/src/modelenv.h
@@ -122,12 +123,12 @@ exportinfo.o: ../../../../morm/src/jsonconnector.h
exportinfo.o: ../../../../morm/src/postgresqlconnector.h
exportinfo.o: ../../../../morm/src/postgresqlqueryresult.h
exportinfo.o: ../../../../winix/winixd/core/dirs.h
exportinfo.o: ../../../../winix/winixd/core/item.h
exportinfo.o: ../../../../winix/winixd/core/dircontainer.h
exportinfo.o: ../../../../winix/winixd/models/item.h
exportinfo.o: ../../../../winix/winixd/models/itemcontent.h
exportinfo.o: ../../../../winix/winixd/db/db.h
exportinfo.o: ../../../../winix/winixd/db/dbbase.h
exportinfo.o: ../../../../winix/winixd/db/dbitemquery.h
exportinfo.o: ../../../../winix/winixd/core/item.h
exportinfo.o: ../../../../winix/winixd/db/dbitemcolumns.h
exportinfo.o: ../../../../winix/winixd/core/user.h
exportinfo.o: ../../../../winix/winixd/core/group.h
@@ -175,9 +176,10 @@ exportinfo.o: ../../../../winix/winixd/templates/patterns.h
exportinfo.o: ../../../../winix/winixd/templates/locale.h
exportinfo.o: ../../../../winix/winixd/templates/localefilter.h
exportinfo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
exportinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
exportinfo.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
exportinfo.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
exportinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
exportinfo.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
exportinfo.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
exportinfo.o: ../../../../ezc/src/pattern.h
exportinfo.o: ../../../../ezc/src/expressionparser.h
exportinfo.o: ../../../../ezc/src/patternparser.h
exportinfo.o: ../../../../winix/winixd/notify/notifythread.h
@@ -196,13 +198,12 @@ exportinfo.o: ../../../../pikotools/convert/text.h
exportthread.o: exportthread.h ../../../../winix/winixd/core/basethread.h
exportthread.o: message.h ../../../../winix/winixd/core/log.h
exportthread.o: ../../../../winix/winixd/core/misc.h
exportthread.o: ../../../../winix/winixd/core/item.h
exportthread.o: ../../../../winix/winixd/core/requesttypes.h
exportthread.o: ../../../../pikotools/textstream/textstream.h
exportthread.o: ../../../../pikotools/space/space.h
exportthread.o: ../../../../pikotools/textstream/types.h
exportthread.o: ../../../../pikotools/date/date.h
exportthread.o: ../../../../pikotools/convert/inttostr.h
exportthread.o: ../../../../winix/winixd/core/requesttypes.h
exportthread.o: ../../../../pikotools/textstream/textstream.h
exportthread.o: ../../../../pikotools/membuffer/membuffer.h
exportthread.o: ../../../../pikotools/textstream/types.h
exportthread.o: ../../../../pikotools/utf8/utf8.h
@@ -215,7 +216,6 @@ exportthread.o: ../../../../pikotools/convert/text.h
exportthread.o: ../../../../winix/winixd/core/misc.h
exportthread.o: ../../../../pikotools/convert/text.h
funexport.o: funexport.h ../../../../winix/winixd/functions/functionbase.h
funexport.o: ../../../../winix/winixd/core/item.h
funexport.o: ../../../../winix/winixd/db/db.h
funexport.o: ../../../../winix/winixd/db/dbbase.h
funexport.o: ../../../../winix/winixd/db/dbitemquery.h
@@ -234,7 +234,24 @@ funexport.o: ../../../../winix/winixd/core/requesttypes.h
funexport.o: ../../../../pikotools/textstream/textstream.h
funexport.o: ../../../../pikotools/membuffer/membuffer.h
funexport.o: ../../../../pikotools/textstream/types.h
funexport.o: ../../../../winix/winixd/core/item.h
funexport.o: ../../../../winix/winixd/models/item.h
funexport.o: ../../../../morm/src/model.h
funexport.o: ../../../../morm/src/modelconnector.h
funexport.o: ../../../../morm/src/clearer.h
funexport.o: ../../../../morm/src/dbconnector.h
funexport.o: ../../../../pikotools/log/log.h
funexport.o: ../../../../pikotools/log/filelog.h
funexport.o: ../../../../morm/src/queryresult.h
funexport.o: ../../../../morm/src/flatconnector.h
funexport.o: ../../../../morm/src/dbexpression.h
funexport.o: ../../../../morm/src/baseexpression.h
funexport.o: ../../../../morm/src/morm_types.h
funexport.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
funexport.o: ../../../../morm/src/cursorhelper.h
funexport.o: ../../../../morm/src/finderhelper.h
funexport.o: ../../../../morm/src/fieldvaluehelper.h
funexport.o: ../../../../morm/src/flatexpression.h
funexport.o: ../../../../winix/winixd/models/itemcontent.h
funexport.o: ../../../../winix/winixd/core/error.h
funexport.o: ../../../../winix/winixd/core/config.h
funexport.o: ../../../../winix/winixd/core/textstream.h
@@ -255,8 +272,6 @@ funexport.o: ../../../../winix/winixd/core/config.h
funexport.o: ../../../../pikotools/space/spaceparser.h
funexport.o: ../../../../winix/winixd/core/log.h
funexport.o: ../../../../winix/winixd/core/logmanipulators.h
funexport.o: ../../../../pikotools/log/log.h
funexport.o: ../../../../pikotools/log/filelog.h
funexport.o: ../../../../winix/winixd/core/system.h
funexport.o: ../../../../winix/winixd/core/job.h
funexport.o: ../../../../winix/winixd/core/basethread.h
@@ -270,21 +285,8 @@ funexport.o: ../../../../winix/winixd/core/lock.h
funexport.o: ../../../../winix/winixd/core/plugin.h
funexport.o: ../../../../winix/winixd/core/pluginmsg.h
funexport.o: ../../../../winix/winixd/core/plugindata.h
funexport.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
funexport.o: ../../../../morm/src/model.h
funexport.o: ../../../../morm/src/modelconnector.h
funexport.o: ../../../../morm/src/clearer.h
funexport.o: ../../../../morm/src/dbconnector.h
funexport.o: ../../../../morm/src/queryresult.h
funexport.o: ../../../../morm/src/flatconnector.h
funexport.o: ../../../../morm/src/dbexpression.h
funexport.o: ../../../../morm/src/baseexpression.h
funexport.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
funexport.o: ../../../../morm/src/cursorhelper.h
funexport.o: ../../../../morm/src/finderhelper.h
funexport.o: ../../../../morm/src/fieldvaluehelper.h
funexport.o: ../../../../morm/src/flatexpression.h
funexport.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
funexport.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h
funexport.o: ../../../../morm/src/cursor.h
funexport.o: ../../../../morm/src/jsonexpression.h
funexport.o: ../../../../morm/src/postgresqlexpression.h
funexport.o: ../../../../morm/src/jsonconnector.h
@@ -319,9 +321,10 @@ funexport.o: ../../../../winix/winixd/templates/patterns.h
funexport.o: ../../../../winix/winixd/templates/locale.h
funexport.o: ../../../../winix/winixd/templates/localefilter.h
funexport.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
funexport.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
funexport.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
funexport.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
funexport.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
funexport.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
funexport.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
funexport.o: ../../../../ezc/src/pattern.h
funexport.o: ../../../../ezc/src/expressionparser.h
funexport.o: ../../../../ezc/src/patternparser.h
funexport.o: ../../../../winix/winixd/notify/notifythread.h
@@ -350,7 +353,19 @@ init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/plugin.h
init.o: ../../../../winix/winixd/core/pluginmsg.h
init.o: ../../../../winix/winixd/core/plugindata.h
init.o: ../../../../winix/winixd/core/winixbase.h exportthread.h
init.o: ../../../../winix/winixd/core/winixbase.h
init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
init.o: ../../../../pikotools/date/date.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../morm/src/dbconnector.h
init.o: ../../../../pikotools/textstream/textstream.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/log/log.h ../../../../pikotools/log/filelog.h
init.o: ../../../../morm/src/queryresult.h
init.o: ../../../../morm/src/flatconnector.h exportthread.h
init.o: ../../../../winix/winixd/core/basethread.h message.h exportinfo.h
init.o: ../../../../winix/winixd/core/system.h
init.o: ../../../../winix/winixd/core/job.h
@@ -363,23 +378,11 @@ init.o: ../../../../pikotools/space/spaceparser.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/logmanipulators.h
init.o: ../../../../pikotools/log/log.h
init.o: ../../../../pikotools/textstream/textstream.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/date/date.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/log/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/plugin.h ../../../../morm/src/morm.h
init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
init.o: ../../../../morm/src/flatconnector.h
init.o: ../../../../morm/src/dbexpression.h
init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
@@ -393,11 +396,11 @@ init.o: ../../../../morm/src/jsonconnector.h
init.o: ../../../../morm/src/postgresqlconnector.h
init.o: ../../../../morm/src/postgresqlqueryresult.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/models/item.h
init.o: ../../../../winix/winixd/models/itemcontent.h
init.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.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
@@ -445,10 +448,10 @@ init.o: ../../../../winix/winixd/templates/patterns.h
init.o: ../../../../winix/winixd/templates/locale.h
init.o: ../../../../winix/winixd/templates/localefilter.h
init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
init.o: ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
init.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/patternparser.h
init.o: ../../../../winix/winixd/notify/notifythread.h
init.o: ../../../../winix/winixd/notify/templatesnotify.h

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

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2018, Tomasz Sowa
* Copyright (c) 2011-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -188,7 +188,7 @@ void ExportInfo::SendFile(const Item & item, bool thumb, bool put_to_recurrence_
system->dirs.MakePath(item.parent_id, msg.path);
msg.path += item.url;
if( item.file_type != WINIX_ITEM_FILETYPE_NONE )
if( item.item_content.file_type != WINIX_ITEM_FILETYPE_NONE )
{
msg.type = WINIX_PL_EXPORT_TYPE_CREATE_FILE_STATIC;
@@ -220,7 +220,7 @@ void ExportInfo::SendFile(const Item & item, bool thumb, bool put_to_recurrence_
msg.http_server = exp.http_server;
system->dirs.MakePath(exp_dir->dir_id, msg.src_dir);
if( !item.file_path.empty() && thumb ) // !! uzyc file_type
if( !item.item_content.file_path.empty() && thumb ) // !! uzyc file_type
msg.path.insert(0, L"/download"); // !! do konfiga
if( !exp.ftp_dir.empty() )
@@ -299,15 +299,26 @@ void ExportInfo::SendDir(long dir_id)
// send all non-static files from a directory
void ExportInfo::SendAllFilesFromDir(long dir_id)
{
iq_dir.SetAll(false, false);
iq_dir.sel_parent_id = true;
iq_dir.sel_url = true;
iq_dir.sel_file = true;
iq_dir.WhereParentId(dir_id);
iq_dir.WhereType(Item::file);
iq_dir.WhereFileType(WINIX_ITEM_FILETYPE_NONE);
// iq_dir.SetAll(false, false);
// iq_dir.sel_parent_id = true;
// iq_dir.sel_url = true;
// iq_dir.sel_file = true;
// iq_dir.WhereParentId(dir_id);
// iq_dir.WhereType(Item::file);
// iq_dir.WhereFileType(WINIX_ITEM_FILETYPE_NONE);
db->GetItems(dir_items, iq_dir);
morm::Finder<Item> finder(model_connector);
finder.
select().
where().
eq(L"parent_id", dir_id).
eq(L"type", static_cast<int>(Item::file)).
eq(L"content.file_type", WINIX_ITEM_FILETYPE_NONE).
get_vector(dir_items);
//db->GetItems(dir_items, iq_dir);
for(size_t i=0 ; i<dir_items.size() ; ++i)
{
@@ -319,10 +330,10 @@ void ExportInfo::SendAllFilesFromDir(long dir_id)
void ExportInfo::AdditionalExport(const Item & item)
{
for(size_t i=0 ; i<item.meta.spaces.size() ; ++i)
for(size_t i=0 ; i<item.item_content.meta.spaces.size() ; ++i)
{
if( item.meta.spaces[i]->name == L"export" )
AdditionalExport(item, *item.meta.spaces[i]);
if( item.item_content.meta.spaces[i]->name == L"export" )
AdditionalExport(item, *item.item_content.meta.spaces[i]);
}
}

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

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
#include "edb.h"
#include "message.h"
#include "exportthread.h"
#include "core/winixbase.h"
#include "core/winixmodel.h"
@@ -52,7 +52,7 @@ namespace Export
{
class ExportInfo : public WinixBase
class ExportInfo : public WinixModel
{
public:
@@ -93,7 +93,7 @@ private:
Export exp;
std::wstring tmp_dir;
std::vector<ExportDir> export_dirs;
DbItemQuery iq_dir;
//DbItemQuery iq_dir;
std::vector<Item> dir_items;
std::vector<std::wstring> additional_export;
std::vector<Item*> additional_export_dir_tab;

35
winixd/plugins/export/funexport.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2012-2014, Tomasz Sowa
* Copyright (c) 2012-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,7 +68,7 @@ void FunExport::ExportFile(const Item & item)
{
log << log4 << "Export: exporting file: url: " << item.url << ", id: " << item.id << logend;
if( item.file_type == WINIX_ITEM_FILETYPE_NONE )
if( item.item_content.file_type == WINIX_ITEM_FILETYPE_NONE )
{
export_info->SendFile(item, false, true);
}
@@ -86,25 +86,36 @@ void FunExport::ExportDir(const Item & dir, bool static_files_too)
log << log4 << "Export: exporting directory: url: " << dir.url << ", id: " << dir.id << logend;
iq_dir.SetAll(false, false);
iq_dir.sel_parent_id = true;
iq_dir.sel_url = true;
iq_dir.sel_file = true;
iq_dir.WhereParentId(dir.id);
iq_dir.WhereType(Item::file);
// iq_dir.SetAll(false, false);
// iq_dir.sel_parent_id = true;
// iq_dir.sel_url = true;
// iq_dir.sel_file = true;
// iq_dir.WhereParentId(dir.id);
// iq_dir.WhereType(Item::file);
morm::Finder<Item> finder(model_connector);
finder.
select().
where().
eq(L"parent_id", dir.id).
eq(L"type", static_cast<int>(Item::file));
if( !static_files_too )
iq_dir.WhereFileType(WINIX_ITEM_FILETYPE_NONE);
{
//iq_dir.WhereFileType(WINIX_ITEM_FILETYPE_NONE);
finder.eq(L"content.file_type", WINIX_ITEM_FILETYPE_NONE);
}
db->GetItems(dir_items, iq_dir);
finder.get_vector(dir_items);
//db->GetItems(dir_items, iq_dir);
for(size_t i=0 ; i<dir_items.size() ; ++i)
{
ExportFile(dir_items[i]);
}
DirContainer::ParentIterator i = system->dirs.FindFirstChild(dir.id);
for( ; i != system->dirs.ParentEnd() ; i = system->dirs.NextChild(i) )

4
winixd/plugins/export/funexport.h
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2012-2014, Tomasz Sowa
* Copyright (c) 2012-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,7 +66,7 @@ public:
private:
ExportInfo * export_info;
DbItemQuery iq_dir;
//DbItemQuery iq_dir;
std::vector<Item> dir_items;
void Export();

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

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2018, Tomasz Sowa
* Copyright (c) 2011-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -113,7 +113,7 @@ void SendFileAdded(PluginInfo & info)
if( item )
{
if( item->file_type == WINIX_ITEM_FILETYPE_IMAGE && info.config->image_resize )
if( item->item_content.file_type == WINIX_ITEM_FILETYPE_IMAGE && info.config->image_resize )
{
// there'll be a next message WINIX_IMAGE_RESIZED
info.log << log4 << "Export: image will be resized, waiting..." << logend;
@@ -124,7 +124,7 @@ void SendFileAdded(PluginInfo & info)
export_info.SendFile(*item);
export_info.SendDir(item->parent_id);
if( item->file_type == WINIX_ITEM_FILETYPE_NONE )
if( item->item_content.file_type == WINIX_ITEM_FILETYPE_NONE )
export_info.SendAllFilesFromDir(item->parent_id);
}
}
@@ -141,7 +141,7 @@ void SendFileChanged(PluginInfo & info)
export_info.SendFile(*item);
export_info.SendDir(item->parent_id);
if( item->file_type == WINIX_ITEM_FILETYPE_NONE )
if( item->item_content.file_type == WINIX_ITEM_FILETYPE_NONE )
export_info.SendAllFilesFromDir(item->parent_id);
}
}
@@ -157,7 +157,7 @@ void SendFileCopied(PluginInfo & info)
export_info.ResetRecurrenceCheck();
export_info.SendDir(item->parent_id);
if( item->file_type == WINIX_ITEM_FILETYPE_NONE )
if( item->item_content.file_type == WINIX_ITEM_FILETYPE_NONE )
{
export_info.SendAllFilesFromDir(item->parent_id);
}
@@ -203,7 +203,7 @@ void SendFilePrepareMove(PluginInfo & info)
if( item )
{
if( item->file_type == WINIX_ITEM_FILETYPE_NONE )
if( item->item_content.file_type == WINIX_ITEM_FILETYPE_NONE )
{
export_info.ResetRecurrenceCheck();
export_info.SendAllFilesFromDir(item->parent_id);
@@ -221,7 +221,7 @@ void FileRemoved(PluginInfo & info)
export_info.ResetRecurrenceCheck();
export_info.SendDir(item->parent_id);
if( item->file_type == WINIX_ITEM_FILETYPE_NONE )
if( item->item_content.file_type == WINIX_ITEM_FILETYPE_NONE )
export_info.SendAllFilesFromDir(item->parent_id);
}
}

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

@@ -1,20 +1,18 @@
# DO NOT DELETE
gallery.o: gallery.h ../../../../winix/winixd/functions/functionbase.h
gallery.o: ../../../../winix/winixd/core/item.h
gallery.o: ../../../../pikotools/space/space.h
gallery.o: ../../../../pikotools/textstream/types.h
gallery.o: ../../../../pikotools/date/date.h
gallery.o: ../../../../pikotools/convert/inttostr.h
gallery.o: ../../../../winix/winixd/db/db.h
gallery.o: ../../../../winix/winixd/db/dbbase.h
gallery.o: ../../../../winix/winixd/db/dbconn.h
gallery.o: ../../../../winix/winixd/db/dbtextstream.h
gallery.o: ../../../../winix/winixd/core/textstream.h
gallery.o: ../../../../winix/winixd/core/misc.h
gallery.o: ../../../../winix/winixd/core/item.h
gallery.o: ../../../../winix/winixd/core/requesttypes.h
gallery.o: ../../../../pikotools/textstream/textstream.h
gallery.o: ../../../../pikotools/space/space.h
gallery.o: ../../../../pikotools/textstream/types.h
gallery.o: ../../../../pikotools/date/date.h
gallery.o: ../../../../pikotools/convert/inttostr.h
gallery.o: ../../../../pikotools/membuffer/membuffer.h
gallery.o: ../../../../pikotools/textstream/types.h
gallery.o: ../../../../pikotools/utf8/utf8.h
@@ -44,6 +42,20 @@ gallery.o: ../../../../winix/winixd/core/user.h
gallery.o: ../../../../winix/winixd/core/group.h
gallery.o: ../../../../winix/winixd/core/dircontainer.h
gallery.o: ../../../../winix/winixd/core/winixbase.h
gallery.o: ../../../../winix/winixd/models/item.h
gallery.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h
gallery.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h
gallery.o: ../../../../morm/src/queryresult.h
gallery.o: ../../../../morm/src/flatconnector.h
gallery.o: ../../../../morm/src/dbexpression.h
gallery.o: ../../../../morm/src/baseexpression.h
gallery.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h
gallery.o: ../../../../morm/src/modeldata.h
gallery.o: ../../../../morm/src/cursorhelper.h
gallery.o: ../../../../morm/src/finderhelper.h
gallery.o: ../../../../morm/src/fieldvaluehelper.h
gallery.o: ../../../../morm/src/flatexpression.h
gallery.o: ../../../../winix/winixd/models/itemcontent.h
gallery.o: ../../../../winix/winixd/core/ugcontainer.h
gallery.o: ../../../../winix/winixd/core/request.h
gallery.o: ../../../../winix/winixd/core/error.h
@@ -59,19 +71,8 @@ gallery.o: ../../../../winix/winixd/core/winixmodel.h
gallery.o: ../../../../winix/winixd/core/plugin.h
gallery.o: ../../../../winix/winixd/core/pluginmsg.h
gallery.o: ../../../../winix/winixd/core/plugindata.h
gallery.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
gallery.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h
gallery.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h
gallery.o: ../../../../morm/src/queryresult.h
gallery.o: ../../../../morm/src/flatconnector.h
gallery.o: ../../../../morm/src/dbexpression.h
gallery.o: ../../../../morm/src/baseexpression.h
gallery.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
gallery.o: ../../../../morm/src/cursorhelper.h
gallery.o: ../../../../morm/src/finderhelper.h
gallery.o: ../../../../morm/src/fieldvaluehelper.h
gallery.o: ../../../../morm/src/flatexpression.h
gallery.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
gallery.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h
gallery.o: ../../../../morm/src/cursor.h
gallery.o: ../../../../morm/src/jsonexpression.h
gallery.o: ../../../../morm/src/postgresqlexpression.h
gallery.o: ../../../../morm/src/jsonconnector.h
@@ -106,9 +107,10 @@ gallery.o: ../../../../winix/winixd/templates/patterns.h
gallery.o: ../../../../winix/winixd/templates/locale.h
gallery.o: ../../../../winix/winixd/templates/localefilter.h
gallery.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
gallery.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
gallery.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
gallery.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
gallery.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
gallery.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
gallery.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
gallery.o: ../../../../ezc/src/pattern.h
gallery.o: ../../../../ezc/src/expressionparser.h
gallery.o: ../../../../ezc/src/patternparser.h
gallery.o: ../../../../winix/winixd/notify/notifythread.h
@@ -128,25 +130,44 @@ gallery.o: ../../../../winix/winixd/core/system.h
gallery.o: ../../../../winix/winixd/core/sessionidmanager.h
gallery.o: ../../../../tito/src/base64.h ../../../../tito/src/aes.h
gallery.o: ../../../../winix/winixd/core/slog.h galleryinfo.h
galleryinfo.o: galleryinfo.h ../../../../winix/winixd/core/item.h
galleryinfo.o: galleryinfo.h ../../../../winix/winixd/models/item.h
galleryinfo.o: ../../../../morm/src/model.h
galleryinfo.o: ../../../../pikotools/textstream/textstream.h
galleryinfo.o: ../../../../pikotools/space/space.h
galleryinfo.o: ../../../../pikotools/textstream/types.h
galleryinfo.o: ../../../../pikotools/date/date.h
galleryinfo.o: ../../../../pikotools/convert/inttostr.h
galleryinfo.o: ../../../../pikotools/membuffer/membuffer.h
galleryinfo.o: ../../../../pikotools/textstream/types.h
galleryinfo.o: ../../../../morm/src/modelconnector.h
galleryinfo.o: ../../../../morm/src/clearer.h
galleryinfo.o: ../../../../morm/src/dbconnector.h
galleryinfo.o: ../../../../pikotools/log/log.h
galleryinfo.o: ../../../../pikotools/log/filelog.h
galleryinfo.o: ../../../../morm/src/queryresult.h
galleryinfo.o: ../../../../morm/src/flatconnector.h
galleryinfo.o: ../../../../morm/src/dbexpression.h
galleryinfo.o: ../../../../morm/src/baseexpression.h
galleryinfo.o: ../../../../morm/src/morm_types.h
galleryinfo.o: ../../../../morm/src/modelenv.h
galleryinfo.o: ../../../../morm/src/modeldata.h
galleryinfo.o: ../../../../morm/src/cursorhelper.h
galleryinfo.o: ../../../../morm/src/finderhelper.h
galleryinfo.o: ../../../../morm/src/fieldvaluehelper.h
galleryinfo.o: ../../../../morm/src/flatexpression.h
galleryinfo.o: ../../../../winix/winixd/models/itemcontent.h
init.o: gallery.h ../../../../winix/winixd/functions/functionbase.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/inttostr.h
init.o: ../../../../winix/winixd/db/db.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: ../../../../winix/winixd/core/misc.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../pikotools/textstream/textstream.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/date/date.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/utf8/utf8.h
@@ -175,6 +196,18 @@ 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/winixbase.h
init.o: ../../../../winix/winixd/models/item.h ../../../../morm/src/model.h
init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
init.o: ../../../../morm/src/flatconnector.h
init.o: ../../../../morm/src/dbexpression.h
init.o: ../../../../morm/src/baseexpression.h
init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h
init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
init.o: ../../../../morm/src/finderhelper.h
init.o: ../../../../morm/src/fieldvaluehelper.h
init.o: ../../../../morm/src/flatexpression.h
init.o: ../../../../winix/winixd/models/itemcontent.h
init.o: ../../../../winix/winixd/core/ugcontainer.h
init.o: ../../../../winix/winixd/core/request.h
init.o: ../../../../winix/winixd/core/error.h
@@ -190,17 +223,7 @@ init.o: ../../../../winix/winixd/core/winixmodel.h
init.o: ../../../../winix/winixd/core/plugin.h
init.o: ../../../../winix/winixd/core/pluginmsg.h
init.o: ../../../../winix/winixd/core/plugindata.h
init.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
init.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h
init.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h
init.o: ../../../../morm/src/queryresult.h
init.o: ../../../../morm/src/flatconnector.h
init.o: ../../../../morm/src/dbexpression.h
init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
init.o: ../../../../morm/src/finderhelper.h
init.o: ../../../../morm/src/fieldvaluehelper.h
init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
init.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h
init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
init.o: ../../../../morm/src/postgresqlexpression.h
init.o: ../../../../morm/src/jsonconnector.h
@@ -235,10 +258,10 @@ init.o: ../../../../winix/winixd/templates/patterns.h
init.o: ../../../../winix/winixd/templates/locale.h
init.o: ../../../../winix/winixd/templates/localefilter.h
init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
init.o: ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
init.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/patternparser.h
init.o: ../../../../winix/winixd/notify/notifythread.h
init.o: ../../../../winix/winixd/core/basethread.h
@@ -304,20 +327,18 @@ 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
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../pikotools/date/date.h
templates.o: ../../../../pikotools/convert/inttostr.h
templates.o: ../../../../winix/winixd/db/db.h
templates.o: ../../../../winix/winixd/db/dbbase.h
templates.o: ../../../../winix/winixd/db/dbconn.h
templates.o: ../../../../winix/winixd/db/dbtextstream.h
templates.o: ../../../../winix/winixd/core/textstream.h
templates.o: ../../../../winix/winixd/core/misc.h
templates.o: ../../../../winix/winixd/core/item.h
templates.o: ../../../../winix/winixd/core/requesttypes.h
templates.o: ../../../../pikotools/textstream/textstream.h
templates.o: ../../../../pikotools/space/space.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../pikotools/date/date.h
templates.o: ../../../../pikotools/convert/inttostr.h
templates.o: ../../../../pikotools/membuffer/membuffer.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../pikotools/utf8/utf8.h
@@ -347,6 +368,22 @@ 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/models/item.h
templates.o: ../../../../morm/src/model.h
templates.o: ../../../../morm/src/modelconnector.h
templates.o: ../../../../morm/src/clearer.h
templates.o: ../../../../morm/src/dbconnector.h
templates.o: ../../../../morm/src/queryresult.h
templates.o: ../../../../morm/src/flatconnector.h
templates.o: ../../../../morm/src/dbexpression.h
templates.o: ../../../../morm/src/baseexpression.h
templates.o: ../../../../morm/src/morm_types.h
templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
templates.o: ../../../../morm/src/cursorhelper.h
templates.o: ../../../../morm/src/finderhelper.h
templates.o: ../../../../morm/src/fieldvaluehelper.h
templates.o: ../../../../morm/src/flatexpression.h
templates.o: ../../../../winix/winixd/models/itemcontent.h
templates.o: ../../../../winix/winixd/core/ugcontainer.h
templates.o: ../../../../winix/winixd/core/request.h
templates.o: ../../../../winix/winixd/core/error.h
@@ -362,21 +399,8 @@ templates.o: ../../../../winix/winixd/core/winixmodel.h
templates.o: ../../../../winix/winixd/core/plugin.h
templates.o: ../../../../winix/winixd/core/pluginmsg.h
templates.o: ../../../../winix/winixd/core/plugindata.h
templates.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
templates.o: ../../../../morm/src/model.h
templates.o: ../../../../morm/src/modelconnector.h
templates.o: ../../../../morm/src/clearer.h
templates.o: ../../../../morm/src/dbconnector.h
templates.o: ../../../../morm/src/queryresult.h
templates.o: ../../../../morm/src/flatconnector.h
templates.o: ../../../../morm/src/dbexpression.h
templates.o: ../../../../morm/src/baseexpression.h
templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
templates.o: ../../../../morm/src/cursorhelper.h
templates.o: ../../../../morm/src/finderhelper.h
templates.o: ../../../../morm/src/fieldvaluehelper.h
templates.o: ../../../../morm/src/flatexpression.h
templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
templates.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h
templates.o: ../../../../morm/src/cursor.h
templates.o: ../../../../morm/src/jsonexpression.h
templates.o: ../../../../morm/src/postgresqlexpression.h
templates.o: ../../../../morm/src/jsonconnector.h
@@ -411,9 +435,10 @@ templates.o: ../../../../winix/winixd/templates/patterns.h
templates.o: ../../../../winix/winixd/templates/locale.h
templates.o: ../../../../winix/winixd/templates/localefilter.h
templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
templates.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
templates.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
templates.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
templates.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.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
templates.o: ../../../../ezc/src/expressionparser.h
templates.o: ../../../../ezc/src/patternparser.h
templates.o: ../../../../winix/winixd/notify/notifythread.h

31
winixd/plugins/gallery/gallery.cpp
View File

@@ -80,19 +80,28 @@ void Gallery::SortPointers()
void Gallery::MakeGetDir()
{
iq.SetAll(false, false);
iq.sel_parent_id = true;
iq.sel_subject = true;
iq.sel_url = true;
iq.sel_type = true;
iq.sel_file = true;
iq.sel_sort_index = true;
iq.sel_meta = true;
// iq.SetAll(false, false);
// iq.sel_parent_id = true;
// iq.sel_subject = true;
// iq.sel_url = true;
// iq.sel_type = true;
// iq.sel_file = true;
// iq.sel_sort_index = true;
// iq.sel_meta = true;
//
// iq.WhereParentId(cur->request->dir_tab.back()->id);
// iq.WhereFileType(WINIX_ITEM_FILETYPE_IMAGE);
iq.WhereParentId(cur->request->dir_tab.back()->id);
iq.WhereFileType(WINIX_ITEM_FILETYPE_IMAGE);
morm::Finder<Item> finder(model_connector);
db->GetItems(gallery_info->item_tab, iq);
finder.
select().
where().
eq(L"parent_id", cur->request->dir_tab.back()->id).
eq(L"content.file_type", WINIX_ITEM_FILETYPE_IMAGE).
get_vector(gallery_info->item_tab);
//db->GetItems(gallery_info->item_tab, iq);
CreatePointers();
}

4
winixd/plugins/gallery/gallery.h
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -59,7 +59,7 @@ public:
private:
GalleryInfo * gallery_info;
DbItemQuery iq;
//DbItemQuery iq;
void CreatePointers();
void SortPointers();

4
winixd/plugins/gallery/galleryinfo.h
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@
#define headerfile_winix_plugins_gallery_galleryinfo
#include <vector>
#include "core/item.h"
#include "models/item.h"
namespace Winix
{

12
winixd/plugins/gallery/templates.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2016, Tomasz Sowa
* Copyright (c) 2011-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -121,7 +121,7 @@ void gallery_tab_meta_str(Info & i)
if( gallery_index < gallery_info.item_sort_tab.size() )
{
Item & item = *gallery_info.item_sort_tab[gallery_index];
item.meta.Serialize(i.out, true, false);
item.item_content.meta.Serialize(i.out, true, false);
}
}
@@ -131,7 +131,7 @@ void gallery_tab_meta(Info & i)
if( gallery_index < gallery_info.item_sort_tab.size() )
{
Item & item = *gallery_info.item_sort_tab[gallery_index];
space_value(i, item.meta);
space_value(i, item.item_content.meta);
}
}
@@ -141,7 +141,7 @@ void gallery_tab_meta_tab(Info & i)
if( gallery_index < gallery_info.item_sort_tab.size() )
{
Item & item = *gallery_info.item_sort_tab[gallery_index];
space_list_tab(i, item.meta);
space_list_tab(i, item.item_content.meta);
}
}
@@ -151,7 +151,7 @@ void gallery_tab_meta_tab_value(Info & i)
if( gallery_index < gallery_info.item_sort_tab.size() )
{
Item & item = *gallery_info.item_sort_tab[gallery_index];
space_list_tab_value(i, item.meta, L"gallery_tab_meta_tab");
space_list_tab_value(i, item.item_content.meta, L"gallery_tab_meta_tab");
}
}
@@ -161,7 +161,7 @@ void gallery_tab_meta_tab_has_next(Info & i)
if( gallery_index < gallery_info.item_sort_tab.size() )
{
Item & item = *gallery_info.item_sort_tab[gallery_index];
space_list_tab_has_next(i, item.meta, L"gallery_tab_meta_tab");
space_list_tab_has_next(i, item.item_content.meta, L"gallery_tab_meta_tab");
}
}

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

@@ -27,13 +27,12 @@ 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: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
groupinfo.o: ../../../../morm/src/model.h
groupinfo.o: ../../../../morm/src/modelconnector.h
groupinfo.o: ../../../../morm/src/clearer.h
groupinfo.o: ../../../../morm/src/dbconnector.h
groupinfo.o: ../../../../morm/src/queryresult.h
groupinfo.o: ../../../../morm/src/flatconnector.h
groupinfo.o: ../../../../morm/src/flatconnector.h ../../../../morm/src/morm.h
groupinfo.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
groupinfo.o: ../../../../morm/src/dbexpression.h
groupinfo.o: ../../../../morm/src/baseexpression.h
groupinfo.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
@@ -53,8 +52,9 @@ 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/models/item.h
groupinfo.o: ../../../../winix/winixd/models/itemcontent.h
groupinfo.o: ../../../../winix/winixd/db/db.h
groupinfo.o: ../../../../winix/winixd/db/dbbase.h
groupinfo.o: ../../../../winix/winixd/db/dbconn.h
@@ -70,7 +70,6 @@ groupinfo.o: ../../../../pikotools/convert/strtoint.h
groupinfo.o: ../../../../pikotools/convert/text.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
@@ -107,9 +106,10 @@ groupinfo.o: ../../../../winix/winixd/templates/patterns.h
groupinfo.o: ../../../../winix/winixd/templates/locale.h
groupinfo.o: ../../../../winix/winixd/templates/localefilter.h
groupinfo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
groupinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
groupinfo.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
groupinfo.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
groupinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
groupinfo.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
groupinfo.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
groupinfo.o: ../../../../ezc/src/pattern.h
groupinfo.o: ../../../../ezc/src/expressionparser.h
groupinfo.o: ../../../../ezc/src/patternparser.h
groupinfo.o: ../../../../winix/winixd/notify/notifythread.h
@@ -153,11 +153,11 @@ 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: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
groups.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h
groups.o: ../../../../morm/src/modelconnector.h
groups.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h
groups.o: ../../../../morm/src/queryresult.h
groups.o: ../../../../morm/src/flatconnector.h
groups.o: ../../../../morm/src/flatconnector.h ../../../../morm/src/morm.h
groups.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
groups.o: ../../../../morm/src/dbexpression.h
groups.o: ../../../../morm/src/baseexpression.h
groups.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
@@ -176,8 +176,9 @@ 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/item.h
groups.o: ../../../../winix/winixd/core/dircontainer.h
groups.o: ../../../../winix/winixd/models/item.h
groups.o: ../../../../winix/winixd/models/itemcontent.h
groups.o: ../../../../winix/winixd/db/db.h
groups.o: ../../../../winix/winixd/db/dbbase.h
groups.o: ../../../../winix/winixd/db/dbconn.h
@@ -193,7 +194,6 @@ groups.o: ../../../../pikotools/convert/strtoint.h
groups.o: ../../../../pikotools/convert/text.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
@@ -230,9 +230,10 @@ 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/blocks.h ../../../../ezc/src/item.h
groups.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
groups.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
groups.o: ../../../../ezc/src/pattern.h
groups.o: ../../../../ezc/src/expressionparser.h
groups.o: ../../../../ezc/src/patternparser.h
groups.o: ../../../../winix/winixd/notify/notifythread.h
@@ -253,7 +254,18 @@ init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/plugin.h
init.o: ../../../../winix/winixd/core/pluginmsg.h
init.o: ../../../../winix/winixd/core/plugindata.h
init.o: ../../../../winix/winixd/core/winixbase.h groupinfo.h groups.h
init.o: ../../../../winix/winixd/core/winixbase.h
init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
init.o: ../../../../pikotools/date/date.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../morm/src/dbconnector.h
init.o: ../../../../pikotools/textstream/textstream.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/log/log.h ../../../../pikotools/log/filelog.h
init.o: ../../../../morm/src/queryresult.h
init.o: ../../../../morm/src/flatconnector.h groupinfo.h groups.h
init.o: ../../../../pikotools/space/spaceparser.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../pikotools/textstream/types.h
@@ -264,22 +276,12 @@ 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/logmanipulators.h
init.o: ../../../../pikotools/log/log.h
init.o: ../../../../pikotools/textstream/textstream.h
init.o: ../../../../pikotools/space/space.h ../../../../pikotools/date/date.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/log/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 ../../../../morm/src/morm.h
init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
init.o: ../../../../morm/src/flatconnector.h
init.o: ../../../../morm/src/dbexpression.h
init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
@@ -297,8 +299,9 @@ 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/models/item.h
init.o: ../../../../winix/winixd/models/itemcontent.h
init.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h
init.o: ../../../../winix/winixd/db/dbconn.h
init.o: ../../../../winix/winixd/db/dbtextstream.h
@@ -313,7 +316,6 @@ init.o: ../../../../pikotools/convert/strtoint.h
init.o: ../../../../pikotools/convert/text.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
@@ -350,10 +352,10 @@ init.o: ../../../../winix/winixd/templates/patterns.h
init.o: ../../../../winix/winixd/templates/locale.h
init.o: ../../../../winix/winixd/templates/localefilter.h
init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
init.o: ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
init.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/patternparser.h
init.o: ../../../../winix/winixd/notify/notifythread.h
init.o: ../../../../winix/winixd/core/basethread.h
@@ -417,14 +419,13 @@ 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
templates.o: ../../../../pikotools/space/space.h
templates.o: ../../../../pikotools/date/date.h
templates.o: ../../../../pikotools/convert/inttostr.h
templates.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
templates.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
templates.o: ../../../../pikotools/utf8/utf8.h
templates.o: ../../../../pikotools/textstream/textstream.h
templates.o: ../../../../pikotools/space/space.h
templates.o: ../../../../pikotools/date/date.h
templates.o: ../../../../pikotools/convert/inttostr.h
templates.o: ../../../../pikotools/membuffer/membuffer.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
@@ -442,7 +443,6 @@ templates.o: ../../../../pikotools/convert/patternreplacer.h
templates.o: ../../../../pikotools/convert/strtoint.h
templates.o: ../../../../pikotools/convert/text.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
@@ -455,6 +455,22 @@ templates.o: ../../../../winix/winixd/core/synchro.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/models/item.h
templates.o: ../../../../morm/src/model.h
templates.o: ../../../../morm/src/modelconnector.h
templates.o: ../../../../morm/src/clearer.h
templates.o: ../../../../morm/src/dbconnector.h
templates.o: ../../../../morm/src/queryresult.h
templates.o: ../../../../morm/src/flatconnector.h
templates.o: ../../../../morm/src/dbexpression.h
templates.o: ../../../../morm/src/baseexpression.h
templates.o: ../../../../morm/src/morm_types.h
templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
templates.o: ../../../../morm/src/cursorhelper.h
templates.o: ../../../../morm/src/finderhelper.h
templates.o: ../../../../morm/src/fieldvaluehelper.h
templates.o: ../../../../morm/src/flatexpression.h
templates.o: ../../../../winix/winixd/models/itemcontent.h
templates.o: ../../../../winix/winixd/templates/indexpatterns.h
templates.o: ../../../../winix/winixd/templates/patterns.h
templates.o: ../../../../winix/winixd/templates/locale.h
@@ -506,21 +522,8 @@ templates.o: ../../../../winix/winixd/core/winixsystem.h
templates.o: ../../../../winix/winixd/core/winixmodel.h
templates.o: ../../../../winix/winixd/core/plugin.h
templates.o: ../../../../winix/winixd/core/pluginmsg.h
templates.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
templates.o: ../../../../morm/src/model.h
templates.o: ../../../../morm/src/modelconnector.h
templates.o: ../../../../morm/src/clearer.h
templates.o: ../../../../morm/src/dbconnector.h
templates.o: ../../../../morm/src/queryresult.h
templates.o: ../../../../morm/src/flatconnector.h
templates.o: ../../../../morm/src/dbexpression.h
templates.o: ../../../../morm/src/baseexpression.h
templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
templates.o: ../../../../morm/src/cursorhelper.h
templates.o: ../../../../morm/src/finderhelper.h
templates.o: ../../../../morm/src/fieldvaluehelper.h
templates.o: ../../../../morm/src/flatexpression.h
templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
templates.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h
templates.o: ../../../../morm/src/cursor.h
templates.o: ../../../../morm/src/jsonexpression.h
templates.o: ../../../../morm/src/postgresqlexpression.h
templates.o: ../../../../morm/src/jsonconnector.h

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

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -173,7 +173,7 @@ void GroupInfo::ReadGroupsConf(Mounts & mounts, bool skip_existing_configs)
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) )
if( !ParseGroups(config_file.item_content.content_raw, groups_wrap[mount.dir_id].groups) )
groups_wrap[mount.dir_id].to_delete = true;
}
else

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

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -39,10 +39,10 @@
#include <vector>
#include "groups.h"
#include "space/spaceparser.h"
#include "core/item.h"
#include "core/system.h"
#include "core/config.h"
#include "core/winixrequest.h"
#include "models/item.h"
namespace Winix

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

@@ -2,20 +2,18 @@
funregistermail_showusers.o: funregistermail_showusers.h
funregistermail_showusers.o: ../../../../winix/winixd/functions/functionbase.h
funregistermail_showusers.o: ../../../../winix/winixd/core/item.h
funregistermail_showusers.o: ../../../../pikotools/space/space.h
funregistermail_showusers.o: ../../../../pikotools/textstream/types.h
funregistermail_showusers.o: ../../../../pikotools/date/date.h
funregistermail_showusers.o: ../../../../pikotools/convert/inttostr.h
funregistermail_showusers.o: ../../../../winix/winixd/db/db.h
funregistermail_showusers.o: ../../../../winix/winixd/db/dbbase.h
funregistermail_showusers.o: ../../../../winix/winixd/db/dbconn.h
funregistermail_showusers.o: ../../../../winix/winixd/db/dbtextstream.h
funregistermail_showusers.o: ../../../../winix/winixd/core/textstream.h
funregistermail_showusers.o: ../../../../winix/winixd/core/misc.h
funregistermail_showusers.o: ../../../../winix/winixd/core/item.h
funregistermail_showusers.o: ../../../../winix/winixd/core/requesttypes.h
funregistermail_showusers.o: ../../../../pikotools/textstream/textstream.h
funregistermail_showusers.o: ../../../../pikotools/space/space.h
funregistermail_showusers.o: ../../../../pikotools/textstream/types.h
funregistermail_showusers.o: ../../../../pikotools/date/date.h
funregistermail_showusers.o: ../../../../pikotools/convert/inttostr.h
funregistermail_showusers.o: ../../../../pikotools/membuffer/membuffer.h
funregistermail_showusers.o: ../../../../pikotools/textstream/types.h
funregistermail_showusers.o: ../../../../pikotools/utf8/utf8.h
@@ -45,6 +43,23 @@ funregistermail_showusers.o: ../../../../winix/winixd/core/user.h
funregistermail_showusers.o: ../../../../winix/winixd/core/group.h
funregistermail_showusers.o: ../../../../winix/winixd/core/dircontainer.h
funregistermail_showusers.o: ../../../../winix/winixd/core/winixbase.h
funregistermail_showusers.o: ../../../../winix/winixd/models/item.h
funregistermail_showusers.o: ../../../../morm/src/model.h
funregistermail_showusers.o: ../../../../morm/src/modelconnector.h
funregistermail_showusers.o: ../../../../morm/src/clearer.h
funregistermail_showusers.o: ../../../../morm/src/dbconnector.h
funregistermail_showusers.o: ../../../../morm/src/queryresult.h
funregistermail_showusers.o: ../../../../morm/src/flatconnector.h
funregistermail_showusers.o: ../../../../morm/src/dbexpression.h
funregistermail_showusers.o: ../../../../morm/src/baseexpression.h
funregistermail_showusers.o: ../../../../morm/src/morm_types.h
funregistermail_showusers.o: ../../../../morm/src/modelenv.h
funregistermail_showusers.o: ../../../../morm/src/modeldata.h
funregistermail_showusers.o: ../../../../morm/src/cursorhelper.h
funregistermail_showusers.o: ../../../../morm/src/finderhelper.h
funregistermail_showusers.o: ../../../../morm/src/fieldvaluehelper.h
funregistermail_showusers.o: ../../../../morm/src/flatexpression.h
funregistermail_showusers.o: ../../../../winix/winixd/models/itemcontent.h
funregistermail_showusers.o: ../../../../winix/winixd/core/ugcontainer.h
funregistermail_showusers.o: ../../../../winix/winixd/core/request.h
funregistermail_showusers.o: ../../../../winix/winixd/core/error.h
@@ -61,21 +76,6 @@ funregistermail_showusers.o: ../../../../winix/winixd/core/plugin.h
funregistermail_showusers.o: ../../../../winix/winixd/core/pluginmsg.h
funregistermail_showusers.o: ../../../../winix/winixd/core/plugindata.h
funregistermail_showusers.o: ../../../../morm/src/morm.h
funregistermail_showusers.o: ../../../../morm/src/morm_types.h
funregistermail_showusers.o: ../../../../morm/src/model.h
funregistermail_showusers.o: ../../../../morm/src/modelconnector.h
funregistermail_showusers.o: ../../../../morm/src/clearer.h
funregistermail_showusers.o: ../../../../morm/src/dbconnector.h
funregistermail_showusers.o: ../../../../morm/src/queryresult.h
funregistermail_showusers.o: ../../../../morm/src/flatconnector.h
funregistermail_showusers.o: ../../../../morm/src/dbexpression.h
funregistermail_showusers.o: ../../../../morm/src/baseexpression.h
funregistermail_showusers.o: ../../../../morm/src/modelenv.h
funregistermail_showusers.o: ../../../../morm/src/modeldata.h
funregistermail_showusers.o: ../../../../morm/src/cursorhelper.h
funregistermail_showusers.o: ../../../../morm/src/finderhelper.h
funregistermail_showusers.o: ../../../../morm/src/fieldvaluehelper.h
funregistermail_showusers.o: ../../../../morm/src/flatexpression.h
funregistermail_showusers.o: ../../../../morm/src/finder.h
funregistermail_showusers.o: ../../../../morm/src/cursor.h
funregistermail_showusers.o: ../../../../morm/src/jsonexpression.h
@@ -114,6 +114,7 @@ funregistermail_showusers.o: ../../../../winix/winixd/templates/localefilter.h
funregistermail_showusers.o: ../../../../ezc/src/ezc.h
funregistermail_showusers.o: ../../../../ezc/src/generator.h
funregistermail_showusers.o: ../../../../ezc/src/blocks.h
funregistermail_showusers.o: ../../../../ezc/src/item.h
funregistermail_showusers.o: ../../../../ezc/src/cache.h
funregistermail_showusers.o: ../../../../ezc/src/functions.h
funregistermail_showusers.o: ../../../../ezc/src/funinfo.h
@@ -144,20 +145,18 @@ funregistermail_showusers.o: ../../../../winix/winixd/db/dbbase.h
funregistermail_showusers.o: ../../../../winix/winixd/core/dirs.h
funregistermail.o: funregistermail.h
funregistermail.o: ../../../../winix/winixd/functions/functionbase.h
funregistermail.o: ../../../../winix/winixd/core/item.h
funregistermail.o: ../../../../pikotools/space/space.h
funregistermail.o: ../../../../pikotools/textstream/types.h
funregistermail.o: ../../../../pikotools/date/date.h
funregistermail.o: ../../../../pikotools/convert/inttostr.h
funregistermail.o: ../../../../winix/winixd/db/db.h
funregistermail.o: ../../../../winix/winixd/db/dbbase.h
funregistermail.o: ../../../../winix/winixd/db/dbconn.h
funregistermail.o: ../../../../winix/winixd/db/dbtextstream.h
funregistermail.o: ../../../../winix/winixd/core/textstream.h
funregistermail.o: ../../../../winix/winixd/core/misc.h
funregistermail.o: ../../../../winix/winixd/core/item.h
funregistermail.o: ../../../../winix/winixd/core/requesttypes.h
funregistermail.o: ../../../../pikotools/textstream/textstream.h
funregistermail.o: ../../../../pikotools/space/space.h
funregistermail.o: ../../../../pikotools/textstream/types.h
funregistermail.o: ../../../../pikotools/date/date.h
funregistermail.o: ../../../../pikotools/convert/inttostr.h
funregistermail.o: ../../../../pikotools/membuffer/membuffer.h
funregistermail.o: ../../../../pikotools/textstream/types.h
funregistermail.o: ../../../../pikotools/utf8/utf8.h
@@ -187,6 +186,23 @@ funregistermail.o: ../../../../winix/winixd/core/user.h
funregistermail.o: ../../../../winix/winixd/core/group.h
funregistermail.o: ../../../../winix/winixd/core/dircontainer.h
funregistermail.o: ../../../../winix/winixd/core/winixbase.h
funregistermail.o: ../../../../winix/winixd/models/item.h
funregistermail.o: ../../../../morm/src/model.h
funregistermail.o: ../../../../morm/src/modelconnector.h
funregistermail.o: ../../../../morm/src/clearer.h
funregistermail.o: ../../../../morm/src/dbconnector.h
funregistermail.o: ../../../../morm/src/queryresult.h
funregistermail.o: ../../../../morm/src/flatconnector.h
funregistermail.o: ../../../../morm/src/dbexpression.h
funregistermail.o: ../../../../morm/src/baseexpression.h
funregistermail.o: ../../../../morm/src/morm_types.h
funregistermail.o: ../../../../morm/src/modelenv.h
funregistermail.o: ../../../../morm/src/modeldata.h
funregistermail.o: ../../../../morm/src/cursorhelper.h
funregistermail.o: ../../../../morm/src/finderhelper.h
funregistermail.o: ../../../../morm/src/fieldvaluehelper.h
funregistermail.o: ../../../../morm/src/flatexpression.h
funregistermail.o: ../../../../winix/winixd/models/itemcontent.h
funregistermail.o: ../../../../winix/winixd/core/ugcontainer.h
funregistermail.o: ../../../../winix/winixd/core/request.h
funregistermail.o: ../../../../winix/winixd/core/error.h
@@ -202,23 +218,7 @@ funregistermail.o: ../../../../winix/winixd/core/winixmodel.h
funregistermail.o: ../../../../winix/winixd/core/plugin.h
funregistermail.o: ../../../../winix/winixd/core/pluginmsg.h
funregistermail.o: ../../../../winix/winixd/core/plugindata.h
funregistermail.o: ../../../../morm/src/morm.h
funregistermail.o: ../../../../morm/src/morm_types.h
funregistermail.o: ../../../../morm/src/model.h
funregistermail.o: ../../../../morm/src/modelconnector.h
funregistermail.o: ../../../../morm/src/clearer.h
funregistermail.o: ../../../../morm/src/dbconnector.h
funregistermail.o: ../../../../morm/src/queryresult.h
funregistermail.o: ../../../../morm/src/flatconnector.h
funregistermail.o: ../../../../morm/src/dbexpression.h
funregistermail.o: ../../../../morm/src/baseexpression.h
funregistermail.o: ../../../../morm/src/modelenv.h
funregistermail.o: ../../../../morm/src/modeldata.h
funregistermail.o: ../../../../morm/src/cursorhelper.h
funregistermail.o: ../../../../morm/src/finderhelper.h
funregistermail.o: ../../../../morm/src/fieldvaluehelper.h
funregistermail.o: ../../../../morm/src/flatexpression.h
funregistermail.o: ../../../../morm/src/finder.h
funregistermail.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h
funregistermail.o: ../../../../morm/src/cursor.h
funregistermail.o: ../../../../morm/src/jsonexpression.h
funregistermail.o: ../../../../morm/src/postgresqlexpression.h
@@ -254,7 +254,8 @@ funregistermail.o: ../../../../winix/winixd/templates/patterns.h
funregistermail.o: ../../../../winix/winixd/templates/locale.h
funregistermail.o: ../../../../winix/winixd/templates/localefilter.h
funregistermail.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
funregistermail.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
funregistermail.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
funregistermail.o: ../../../../ezc/src/cache.h
funregistermail.o: ../../../../ezc/src/functions.h
funregistermail.o: ../../../../ezc/src/funinfo.h
funregistermail.o: ../../../../ezc/src/objects.h
@@ -284,25 +285,28 @@ init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/plugin.h
init.o: ../../../../winix/winixd/core/pluginmsg.h
init.o: ../../../../winix/winixd/core/plugindata.h
init.o: ../../../../winix/winixd/core/winixbase.h mdb.h
init.o: ../../../../winix/winixd/core/winixbase.h
init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
init.o: ../../../../pikotools/date/date.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../morm/src/dbconnector.h
init.o: ../../../../pikotools/textstream/textstream.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/log/log.h ../../../../pikotools/log/filelog.h
init.o: ../../../../morm/src/queryresult.h
init.o: ../../../../morm/src/flatconnector.h mdb.h
init.o: ../../../../winix/winixd/db/dbbase.h
init.o: ../../../../winix/winixd/core/dirs.h funregistermail.h
init.o: ../../../../winix/winixd/functions/functionbase.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/inttostr.h
init.o: ../../../../winix/winixd/db/db.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: ../../../../winix/winixd/core/misc.h
init.o: ../../../../winix/winixd/core/item.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: ../../../../pikotools/convert/convert.h
@@ -316,7 +320,6 @@ init.o: ../../../../pikotools/space/spaceparser.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/logmanipulators.h
init.o: ../../../../pikotools/log/log.h ../../../../pikotools/log/filelog.h
init.o: ../../../../winix/winixd/core/synchro.h
init.o: ../../../../winix/winixd/core/filelog.h
init.o: ../../../../winix/winixd/core/lock.h
@@ -327,6 +330,15 @@ 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/models/item.h ../../../../morm/src/model.h
init.o: ../../../../morm/src/dbexpression.h
init.o: ../../../../morm/src/baseexpression.h
init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h
init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
init.o: ../../../../morm/src/finderhelper.h
init.o: ../../../../morm/src/fieldvaluehelper.h
init.o: ../../../../morm/src/flatexpression.h
init.o: ../../../../winix/winixd/models/itemcontent.h
init.o: ../../../../winix/winixd/core/ugcontainer.h
init.o: ../../../../winix/winixd/core/request.h
init.o: ../../../../winix/winixd/core/error.h
@@ -340,17 +352,8 @@ 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 ../../../../morm/src/morm.h
init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
init.o: ../../../../morm/src/flatconnector.h
init.o: ../../../../morm/src/dbexpression.h
init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
init.o: ../../../../morm/src/finderhelper.h
init.o: ../../../../morm/src/fieldvaluehelper.h
init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
init.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
init.o: ../../../../morm/src/jsonexpression.h
init.o: ../../../../morm/src/postgresqlexpression.h
init.o: ../../../../morm/src/jsonconnector.h
init.o: ../../../../morm/src/postgresqlconnector.h
@@ -384,10 +387,10 @@ init.o: ../../../../winix/winixd/templates/patterns.h
init.o: ../../../../winix/winixd/templates/locale.h
init.o: ../../../../winix/winixd/templates/localefilter.h
init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
init.o: ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
init.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/patternparser.h
init.o: ../../../../winix/winixd/notify/notifythread.h
init.o: ../../../../winix/winixd/core/basethread.h
@@ -458,9 +461,8 @@ mdb.o: ../../../../winix/winixd/core/log.h
registermail_info.o: registermail_info.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: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
templates.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
templates.o: ../../../../pikotools/utf8/utf8.h
templates.o: ../../../../pikotools/textstream/textstream.h
templates.o: ../../../../pikotools/space/space.h
@@ -484,7 +486,6 @@ templates.o: ../../../../pikotools/convert/patternreplacer.h
templates.o: ../../../../pikotools/convert/strtoint.h
templates.o: ../../../../pikotools/convert/text.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
@@ -496,6 +497,22 @@ templates.o: ../../../../winix/winixd/core/synchro.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/models/item.h
templates.o: ../../../../morm/src/model.h
templates.o: ../../../../morm/src/modelconnector.h
templates.o: ../../../../morm/src/clearer.h
templates.o: ../../../../morm/src/dbconnector.h
templates.o: ../../../../morm/src/queryresult.h
templates.o: ../../../../morm/src/flatconnector.h
templates.o: ../../../../morm/src/dbexpression.h
templates.o: ../../../../morm/src/baseexpression.h
templates.o: ../../../../morm/src/morm_types.h
templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
templates.o: ../../../../morm/src/cursorhelper.h
templates.o: ../../../../morm/src/finderhelper.h
templates.o: ../../../../morm/src/fieldvaluehelper.h
templates.o: ../../../../morm/src/flatexpression.h
templates.o: ../../../../winix/winixd/models/itemcontent.h
templates.o: ../../../../winix/winixd/templates/indexpatterns.h
templates.o: ../../../../winix/winixd/templates/patterns.h
templates.o: ../../../../winix/winixd/templates/locale.h
@@ -512,21 +529,8 @@ templates.o: ../../../../winix/winixd/core/plugin.h
templates.o: ../../../../winix/winixd/core/pluginmsg.h
templates.o: ../../../../winix/winixd/core/plugindata.h
templates.o: ../../../../winix/winixd/core/winixbase.h
templates.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
templates.o: ../../../../morm/src/model.h
templates.o: ../../../../morm/src/modelconnector.h
templates.o: ../../../../morm/src/clearer.h
templates.o: ../../../../morm/src/dbconnector.h
templates.o: ../../../../morm/src/queryresult.h
templates.o: ../../../../morm/src/flatconnector.h
templates.o: ../../../../morm/src/dbexpression.h
templates.o: ../../../../morm/src/baseexpression.h
templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
templates.o: ../../../../morm/src/cursorhelper.h
templates.o: ../../../../morm/src/finderhelper.h
templates.o: ../../../../morm/src/fieldvaluehelper.h
templates.o: ../../../../morm/src/flatexpression.h
templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
templates.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h
templates.o: ../../../../morm/src/cursor.h
templates.o: ../../../../morm/src/jsonexpression.h
templates.o: ../../../../morm/src/postgresqlexpression.h
templates.o: ../../../../morm/src/jsonconnector.h

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

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2016-2018, Tomasz Sowa
* Copyright (c) 2016-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -77,7 +77,7 @@ void ReloadConfigFile(PluginInfo & info, Item & file)
PT::SpaceParser parser;
parser.SetSpace(space);
PT::SpaceParser::Status status = parser.ParseString(file.content);
PT::SpaceParser::Status status = parser.ParseString(file.item_content.content_raw);
if( status == PT::SpaceParser::syntax_error )
{
@@ -118,13 +118,23 @@ void ConfigReload(PluginInfo & info)
if( dir )
{
DbItemQuery iq;
// DbItemQuery iq;
std::vector<Item> items;
//
// iq.SetAll(true, false);
// iq.WhereParentId(dir->id);
iq.SetAll(true, false);
iq.WhereParentId(dir->id);
// CHECKME is it correct to get connector from the last item?
morm::ModelConnector * model_connector = info.cur->request->last_item->get_connector();
morm::Finder<Item> finder(model_connector);
info.db->GetItems(items, iq);
finder.
select().
where().
eq(L"parent_id", dir->id).
get_vector(items);
//info.db->GetItems(items, iq);
for(Item & item : items)
{

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

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2016, Tomasz Sowa
* Copyright (c) 2016-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -34,12 +34,12 @@
#include "templates/templates.h"
#include "core/plugin.h"
#include "core/item.h"
#include "core/log.h"
#include "core/misc.h"
#include "cache.h"
#include "templates/miscspace.h"
#include "registermail_info.h"
#include "models/item.h"
namespace Winix

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

@@ -1,21 +1,19 @@
# DO NOT DELETE
cache.o: cache.h ../../../../winix/winixd/core/item.h
cache.o: ../../../../pikotools/space/space.h
cache.o: ../../../../pikotools/textstream/types.h
cache.o: ../../../../pikotools/date/date.h
cache.o: ../../../../pikotools/convert/inttostr.h
cache.o: ../../../../winix/winixd/core/dirs.h
cache.o: ../../../../winix/winixd/core/item.h
cache.o: cache.h ../../../../winix/winixd/core/dirs.h
cache.o: ../../../../winix/winixd/core/dircontainer.h
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: ../../../../pikotools/textstream/types.h
cache.o: ../../../../winix/winixd/core/log.h
cache.o: ../../../../winix/winixd/core/logmanipulators.h
cache.o: ../../../../pikotools/log/log.h
cache.o: ../../../../pikotools/textstream/textstream.h
cache.o: ../../../../pikotools/space/space.h
cache.o: ../../../../pikotools/date/date.h
cache.o: ../../../../pikotools/convert/inttostr.h
cache.o: ../../../../pikotools/membuffer/membuffer.h
cache.o: ../../../../pikotools/textstream/types.h
cache.o: ../../../../pikotools/log/filelog.h
@@ -24,6 +22,19 @@ cache.o: ../../../../winix/winixd/core/synchro.h
cache.o: ../../../../winix/winixd/core/filelog.h
cache.o: ../../../../winix/winixd/core/lock.h
cache.o: ../../../../winix/winixd/core/synchro.h
cache.o: ../../../../winix/winixd/models/item.h ../../../../morm/src/model.h
cache.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
cache.o: ../../../../morm/src/dbconnector.h
cache.o: ../../../../morm/src/queryresult.h
cache.o: ../../../../morm/src/flatconnector.h
cache.o: ../../../../morm/src/dbexpression.h
cache.o: ../../../../morm/src/baseexpression.h
cache.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h
cache.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
cache.o: ../../../../morm/src/finderhelper.h
cache.o: ../../../../morm/src/fieldvaluehelper.h
cache.o: ../../../../morm/src/flatexpression.h
cache.o: ../../../../winix/winixd/models/itemcontent.h
cache.o: ../../../../winix/winixd/db/db.h
cache.o: ../../../../winix/winixd/db/dbbase.h
cache.o: ../../../../winix/winixd/db/dbconn.h
@@ -57,18 +68,7 @@ cache.o: ../../../../winix/winixd/core/winixmodel.h
cache.o: ../../../../winix/winixd/core/plugin.h
cache.o: ../../../../winix/winixd/core/pluginmsg.h
cache.o: ../../../../winix/winixd/core/plugindata.h
cache.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
cache.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h
cache.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h
cache.o: ../../../../morm/src/queryresult.h
cache.o: ../../../../morm/src/flatconnector.h
cache.o: ../../../../morm/src/dbexpression.h
cache.o: ../../../../morm/src/baseexpression.h
cache.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
cache.o: ../../../../morm/src/cursorhelper.h
cache.o: ../../../../morm/src/finderhelper.h
cache.o: ../../../../morm/src/fieldvaluehelper.h
cache.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
cache.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h
cache.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
cache.o: ../../../../morm/src/postgresqlexpression.h
cache.o: ../../../../morm/src/jsonconnector.h
@@ -83,13 +83,12 @@ 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: ../../../../pikotools/textstream/types.h
init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/logmanipulators.h
init.o: ../../../../pikotools/log/log.h
init.o: ../../../../pikotools/textstream/textstream.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/date/date.h
init.o: ../../../../pikotools/space/space.h ../../../../pikotools/date/date.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
@@ -97,11 +96,21 @@ init.o: ../../../../pikotools/log/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 cache.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/synchro.h
init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
init.o: ../../../../morm/src/flatconnector.h cache.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/models/item.h ../../../../morm/src/model.h
init.o: ../../../../morm/src/dbexpression.h
init.o: ../../../../morm/src/baseexpression.h
init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h
init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
init.o: ../../../../morm/src/finderhelper.h
init.o: ../../../../morm/src/fieldvaluehelper.h
init.o: ../../../../morm/src/flatexpression.h
init.o: ../../../../winix/winixd/models/itemcontent.h
init.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h
init.o: ../../../../winix/winixd/db/dbconn.h
init.o: ../../../../winix/winixd/db/dbtextstream.h
@@ -132,26 +141,18 @@ 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 ../../../../morm/src/morm.h
init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
init.o: ../../../../morm/src/flatconnector.h
init.o: ../../../../morm/src/dbexpression.h
init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
init.o: ../../../../morm/src/finderhelper.h
init.o: ../../../../morm/src/fieldvaluehelper.h
init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
init.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
init.o: ../../../../morm/src/jsonexpression.h
init.o: ../../../../morm/src/postgresqlexpression.h
init.o: ../../../../morm/src/jsonconnector.h
init.o: ../../../../morm/src/postgresqlconnector.h
init.o: ../../../../morm/src/postgresqlqueryresult.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/blocks.h ../../../../ezc/src/item.h
init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/functions.h
init.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
init.o: ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/patternparser.h
init.o: ../../../../winix/winixd/templates/patterncacher.h
init.o: ../../../../winix/winixd/templates/indexpatterns.h
@@ -252,23 +253,21 @@ 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
templates.o: ../../../../winix/winixd/core/item.h cache.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/inttostr.h
templates.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h cache.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/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/logmanipulators.h
templates.o: ../../../../pikotools/log/log.h
templates.o: ../../../../pikotools/textstream/textstream.h
templates.o: ../../../../pikotools/space/space.h
templates.o: ../../../../pikotools/date/date.h
templates.o: ../../../../pikotools/convert/inttostr.h
templates.o: ../../../../pikotools/membuffer/membuffer.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../pikotools/log/filelog.h
@@ -277,6 +276,22 @@ templates.o: ../../../../winix/winixd/core/synchro.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/models/item.h
templates.o: ../../../../morm/src/model.h
templates.o: ../../../../morm/src/modelconnector.h
templates.o: ../../../../morm/src/clearer.h
templates.o: ../../../../morm/src/dbconnector.h
templates.o: ../../../../morm/src/queryresult.h
templates.o: ../../../../morm/src/flatconnector.h
templates.o: ../../../../morm/src/dbexpression.h
templates.o: ../../../../morm/src/baseexpression.h
templates.o: ../../../../morm/src/morm_types.h
templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
templates.o: ../../../../morm/src/cursorhelper.h
templates.o: ../../../../morm/src/finderhelper.h
templates.o: ../../../../morm/src/fieldvaluehelper.h
templates.o: ../../../../morm/src/flatexpression.h
templates.o: ../../../../winix/winixd/models/itemcontent.h
templates.o: ../../../../winix/winixd/db/db.h
templates.o: ../../../../winix/winixd/db/dbbase.h
templates.o: ../../../../winix/winixd/db/dbconn.h
@@ -310,21 +325,8 @@ templates.o: ../../../../winix/winixd/core/winixmodel.h
templates.o: ../../../../winix/winixd/core/plugin.h
templates.o: ../../../../winix/winixd/core/pluginmsg.h
templates.o: ../../../../winix/winixd/core/plugindata.h
templates.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
templates.o: ../../../../morm/src/model.h
templates.o: ../../../../morm/src/modelconnector.h
templates.o: ../../../../morm/src/clearer.h
templates.o: ../../../../morm/src/dbconnector.h
templates.o: ../../../../morm/src/queryresult.h
templates.o: ../../../../morm/src/flatconnector.h
templates.o: ../../../../morm/src/dbexpression.h
templates.o: ../../../../morm/src/baseexpression.h
templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
templates.o: ../../../../morm/src/cursorhelper.h
templates.o: ../../../../morm/src/finderhelper.h
templates.o: ../../../../morm/src/fieldvaluehelper.h
templates.o: ../../../../morm/src/flatexpression.h
templates.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
templates.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h
templates.o: ../../../../morm/src/cursor.h
templates.o: ../../../../morm/src/jsonexpression.h
templates.o: ../../../../morm/src/postgresqlexpression.h
templates.o: ../../../../morm/src/jsonconnector.h

5
winixd/plugins/menu/cache.h
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2012-2014, Tomasz Sowa
* Copyright (c) 2012-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -38,8 +38,9 @@
#include <string>
#include <vector>
#include <list>
#include "core/item.h"
#include "core/dirs.h"
#include "models/item.h"
namespace Winix
{

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

@@ -151,15 +151,15 @@ using namespace Menu;
// (not implemented yet)
info.plugin->Assign(WINIX_FILE_REMOVED, InvalidateCacheByPointerParent);
info.plugin->Assign(WINIX_DIR_ADDED, InvalidateCacheByPointerParent);
info.plugin->Assign(WINIX_DIR_PREPARE_TO_REMOVE, InvalidateCacheByPointerParent);
info.plugin->Assign(WINIX_DIR_ADDED, InvalidateCacheByPointerParent);
info.plugin->Assign(WINIX_DIR_PREPARE_TO_REMOVE, InvalidateCacheByPointerParent);
info.plugin->Assign(WINIX_DIR_REMOVED, InvalidateCacheById);
info.plugin->Assign(WINIX_FILE_ADDED, InvalidateCacheByPointerParent);
info.plugin->Assign(WINIX_FILE_ADDED, InvalidateCacheByPointerParent);
info.plugin->Assign(WINIX_FILE_CHANGED, InvalidateCacheByPointerParent);
info.plugin->Assign(WINIX_FILE_COPIED, InvalidateCacheByPointerParent);
info.plugin->Assign(WINIX_FILE_PREPARE_TO_MOVE, InvalidateCacheByPointerParent);
info.plugin->Assign(WINIX_FILE_MOVED, InvalidateCacheByPointerParent);
info.plugin->Assign(WINIX_DIR_CONTENT_SORTED, InvalidateCacheByPointer);
info.plugin->Assign(WINIX_FILE_MOVED, InvalidateCacheByPointerParent);
info.plugin->Assign(WINIX_DIR_CONTENT_SORTED, InvalidateCacheByPointer);
info.plugin->Assign(WINIX_PROCESS_REQUEST, ProcessRequest);
// !! IMPROVE ME

59
winixd/plugins/menu/templates.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2016, Tomasz Sowa
* Copyright (c) 2011-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -34,11 +34,12 @@
#include "templates/templates.h"
#include "core/plugin.h"
#include "core/item.h"
#include "core/log.h"
#include "core/misc.h"
#include "cache.h"
#include "templates/miscspace.h"
#include "models/item.h"
namespace Winix
{
@@ -61,11 +62,12 @@ extern int mount_par_menu_skip;
extern Cache cache;
static Ezc::Stack * stack = &empty_stack;
static DbItemQuery iq;
//static DbItemQuery iq;
static std::vector<Item> item_tab;
static MenuItem menu_item;
struct StackItem : public Ezc::FunData
{
CacheItem * citem;
@@ -99,36 +101,53 @@ return WINIX_PL_MENU_PARAM_NONE;
}
void read_from_db(long dir_id, int param, bool with_meta)
{
iq.SetAll(false, false);
iq.sel_subject = true;
iq.sel_url = true;
iq.sel_sort_index = true;
iq.sort_date_asc = false; // !! FIXED ME we need an option for this
iq.sel_type = true;
iq.sel_file = true;
iq.sel_meta = with_meta;
iq.WhereParentId(dir_id);
// iq.SetAll(false, false);
// iq.sel_subject = true;
// iq.sel_url = true;
// iq.sel_sort_index = true;
// iq.sort_date_asc = false; // !! FIXED ME we need an option for this
// iq.sel_type = true;
// iq.sel_file = true;
// iq.sel_meta = with_meta;
// iq.WhereParentId(dir_id);
// CHECKME is it correct to get the connector from last item?
morm::ModelConnector * model_connector = cur->request->last_item->get_connector();
morm::Finder<Item> finder(model_connector);
finder.
select().
where().
eq(L"parent_id", dir_id);
if( param == WINIX_PL_MENU_PARAM_IMAGES )
{
iq.WhereType(Item::file);
iq.WhereFileType(WINIX_ITEM_FILETYPE_IMAGE);
// iq.WhereType(Item::file);
// iq.WhereFileType(WINIX_ITEM_FILETYPE_IMAGE);
finder.
eq(L"type", static_cast<int>(Item::file)).
eq(L"content.file_type", WINIX_ITEM_FILETYPE_IMAGE);
}
else
if( param == WINIX_PL_MENU_PARAM_DIRS )
{
iq.WhereType(Item::dir);
//iq.WhereType(Item::dir);
finder.eq(L"type", static_cast<int>(Item::dir));
}
else
if( param == WINIX_PL_MENU_PARAM_FILES )
{
iq.WhereType(Item::file);
//iq.WhereType(Item::file);
finder.eq(L"type", static_cast<int>(Item::file));
}
db->GetItems(item_tab, iq);
finder.get_vector(item_tab);
//db->GetItems(item_tab, iq);
log << log4 << "Menu: loaded directories/files from the database for parent_id: "
<< dir_id << logend;
}
@@ -190,9 +209,9 @@ void copy_items(CacheItem & citem)
menu_item.id = item_tab[i].id;
menu_item.subject = item_tab[i].subject;
menu_item.url = item_tab[i].url;
menu_item.meta = item_tab[i].meta;
menu_item.meta = item_tab[i].item_content.meta;
menu_item.type = item_tab[i].type;
menu_item.file_type = item_tab[i].file_type;
menu_item.file_type = item_tab[i].item_content.file_type;
citem.menu_items.push_back(menu_item);
}

85
winixd/plugins/seo/Makefile.dep
View File

@@ -1,19 +1,17 @@
# DO NOT DELETE
init.o: seo.h ../../../../winix/winixd/functions/functionbase.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/inttostr.h
init.o: ../../../../winix/winixd/db/db.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: ../../../../winix/winixd/core/misc.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../pikotools/textstream/textstream.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/date/date.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/utf8/utf8.h
@@ -42,6 +40,18 @@ 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/winixbase.h
init.o: ../../../../winix/winixd/models/item.h ../../../../morm/src/model.h
init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
init.o: ../../../../morm/src/flatconnector.h
init.o: ../../../../morm/src/dbexpression.h
init.o: ../../../../morm/src/baseexpression.h
init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h
init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
init.o: ../../../../morm/src/finderhelper.h
init.o: ../../../../morm/src/fieldvaluehelper.h
init.o: ../../../../morm/src/flatexpression.h
init.o: ../../../../winix/winixd/models/itemcontent.h
init.o: ../../../../winix/winixd/core/ugcontainer.h
init.o: ../../../../winix/winixd/core/request.h
init.o: ../../../../winix/winixd/core/error.h
@@ -57,17 +67,7 @@ init.o: ../../../../winix/winixd/core/winixmodel.h
init.o: ../../../../winix/winixd/core/plugin.h
init.o: ../../../../winix/winixd/core/pluginmsg.h
init.o: ../../../../winix/winixd/core/plugindata.h
init.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
init.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h
init.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h
init.o: ../../../../morm/src/queryresult.h
init.o: ../../../../morm/src/flatconnector.h
init.o: ../../../../morm/src/dbexpression.h
init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
init.o: ../../../../morm/src/finderhelper.h
init.o: ../../../../morm/src/fieldvaluehelper.h
init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
init.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h
init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
init.o: ../../../../morm/src/postgresqlexpression.h
init.o: ../../../../morm/src/jsonconnector.h
@@ -102,10 +102,10 @@ init.o: ../../../../winix/winixd/templates/patterns.h
init.o: ../../../../winix/winixd/templates/locale.h
init.o: ../../../../winix/winixd/templates/localefilter.h
init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
init.o: ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
init.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/patternparser.h
init.o: ../../../../winix/winixd/notify/notifythread.h
init.o: ../../../../winix/winixd/core/basethread.h
@@ -170,19 +170,17 @@ init.o: ../../../../winix/winixd/functions/who.h
init.o: ../../../../winix/winixd/functions/vim.h
init.o: ../../../../winix/winixd/core/htmlfilter.h
seo.o: seo.h ../../../../winix/winixd/functions/functionbase.h
seo.o: ../../../../winix/winixd/core/item.h
seo.o: ../../../../pikotools/space/space.h
seo.o: ../../../../pikotools/textstream/types.h
seo.o: ../../../../pikotools/date/date.h
seo.o: ../../../../pikotools/convert/inttostr.h
seo.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h
seo.o: ../../../../winix/winixd/db/dbconn.h
seo.o: ../../../../winix/winixd/db/dbtextstream.h
seo.o: ../../../../winix/winixd/core/textstream.h
seo.o: ../../../../winix/winixd/core/misc.h
seo.o: ../../../../winix/winixd/core/item.h
seo.o: ../../../../winix/winixd/core/requesttypes.h
seo.o: ../../../../pikotools/textstream/textstream.h
seo.o: ../../../../pikotools/space/space.h
seo.o: ../../../../pikotools/textstream/types.h
seo.o: ../../../../pikotools/date/date.h
seo.o: ../../../../pikotools/convert/inttostr.h
seo.o: ../../../../pikotools/membuffer/membuffer.h
seo.o: ../../../../pikotools/textstream/types.h
seo.o: ../../../../pikotools/utf8/utf8.h
@@ -211,6 +209,18 @@ seo.o: ../../../../winix/winixd/core/user.h
seo.o: ../../../../winix/winixd/core/group.h
seo.o: ../../../../winix/winixd/core/dircontainer.h
seo.o: ../../../../winix/winixd/core/winixbase.h
seo.o: ../../../../winix/winixd/models/item.h ../../../../morm/src/model.h
seo.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
seo.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
seo.o: ../../../../morm/src/flatconnector.h
seo.o: ../../../../morm/src/dbexpression.h
seo.o: ../../../../morm/src/baseexpression.h
seo.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h
seo.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
seo.o: ../../../../morm/src/finderhelper.h
seo.o: ../../../../morm/src/fieldvaluehelper.h
seo.o: ../../../../morm/src/flatexpression.h
seo.o: ../../../../winix/winixd/models/itemcontent.h
seo.o: ../../../../winix/winixd/core/ugcontainer.h
seo.o: ../../../../winix/winixd/core/request.h
seo.o: ../../../../winix/winixd/core/error.h
@@ -226,17 +236,8 @@ seo.o: ../../../../winix/winixd/core/winixmodel.h
seo.o: ../../../../winix/winixd/core/plugin.h
seo.o: ../../../../winix/winixd/core/pluginmsg.h
seo.o: ../../../../winix/winixd/core/plugindata.h ../../../../morm/src/morm.h
seo.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
seo.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
seo.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
seo.o: ../../../../morm/src/flatconnector.h
seo.o: ../../../../morm/src/dbexpression.h
seo.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
seo.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
seo.o: ../../../../morm/src/finderhelper.h
seo.o: ../../../../morm/src/fieldvaluehelper.h
seo.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
seo.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
seo.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
seo.o: ../../../../morm/src/jsonexpression.h
seo.o: ../../../../morm/src/postgresqlexpression.h
seo.o: ../../../../morm/src/jsonconnector.h
seo.o: ../../../../morm/src/postgresqlconnector.h
@@ -270,10 +271,10 @@ seo.o: ../../../../winix/winixd/templates/patterns.h
seo.o: ../../../../winix/winixd/templates/locale.h
seo.o: ../../../../winix/winixd/templates/localefilter.h
seo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
seo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
seo.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
seo.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
seo.o: ../../../../ezc/src/expressionparser.h
seo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
seo.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
seo.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
seo.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/expressionparser.h
seo.o: ../../../../ezc/src/patternparser.h
seo.o: ../../../../winix/winixd/notify/notifythread.h
seo.o: ../../../../winix/winixd/core/basethread.h

9
winixd/plugins/seo/seo.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2019, Tomasz Sowa
* Copyright (c) 2019-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -77,12 +77,13 @@ void Seo::MakePost()
item.subject = subject;
PT::Space & seo = item.meta.FindAddSpace(L"seo");
PT::Space & seo = item.item_content.meta.FindAddSpace(L"seo");
seo.Add(L"description", description);
seo.Add(L"keywords", keywords);
db->EditSubjectById(item, item.id);
db->EditMetaById(item.meta, item.id);
item.update(false, true);
//db->EditSubjectById(item, item.id);
//db->EditMetaById(item.meta, item.id);
if( item.type == Item::file )
plugin->Call(WINIX_FILE_CHANGED, &item);

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

@@ -14,7 +14,18 @@ init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/log/filelog.h
init.o: ../../../../winix/winixd/core/request.h
init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/models/item.h ../../../../morm/src/model.h
init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
init.o: ../../../../morm/src/flatconnector.h
init.o: ../../../../morm/src/dbexpression.h
init.o: ../../../../morm/src/baseexpression.h
init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h
init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
init.o: ../../../../morm/src/finderhelper.h
init.o: ../../../../morm/src/fieldvaluehelper.h
init.o: ../../../../morm/src/flatexpression.h
init.o: ../../../../winix/winixd/models/itemcontent.h
init.o: ../../../../winix/winixd/core/error.h
init.o: ../../../../winix/winixd/core/config.h
init.o: ../../../../pikotools/space/spaceparser.h
@@ -44,7 +55,6 @@ init.o: ../../../../winix/winixd/core/lock.h
init.o: ../../../../winix/winixd/core/synchro.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
@@ -62,17 +72,8 @@ init.o: ../../../../winix/winixd/core/mount.h bot.h stats.h
init.o: ../../../../winix/winixd/core/winixmodel.h
init.o: ../../../../winix/winixd/core/plugin.h
init.o: ../../../../winix/winixd/core/pluginmsg.h ../../../../morm/src/morm.h
init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
init.o: ../../../../morm/src/flatconnector.h
init.o: ../../../../morm/src/dbexpression.h
init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
init.o: ../../../../morm/src/finderhelper.h
init.o: ../../../../morm/src/fieldvaluehelper.h
init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
init.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
init.o: ../../../../morm/src/jsonexpression.h
init.o: ../../../../morm/src/postgresqlexpression.h
init.o: ../../../../morm/src/jsonconnector.h
init.o: ../../../../morm/src/postgresqlconnector.h
@@ -101,11 +102,11 @@ stats.o: ../../../../winix/winixd/core/plugin.h
stats.o: ../../../../winix/winixd/core/pluginmsg.h
stats.o: ../../../../winix/winixd/core/plugindata.h
stats.o: ../../../../winix/winixd/core/winixbase.h
stats.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
stats.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h
stats.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h
stats.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
stats.o: ../../../../morm/src/dbconnector.h
stats.o: ../../../../morm/src/queryresult.h
stats.o: ../../../../morm/src/flatconnector.h
stats.o: ../../../../morm/src/flatconnector.h ../../../../morm/src/morm.h
stats.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
stats.o: ../../../../morm/src/dbexpression.h
stats.o: ../../../../morm/src/baseexpression.h
stats.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
@@ -121,15 +122,14 @@ stats.o: ../../../../morm/src/postgresqlconnector.h
stats.o: ../../../../morm/src/postgresqlqueryresult.h
templates.o: templates.h ../../../../winix/winixd/core/plugin.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: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
templates.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
templates.o: ../../../../pikotools/utf8/utf8.h
templates.o: ../../../../pikotools/textstream/textstream.h
templates.o: ../../../../pikotools/space/space.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../pikotools/date/date.h
templates.o: ../../../../pikotools/convert/inttostr.h
templates.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
templates.o: ../../../../pikotools/utf8/utf8.h
templates.o: ../../../../pikotools/textstream/textstream.h
templates.o: ../../../../pikotools/membuffer/membuffer.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
@@ -160,13 +160,12 @@ templates.o: ../../../../winix/winixd/core/plugin.h
templates.o: ../../../../winix/winixd/core/pluginmsg.h
templates.o: ../../../../winix/winixd/core/plugindata.h
templates.o: ../../../../winix/winixd/core/winixbase.h
templates.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
templates.o: ../../../../morm/src/model.h
templates.o: ../../../../morm/src/modelconnector.h
templates.o: ../../../../morm/src/clearer.h
templates.o: ../../../../morm/src/dbconnector.h
templates.o: ../../../../morm/src/queryresult.h
templates.o: ../../../../morm/src/flatconnector.h
templates.o: ../../../../morm/src/flatconnector.h ../../../../morm/src/morm.h
templates.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
templates.o: ../../../../morm/src/dbexpression.h
templates.o: ../../../../morm/src/baseexpression.h
templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h

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

@@ -2,20 +2,18 @@
createthread.o: createthread.h
createthread.o: ../../../../winix/winixd/functions/functionbase.h
createthread.o: ../../../../winix/winixd/core/item.h
createthread.o: ../../../../pikotools/space/space.h
createthread.o: ../../../../pikotools/textstream/types.h
createthread.o: ../../../../pikotools/date/date.h
createthread.o: ../../../../pikotools/convert/inttostr.h
createthread.o: ../../../../winix/winixd/db/db.h
createthread.o: ../../../../winix/winixd/db/dbbase.h
createthread.o: ../../../../winix/winixd/db/dbconn.h
createthread.o: ../../../../winix/winixd/db/dbtextstream.h
createthread.o: ../../../../winix/winixd/core/textstream.h
createthread.o: ../../../../winix/winixd/core/misc.h
createthread.o: ../../../../winix/winixd/core/item.h
createthread.o: ../../../../winix/winixd/core/requesttypes.h
createthread.o: ../../../../pikotools/textstream/textstream.h
createthread.o: ../../../../pikotools/space/space.h
createthread.o: ../../../../pikotools/textstream/types.h
createthread.o: ../../../../pikotools/date/date.h
createthread.o: ../../../../pikotools/convert/inttostr.h
createthread.o: ../../../../pikotools/membuffer/membuffer.h
createthread.o: ../../../../pikotools/textstream/types.h
createthread.o: ../../../../pikotools/utf8/utf8.h
@@ -45,6 +43,23 @@ createthread.o: ../../../../winix/winixd/core/user.h
createthread.o: ../../../../winix/winixd/core/group.h
createthread.o: ../../../../winix/winixd/core/dircontainer.h
createthread.o: ../../../../winix/winixd/core/winixbase.h
createthread.o: ../../../../winix/winixd/models/item.h
createthread.o: ../../../../morm/src/model.h
createthread.o: ../../../../morm/src/modelconnector.h
createthread.o: ../../../../morm/src/clearer.h
createthread.o: ../../../../morm/src/dbconnector.h
createthread.o: ../../../../morm/src/queryresult.h
createthread.o: ../../../../morm/src/flatconnector.h
createthread.o: ../../../../morm/src/dbexpression.h
createthread.o: ../../../../morm/src/baseexpression.h
createthread.o: ../../../../morm/src/morm_types.h
createthread.o: ../../../../morm/src/modelenv.h
createthread.o: ../../../../morm/src/modeldata.h
createthread.o: ../../../../morm/src/cursorhelper.h
createthread.o: ../../../../morm/src/finderhelper.h
createthread.o: ../../../../morm/src/fieldvaluehelper.h
createthread.o: ../../../../morm/src/flatexpression.h
createthread.o: ../../../../winix/winixd/models/itemcontent.h
createthread.o: ../../../../winix/winixd/core/ugcontainer.h
createthread.o: ../../../../winix/winixd/core/request.h
createthread.o: ../../../../winix/winixd/core/error.h
@@ -59,22 +74,8 @@ createthread.o: ../../../../winix/winixd/core/basethread.h
createthread.o: ../../../../winix/winixd/core/winixmodel.h
createthread.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
createthread.o: ../../../../winix/winixd/core/plugindata.h
createthread.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
createthread.o: ../../../../morm/src/model.h
createthread.o: ../../../../morm/src/modelconnector.h
createthread.o: ../../../../morm/src/clearer.h
createthread.o: ../../../../morm/src/dbconnector.h
createthread.o: ../../../../morm/src/queryresult.h
createthread.o: ../../../../morm/src/flatconnector.h
createthread.o: ../../../../morm/src/dbexpression.h
createthread.o: ../../../../morm/src/baseexpression.h
createthread.o: ../../../../morm/src/modelenv.h
createthread.o: ../../../../morm/src/modeldata.h
createthread.o: ../../../../morm/src/cursorhelper.h
createthread.o: ../../../../morm/src/finderhelper.h
createthread.o: ../../../../morm/src/fieldvaluehelper.h
createthread.o: ../../../../morm/src/flatexpression.h
createthread.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
createthread.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h
createthread.o: ../../../../morm/src/cursor.h
createthread.o: ../../../../morm/src/jsonexpression.h
createthread.o: ../../../../morm/src/postgresqlexpression.h
createthread.o: ../../../../morm/src/jsonconnector.h
@@ -109,9 +110,10 @@ createthread.o: ../../../../winix/winixd/templates/patterns.h
createthread.o: ../../../../winix/winixd/templates/locale.h
createthread.o: ../../../../winix/winixd/templates/localefilter.h
createthread.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
createthread.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
createthread.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
createthread.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
createthread.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
createthread.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
createthread.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
createthread.o: ../../../../ezc/src/pattern.h
createthread.o: ../../../../ezc/src/expressionparser.h
createthread.o: ../../../../ezc/src/patternparser.h
createthread.o: ../../../../winix/winixd/notify/notifythread.h
@@ -178,7 +180,6 @@ createthread.o: ../../../../winix/winixd/functions/who.h
createthread.o: ../../../../winix/winixd/functions/vim.h
createthread.o: ../../../../winix/winixd/core/htmlfilter.h
funthread.o: ../../../../winix/winixd/core/misc.h
funthread.o: ../../../../winix/winixd/core/item.h
funthread.o: ../../../../winix/winixd/core/requesttypes.h
funthread.o: ../../../../pikotools/textstream/textstream.h
funthread.o: ../../../../pikotools/space/space.h
@@ -196,7 +197,6 @@ funthread.o: ../../../../pikotools/convert/strtoint.h
funthread.o: ../../../../pikotools/convert/text.h
funthread.o: ../../../../winix/winixd/core/misc.h funthread.h
funthread.o: ../../../../winix/winixd/functions/functionbase.h
funthread.o: ../../../../winix/winixd/core/item.h
funthread.o: ../../../../winix/winixd/db/db.h
funthread.o: ../../../../winix/winixd/db/dbbase.h
funthread.o: ../../../../winix/winixd/db/dbconn.h
@@ -222,6 +222,22 @@ funthread.o: ../../../../winix/winixd/core/user.h
funthread.o: ../../../../winix/winixd/core/group.h
funthread.o: ../../../../winix/winixd/core/dircontainer.h
funthread.o: ../../../../winix/winixd/core/winixbase.h
funthread.o: ../../../../winix/winixd/models/item.h
funthread.o: ../../../../morm/src/model.h
funthread.o: ../../../../morm/src/modelconnector.h
funthread.o: ../../../../morm/src/clearer.h
funthread.o: ../../../../morm/src/dbconnector.h
funthread.o: ../../../../morm/src/queryresult.h
funthread.o: ../../../../morm/src/flatconnector.h
funthread.o: ../../../../morm/src/dbexpression.h
funthread.o: ../../../../morm/src/baseexpression.h
funthread.o: ../../../../morm/src/morm_types.h
funthread.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
funthread.o: ../../../../morm/src/cursorhelper.h
funthread.o: ../../../../morm/src/finderhelper.h
funthread.o: ../../../../morm/src/fieldvaluehelper.h
funthread.o: ../../../../morm/src/flatexpression.h
funthread.o: ../../../../winix/winixd/models/itemcontent.h
funthread.o: ../../../../winix/winixd/core/ugcontainer.h
funthread.o: ../../../../winix/winixd/core/request.h
funthread.o: ../../../../winix/winixd/core/error.h
@@ -236,21 +252,8 @@ funthread.o: ../../../../winix/winixd/core/basethread.h
funthread.o: ../../../../winix/winixd/core/winixmodel.h
funthread.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
funthread.o: ../../../../winix/winixd/core/plugindata.h
funthread.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
funthread.o: ../../../../morm/src/model.h
funthread.o: ../../../../morm/src/modelconnector.h
funthread.o: ../../../../morm/src/clearer.h
funthread.o: ../../../../morm/src/dbconnector.h
funthread.o: ../../../../morm/src/queryresult.h
funthread.o: ../../../../morm/src/flatconnector.h
funthread.o: ../../../../morm/src/dbexpression.h
funthread.o: ../../../../morm/src/baseexpression.h
funthread.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
funthread.o: ../../../../morm/src/cursorhelper.h
funthread.o: ../../../../morm/src/finderhelper.h
funthread.o: ../../../../morm/src/fieldvaluehelper.h
funthread.o: ../../../../morm/src/flatexpression.h
funthread.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
funthread.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h
funthread.o: ../../../../morm/src/cursor.h
funthread.o: ../../../../morm/src/jsonexpression.h
funthread.o: ../../../../morm/src/postgresqlexpression.h
funthread.o: ../../../../morm/src/jsonconnector.h
@@ -285,9 +288,10 @@ funthread.o: ../../../../winix/winixd/templates/patterns.h
funthread.o: ../../../../winix/winixd/templates/locale.h
funthread.o: ../../../../winix/winixd/templates/localefilter.h
funthread.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
funthread.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
funthread.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
funthread.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
funthread.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
funthread.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
funthread.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
funthread.o: ../../../../ezc/src/pattern.h
funthread.o: ../../../../ezc/src/expressionparser.h
funthread.o: ../../../../ezc/src/patternparser.h
funthread.o: ../../../../winix/winixd/notify/notifythread.h
@@ -313,17 +317,15 @@ init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../winix/winixd/db/dbbase.h
init.o: ../../../../winix/winixd/core/error.h reply.h
init.o: ../../../../winix/winixd/functions/functionbase.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../winix/winixd/db/db.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: ../../../../winix/winixd/core/misc.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../pikotools/textstream/textstream.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/utf8/utf8.h
@@ -351,6 +353,18 @@ 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/winixbase.h
init.o: ../../../../winix/winixd/models/item.h ../../../../morm/src/model.h
init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
init.o: ../../../../morm/src/flatconnector.h
init.o: ../../../../morm/src/dbexpression.h
init.o: ../../../../morm/src/baseexpression.h
init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h
init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
init.o: ../../../../morm/src/finderhelper.h
init.o: ../../../../morm/src/fieldvaluehelper.h
init.o: ../../../../morm/src/flatexpression.h
init.o: ../../../../winix/winixd/models/itemcontent.h
init.o: ../../../../winix/winixd/core/ugcontainer.h
init.o: ../../../../winix/winixd/core/request.h
init.o: ../../../../winix/winixd/core/error.h
@@ -365,17 +379,7 @@ 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: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
init.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h
init.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h
init.o: ../../../../morm/src/queryresult.h
init.o: ../../../../morm/src/flatconnector.h
init.o: ../../../../morm/src/dbexpression.h
init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
init.o: ../../../../morm/src/finderhelper.h
init.o: ../../../../morm/src/fieldvaluehelper.h
init.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
init.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h
init.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
init.o: ../../../../morm/src/postgresqlexpression.h
init.o: ../../../../morm/src/jsonconnector.h
@@ -410,10 +414,10 @@ init.o: ../../../../winix/winixd/templates/patterns.h
init.o: ../../../../winix/winixd/templates/locale.h
init.o: ../../../../winix/winixd/templates/localefilter.h
init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
init.o: ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
init.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/patternparser.h
init.o: ../../../../winix/winixd/notify/notifythread.h
init.o: ../../../../winix/winixd/core/basethread.h
@@ -480,20 +484,18 @@ 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
reply.o: ../../../../pikotools/date/date.h
reply.o: ../../../../pikotools/convert/inttostr.h
reply.o: ../../../../winix/winixd/db/db.h
reply.o: ../../../../winix/winixd/db/dbbase.h
reply.o: ../../../../winix/winixd/db/dbconn.h
reply.o: ../../../../winix/winixd/db/dbtextstream.h
reply.o: ../../../../winix/winixd/core/textstream.h
reply.o: ../../../../winix/winixd/core/misc.h
reply.o: ../../../../winix/winixd/core/item.h
reply.o: ../../../../winix/winixd/core/requesttypes.h
reply.o: ../../../../pikotools/textstream/textstream.h
reply.o: ../../../../pikotools/space/space.h
reply.o: ../../../../pikotools/textstream/types.h
reply.o: ../../../../pikotools/date/date.h
reply.o: ../../../../pikotools/convert/inttostr.h
reply.o: ../../../../pikotools/membuffer/membuffer.h
reply.o: ../../../../pikotools/textstream/types.h
reply.o: ../../../../pikotools/utf8/utf8.h
@@ -522,6 +524,19 @@ reply.o: ../../../../winix/winixd/core/user.h
reply.o: ../../../../winix/winixd/core/group.h
reply.o: ../../../../winix/winixd/core/dircontainer.h
reply.o: ../../../../winix/winixd/core/winixbase.h
reply.o: ../../../../winix/winixd/models/item.h ../../../../morm/src/model.h
reply.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
reply.o: ../../../../morm/src/dbconnector.h
reply.o: ../../../../morm/src/queryresult.h
reply.o: ../../../../morm/src/flatconnector.h
reply.o: ../../../../morm/src/dbexpression.h
reply.o: ../../../../morm/src/baseexpression.h
reply.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h
reply.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
reply.o: ../../../../morm/src/finderhelper.h
reply.o: ../../../../morm/src/fieldvaluehelper.h
reply.o: ../../../../morm/src/flatexpression.h
reply.o: ../../../../winix/winixd/models/itemcontent.h
reply.o: ../../../../winix/winixd/core/ugcontainer.h
reply.o: ../../../../winix/winixd/core/request.h
reply.o: ../../../../winix/winixd/core/error.h
@@ -536,18 +551,7 @@ reply.o: ../../../../winix/winixd/core/basethread.h
reply.o: ../../../../winix/winixd/core/winixmodel.h
reply.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
reply.o: ../../../../winix/winixd/core/plugindata.h
reply.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
reply.o: ../../../../morm/src/model.h ../../../../morm/src/modelconnector.h
reply.o: ../../../../morm/src/clearer.h ../../../../morm/src/dbconnector.h
reply.o: ../../../../morm/src/queryresult.h
reply.o: ../../../../morm/src/flatconnector.h
reply.o: ../../../../morm/src/dbexpression.h
reply.o: ../../../../morm/src/baseexpression.h
reply.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
reply.o: ../../../../morm/src/cursorhelper.h
reply.o: ../../../../morm/src/finderhelper.h
reply.o: ../../../../morm/src/fieldvaluehelper.h
reply.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
reply.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h
reply.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
reply.o: ../../../../morm/src/postgresqlexpression.h
reply.o: ../../../../morm/src/jsonconnector.h
@@ -582,10 +586,10 @@ reply.o: ../../../../winix/winixd/templates/patterns.h
reply.o: ../../../../winix/winixd/templates/locale.h
reply.o: ../../../../winix/winixd/templates/localefilter.h
reply.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
reply.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
reply.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
reply.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
reply.o: ../../../../ezc/src/expressionparser.h
reply.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
reply.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
reply.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
reply.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/expressionparser.h
reply.o: ../../../../ezc/src/patternparser.h
reply.o: ../../../../winix/winixd/notify/notifythread.h
reply.o: ../../../../winix/winixd/core/basethread.h
@@ -653,20 +657,18 @@ reply.o: ../../../../winix/winixd/core/htmlfilter.h
reply.o: ../../../../winix/winixd/core/misc.h
showthreads.o: showthreads.h
showthreads.o: ../../../../winix/winixd/functions/functionbase.h
showthreads.o: ../../../../winix/winixd/core/item.h
showthreads.o: ../../../../pikotools/space/space.h
showthreads.o: ../../../../pikotools/textstream/types.h
showthreads.o: ../../../../pikotools/date/date.h
showthreads.o: ../../../../pikotools/convert/inttostr.h
showthreads.o: ../../../../winix/winixd/db/db.h
showthreads.o: ../../../../winix/winixd/db/dbbase.h
showthreads.o: ../../../../winix/winixd/db/dbconn.h
showthreads.o: ../../../../winix/winixd/db/dbtextstream.h
showthreads.o: ../../../../winix/winixd/core/textstream.h
showthreads.o: ../../../../winix/winixd/core/misc.h
showthreads.o: ../../../../winix/winixd/core/item.h
showthreads.o: ../../../../winix/winixd/core/requesttypes.h
showthreads.o: ../../../../pikotools/textstream/textstream.h
showthreads.o: ../../../../pikotools/space/space.h
showthreads.o: ../../../../pikotools/textstream/types.h
showthreads.o: ../../../../pikotools/date/date.h
showthreads.o: ../../../../pikotools/convert/inttostr.h
showthreads.o: ../../../../pikotools/membuffer/membuffer.h
showthreads.o: ../../../../pikotools/textstream/types.h
showthreads.o: ../../../../pikotools/utf8/utf8.h
@@ -696,6 +698,23 @@ showthreads.o: ../../../../winix/winixd/core/user.h
showthreads.o: ../../../../winix/winixd/core/group.h
showthreads.o: ../../../../winix/winixd/core/dircontainer.h
showthreads.o: ../../../../winix/winixd/core/winixbase.h
showthreads.o: ../../../../winix/winixd/models/item.h
showthreads.o: ../../../../morm/src/model.h
showthreads.o: ../../../../morm/src/modelconnector.h
showthreads.o: ../../../../morm/src/clearer.h
showthreads.o: ../../../../morm/src/dbconnector.h
showthreads.o: ../../../../morm/src/queryresult.h
showthreads.o: ../../../../morm/src/flatconnector.h
showthreads.o: ../../../../morm/src/dbexpression.h
showthreads.o: ../../../../morm/src/baseexpression.h
showthreads.o: ../../../../morm/src/morm_types.h
showthreads.o: ../../../../morm/src/modelenv.h
showthreads.o: ../../../../morm/src/modeldata.h
showthreads.o: ../../../../morm/src/cursorhelper.h
showthreads.o: ../../../../morm/src/finderhelper.h
showthreads.o: ../../../../morm/src/fieldvaluehelper.h
showthreads.o: ../../../../morm/src/flatexpression.h
showthreads.o: ../../../../winix/winixd/models/itemcontent.h
showthreads.o: ../../../../winix/winixd/core/ugcontainer.h
showthreads.o: ../../../../winix/winixd/core/request.h
showthreads.o: ../../../../winix/winixd/core/error.h
@@ -710,22 +729,8 @@ showthreads.o: ../../../../winix/winixd/core/basethread.h
showthreads.o: ../../../../winix/winixd/core/winixmodel.h
showthreads.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
showthreads.o: ../../../../winix/winixd/core/plugindata.h
showthreads.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
showthreads.o: ../../../../morm/src/model.h
showthreads.o: ../../../../morm/src/modelconnector.h
showthreads.o: ../../../../morm/src/clearer.h
showthreads.o: ../../../../morm/src/dbconnector.h
showthreads.o: ../../../../morm/src/queryresult.h
showthreads.o: ../../../../morm/src/flatconnector.h
showthreads.o: ../../../../morm/src/dbexpression.h
showthreads.o: ../../../../morm/src/baseexpression.h
showthreads.o: ../../../../morm/src/modelenv.h
showthreads.o: ../../../../morm/src/modeldata.h
showthreads.o: ../../../../morm/src/cursorhelper.h
showthreads.o: ../../../../morm/src/finderhelper.h
showthreads.o: ../../../../morm/src/fieldvaluehelper.h
showthreads.o: ../../../../morm/src/flatexpression.h
showthreads.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
showthreads.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h
showthreads.o: ../../../../morm/src/cursor.h
showthreads.o: ../../../../morm/src/jsonexpression.h
showthreads.o: ../../../../morm/src/postgresqlexpression.h
showthreads.o: ../../../../morm/src/jsonconnector.h
@@ -760,9 +765,10 @@ showthreads.o: ../../../../winix/winixd/templates/patterns.h
showthreads.o: ../../../../winix/winixd/templates/locale.h
showthreads.o: ../../../../winix/winixd/templates/localefilter.h
showthreads.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
showthreads.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
showthreads.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
showthreads.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
showthreads.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
showthreads.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
showthreads.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
showthreads.o: ../../../../ezc/src/pattern.h
showthreads.o: ../../../../ezc/src/expressionparser.h
showthreads.o: ../../../../ezc/src/patternparser.h
showthreads.o: ../../../../winix/winixd/notify/notifythread.h
@@ -788,12 +794,7 @@ tdb.o: ../../../../pikotools/convert/inttostr.h
tdb.o: ../../../../winix/winixd/db/dbbase.h
tdb.o: ../../../../winix/winixd/core/error.h
tdb.o: ../../../../winix/winixd/core/log.h
templates.o: threadinfo.h ../../../../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/inttostr.h
templates.o: ../../../../winix/winixd/core/system.h
templates.o: threadinfo.h ../../../../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
@@ -806,6 +807,10 @@ templates.o: ../../../../winix/winixd/core/log.h
templates.o: ../../../../winix/winixd/core/logmanipulators.h
templates.o: ../../../../pikotools/log/log.h
templates.o: ../../../../pikotools/textstream/textstream.h
templates.o: ../../../../pikotools/space/space.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../pikotools/date/date.h
templates.o: ../../../../pikotools/convert/inttostr.h
templates.o: ../../../../pikotools/membuffer/membuffer.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../pikotools/log/filelog.h
@@ -816,13 +821,12 @@ 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: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
templates.o: ../../../../morm/src/model.h
templates.o: ../../../../morm/src/modelconnector.h
templates.o: ../../../../morm/src/clearer.h
templates.o: ../../../../morm/src/dbconnector.h
templates.o: ../../../../morm/src/queryresult.h
templates.o: ../../../../morm/src/flatconnector.h
templates.o: ../../../../morm/src/flatconnector.h ../../../../morm/src/morm.h
templates.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
templates.o: ../../../../morm/src/dbexpression.h
templates.o: ../../../../morm/src/baseexpression.h
templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
@@ -838,7 +842,6 @@ templates.o: ../../../../morm/src/jsonconnector.h
templates.o: ../../../../morm/src/postgresqlconnector.h
templates.o: ../../../../morm/src/postgresqlqueryresult.h
templates.o: ../../../../winix/winixd/core/dirs.h
templates.o: ../../../../winix/winixd/core/item.h
templates.o: ../../../../winix/winixd/core/dircontainer.h
templates.o: ../../../../winix/winixd/db/db.h
templates.o: ../../../../winix/winixd/db/dbbase.h
@@ -859,6 +862,8 @@ 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/models/item.h
templates.o: ../../../../winix/winixd/models/itemcontent.h
templates.o: ../../../../winix/winixd/core/ugcontainer.h
templates.o: ../../../../winix/winixd/core/request.h
templates.o: ../../../../winix/winixd/core/mounts.h
@@ -890,10 +895,10 @@ templates.o: ../../../../winix/winixd/templates/patterns.h
templates.o: ../../../../winix/winixd/templates/locale.h
templates.o: ../../../../winix/winixd/templates/localefilter.h
templates.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
templates.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
templates.o: ../../../../ezc/src/functions.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/blocks.h ../../../../ezc/src/item.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/notify/notifythread.h
@@ -971,12 +976,7 @@ templates.o: ../../../../winix/winixd/functions/upload.h
templates.o: ../../../../winix/winixd/functions/uptime.h
templates.o: ../../../../winix/winixd/functions/who.h
templates.o: ../../../../winix/winixd/functions/vim.h
threadinfo.o: threadinfo.h ../../../../winix/winixd/core/item.h
threadinfo.o: ../../../../pikotools/space/space.h
threadinfo.o: ../../../../pikotools/textstream/types.h
threadinfo.o: ../../../../pikotools/date/date.h
threadinfo.o: ../../../../pikotools/convert/inttostr.h
threadinfo.o: ../../../../winix/winixd/core/system.h
threadinfo.o: threadinfo.h ../../../../winix/winixd/core/system.h
threadinfo.o: ../../../../winix/winixd/core/job.h
threadinfo.o: ../../../../winix/winixd/core/basethread.h
threadinfo.o: ../../../../winix/winixd/core/synchro.h
@@ -989,6 +989,10 @@ threadinfo.o: ../../../../winix/winixd/core/log.h
threadinfo.o: ../../../../winix/winixd/core/logmanipulators.h
threadinfo.o: ../../../../pikotools/log/log.h
threadinfo.o: ../../../../pikotools/textstream/textstream.h
threadinfo.o: ../../../../pikotools/space/space.h
threadinfo.o: ../../../../pikotools/textstream/types.h
threadinfo.o: ../../../../pikotools/date/date.h
threadinfo.o: ../../../../pikotools/convert/inttostr.h
threadinfo.o: ../../../../pikotools/membuffer/membuffer.h
threadinfo.o: ../../../../pikotools/textstream/types.h
threadinfo.o: ../../../../pikotools/log/filelog.h
@@ -999,13 +1003,13 @@ threadinfo.o: ../../../../winix/winixd/core/lock.h
threadinfo.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
threadinfo.o: ../../../../winix/winixd/core/plugindata.h
threadinfo.o: ../../../../winix/winixd/core/winixbase.h
threadinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
threadinfo.o: ../../../../morm/src/model.h
threadinfo.o: ../../../../morm/src/modelconnector.h
threadinfo.o: ../../../../morm/src/clearer.h
threadinfo.o: ../../../../morm/src/dbconnector.h
threadinfo.o: ../../../../morm/src/queryresult.h
threadinfo.o: ../../../../morm/src/flatconnector.h
threadinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
threadinfo.o: ../../../../morm/src/model.h
threadinfo.o: ../../../../morm/src/dbexpression.h
threadinfo.o: ../../../../morm/src/baseexpression.h
threadinfo.o: ../../../../morm/src/modelenv.h
@@ -1022,7 +1026,6 @@ threadinfo.o: ../../../../morm/src/jsonconnector.h
threadinfo.o: ../../../../morm/src/postgresqlconnector.h
threadinfo.o: ../../../../morm/src/postgresqlqueryresult.h
threadinfo.o: ../../../../winix/winixd/core/dirs.h
threadinfo.o: ../../../../winix/winixd/core/item.h
threadinfo.o: ../../../../winix/winixd/core/dircontainer.h
threadinfo.o: ../../../../winix/winixd/db/db.h
threadinfo.o: ../../../../winix/winixd/db/dbbase.h
@@ -1043,6 +1046,8 @@ threadinfo.o: ../../../../winix/winixd/db/dbitemcolumns.h
threadinfo.o: ../../../../winix/winixd/core/user.h
threadinfo.o: ../../../../winix/winixd/core/group.h
threadinfo.o: ../../../../winix/winixd/core/dircontainer.h
threadinfo.o: ../../../../winix/winixd/models/item.h
threadinfo.o: ../../../../winix/winixd/models/itemcontent.h
threadinfo.o: ../../../../winix/winixd/core/ugcontainer.h
threadinfo.o: ../../../../winix/winixd/core/request.h
threadinfo.o: ../../../../winix/winixd/core/mounts.h
@@ -1074,10 +1079,10 @@ threadinfo.o: ../../../../winix/winixd/templates/patterns.h
threadinfo.o: ../../../../winix/winixd/templates/locale.h
threadinfo.o: ../../../../winix/winixd/templates/localefilter.h
threadinfo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
threadinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
threadinfo.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
threadinfo.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
threadinfo.o: ../../../../ezc/src/outstreams.h
threadinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
threadinfo.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
threadinfo.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
threadinfo.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h
threadinfo.o: ../../../../ezc/src/expressionparser.h
threadinfo.o: ../../../../ezc/src/patternparser.h
threadinfo.o: ../../../../winix/winixd/notify/notifythread.h

4
winixd/plugins/thread/createthread.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2014, Tomasz Sowa
* Copyright (c) 2008-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -100,7 +100,7 @@ void CreateThread::MakePost()
functions->SetUser(cur->request->item);
functions->PrepareUrl(cur->request->item);
cur->request->item.parent_id = cur->request->dir_tab.back()->id;
cur->request->item.privileges = system->NewFilePrivileges();
cur->request->item.item_content.privileges = system->NewFilePrivileges();
if( functions->CheckAbuse() )
return;

31
winixd/plugins/thread/funthread.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2014, Tomasz Sowa
* Copyright (c) 2008-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -83,16 +83,31 @@ void FunThread::PrepareThread(long file_id)
if( !id_tab.empty() )
{
DbItemQuery iq;
// DbItemQuery iq;
//
// if( system->mounts.pmount->IsArg(thread_info->mount_par_thread, L"sort_desc") )
// iq.sort_date_asc = false; // sort_index_asc we are ignoring
//
// iq.WhereIdIn(id_tab);
// iq.WhereType(Item::file);
// iq.WhereFileType(WINIX_ITEM_FILETYPE_NONE);
morm::Finder<Item> finder(model_connector);
thread_info->item_tab = finder.
select().
where().
in(L"id", id_tab).
eq(L"type", static_cast<int>(Item::file)).
eq(L"content.file_type", WINIX_ITEM_FILETYPE_NONE).
get_vector();
if( system->mounts.pmount->IsArg(thread_info->mount_par_thread, L"sort_desc") )
iq.sort_date_asc = false; // sort_index_asc we are ignoring
finder.raw("order by content.date_creation desc");
else
finder.raw("order by content.date_creation asc");
iq.WhereIdIn(id_tab);
iq.WhereType(Item::file);
iq.WhereFileType(WINIX_ITEM_FILETYPE_NONE);
db->GetItems(thread_info->item_tab, iq);
//db->GetItems(thread_info->item_tab, iq);
system->CheckAccessToItems(thread_info->item_tab);
thread_info->item_sort_tab.resize(thread_info->item_tab.size());

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

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2018, Tomasz Sowa
* Copyright (c) 2010-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -80,7 +80,7 @@ bool Reply::HasAccess()
return false;
PT::Space * thread_space = cur->request->item.ameta.FindSpace(L"thread");
PT::Space * thread_space = cur->request->item.item_content.meta_admin.FindSpace(L"thread");
if( thread_space )
{
@@ -128,7 +128,7 @@ void Reply::MakePost()
functions->SetUser(answer);
functions->PrepareUrl(answer);
answer.parent_id = files_dir->id;
answer.privileges = system->NewFilePrivileges();
answer.item_content.privileges = system->NewFilePrivileges();
if( functions->CheckAbuse() )
return;

42
winixd/plugins/thread/showthreads.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2014, Tomasz Sowa
* Copyright (c) 2010-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -89,7 +89,7 @@ bool ShowThreads::Sort::operator()(const Item * item1, const Item * item2)
else
{
// sorting by date
return item1->date_creation > item2->date_creation;
return item1->item_content.date_creation > item2->item_content.date_creation;
}
}
@@ -99,21 +99,31 @@ bool ShowThreads::Sort::operator()(const Item * item1, const Item * item2)
void ShowThreads::ReadFiles()
{
// reading files
DbItemQuery iq;
iq.SetAll(false, false);
iq.sel_url = true;
iq.sel_subject = true;
iq.sel_date = true;
iq.sel_user_id = true;
iq.sel_group_id = true;
iq.sel_guest_name = true;
iq.sel_privileges = true;
iq.sel_date = true;
iq.WhereParentId(cur->request->dir_tab.back()->id);
iq.WhereType(Item::file);
iq.WhereFileType(WINIX_ITEM_FILETYPE_NONE);
// DbItemQuery iq;
// iq.SetAll(false, false);
// iq.sel_url = true;
// iq.sel_subject = true;
// iq.sel_date = true;
// iq.sel_user_id = true;
// iq.sel_group_id = true;
// iq.sel_guest_name = true;
// iq.sel_privileges = true;
// iq.sel_date = true;
// iq.WhereParentId(cur->request->dir_tab.back()->id);
// iq.WhereType(Item::file);
// iq.WhereFileType(WINIX_ITEM_FILETYPE_NONE);
db->GetItems(thread_info->item_tab, iq);
morm::Finder<Item> finder(model_connector);
thread_info->item_tab = finder.
select().
where().
eq(L"parent_id", cur->request->dir_tab.back()->id).
eq(L"type", static_cast<int>(Item::file)).
eq(L"content.file_type", WINIX_ITEM_FILETYPE_NONE).
get_vector();
//db->GetItems(thread_info->item_tab, iq);
system->CheckAccessToItems(thread_info->item_tab);
}

56
winixd/plugins/thread/templates.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2014, Tomasz Sowa
* Copyright (c) 2008-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -164,14 +164,14 @@ void thread_sort_tab_subject_noescape(Info & i)
void thread_sort_tab_content(Info & i)
{
if( item_sort_index < thread_info.item_sort_tab.size() )
i.out << thread_info.item_sort_tab[item_sort_index]->content;
i.out << thread_info.item_sort_tab[item_sort_index]->item_content.content_raw;
}
void thread_sort_tab_content_noescape(Info & i)
{
if( item_sort_index < thread_info.item_sort_tab.size() )
i.out << R(thread_info.item_sort_tab[item_sort_index]->content);
i.out << R(thread_info.item_sort_tab[item_sort_index]->item_content.content_raw);
}
@@ -180,8 +180,8 @@ void thread_sort_tab_print_content(Info & i)
if( item_sort_index >= thread_info.item_sort_tab.size() )
return;
std::wstring & content = thread_info.item_sort_tab[item_sort_index]->content;
Item::ContentType type = thread_info.item_sort_tab[item_sort_index]->content_type;
std::wstring & content = thread_info.item_sort_tab[item_sort_index]->item_content.content_raw;
ItemContent::ContentType type = thread_info.item_sort_tab[item_sort_index]->item_content.content_raw_type;
item_print_content(i.out, content, type);
}
@@ -190,7 +190,7 @@ void thread_sort_tab_print_content(Info & i)
void thread_sort_tab_privileges(Info & i)
{
if( item_sort_index < thread_info.item_sort_tab.size() )
i.out << "0" << Toa(thread_info.item_sort_tab[item_sort_index]->privileges, 8);
i.out << "0" << Toa(thread_info.item_sort_tab[item_sort_index]->item_content.privileges, 8);
}
@@ -251,8 +251,8 @@ void thread_sort_tab_user(Info & i)
{
if( item_sort_index < thread_info.item_sort_tab.size() )
{
User * puser = system->users.GetUser(thread_info.item_sort_tab[item_sort_index]->user_id);
print_user_name(i, puser, thread_info.item_sort_tab[item_sort_index]->guest_name);
User * puser = system->users.GetUser(thread_info.item_sort_tab[item_sort_index]->item_content.user_id);
print_user_name(i, puser, thread_info.item_sort_tab[item_sort_index]->item_content.guest_name);
}
}
@@ -262,8 +262,8 @@ void thread_sort_tab_modification_user(Info & i)
{
if( item_sort_index < thread_info.item_sort_tab.size() )
{
User * puser = system->users.GetUser(thread_info.item_sort_tab[item_sort_index]->modification_user_id);
print_user_name(i, puser, thread_info.item_sort_tab[item_sort_index]->guest_name);
User * puser = system->users.GetUser(thread_info.item_sort_tab[item_sort_index]->item_content.modification_user_id);
print_user_name(i, puser, thread_info.item_sort_tab[item_sort_index]->item_content.guest_name);
}
}
@@ -273,7 +273,7 @@ void thread_sort_tab_users_different(Info & i)
{
if( item_sort_index < thread_info.item_sort_tab.size() )
{
i.res = (thread_info.item_sort_tab[item_sort_index]->user_id != thread_info.item_sort_tab[item_sort_index]->modification_user_id);
i.res = (thread_info.item_sort_tab[item_sort_index]->item_content.user_id != thread_info.item_sort_tab[item_sort_index]->item_content.modification_user_id);
}
}
@@ -283,7 +283,7 @@ void thread_sort_tab_group(Info & i)
{
if( item_sort_index < thread_info.item_sort_tab.size() )
{
long group_id = thread_info.item_sort_tab[item_sort_index]->group_id;
long group_id = thread_info.item_sort_tab[item_sort_index]->item_content.group_id;
Group * pgroup = system->groups.GetGroup(group_id);
if( pgroup )
@@ -298,7 +298,7 @@ void thread_sort_tab_date_creation(Info & i)
{
if( item_sort_index < thread_info.item_sort_tab.size() )
{
PT::Date date = system->ToLocal(thread_info.item_sort_tab[item_sort_index]->date_creation);
PT::Date date = system->ToLocal(thread_info.item_sort_tab[item_sort_index]->item_content.date_creation);
i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec);
}
}
@@ -308,7 +308,7 @@ void thread_sort_tab_date_modification(Info & i)
{
if( item_sort_index < thread_info.item_sort_tab.size() )
{
PT::Date date = system->ToLocal(thread_info.item_sort_tab[item_sort_index]->date_modification);
PT::Date date = system->ToLocal(thread_info.item_sort_tab[item_sort_index]->item_content.date_modification);
i.out << DateToStr(date.year, date.month, date.day, date.hour, date.min, date.sec);
}
}
@@ -318,7 +318,7 @@ void thread_sort_tab_date_creation_nice(Info & i)
{
if( item_sort_index < thread_info.item_sort_tab.size() )
{
print_date_nice(i, thread_info.item_sort_tab[item_sort_index]->date_creation);
print_date_nice(i, thread_info.item_sort_tab[item_sort_index]->item_content.date_creation);
}
}
@@ -328,7 +328,7 @@ void thread_sort_tab_date_modification_nice(Info & i)
{
if( item_sort_index < thread_info.item_sort_tab.size() )
{
print_date_nice(i, thread_info.item_sort_tab[item_sort_index]->date_modification);
print_date_nice(i, thread_info.item_sort_tab[item_sort_index]->item_content.date_modification);
}
}
@@ -337,8 +337,8 @@ void thread_sort_tab_dates_equal(Info & i)
{
if( item_sort_index < thread_info.item_sort_tab.size() )
{
PT::Date & date1 = thread_info.item_sort_tab[item_sort_index]->date_creation;
PT::Date & date2 = thread_info.item_sort_tab[item_sort_index]->date_modification;
PT::Date & date1 = thread_info.item_sort_tab[item_sort_index]->item_content.date_creation;
PT::Date & date2 = thread_info.item_sort_tab[item_sort_index]->item_content.date_modification;
i.res = date1 == date2;
}
@@ -358,7 +358,7 @@ void thread_sort_tab_run(Info & i)
ezc_generator.SetPattern(*p);
ezc_generator.Generate(item_run_content);
item_print_content(i.out, item_run_content.Str(), thread_info.item_sort_tab[item_sort_index]->content_type);
item_print_content(i.out, item_run_content.Str(), thread_info.item_sort_tab[item_sort_index]->item_content.content_raw_type);
}
else
{
@@ -373,8 +373,8 @@ void thread_sort_tab_has_static_file(Info & i)
{
if( item_sort_index < thread_info.item_sort_tab.size() )
{
i.res = thread_info.item_sort_tab[item_sort_index]->file_type != WINIX_ITEM_FILETYPE_NONE &&
!thread_info.item_sort_tab[item_sort_index]->file_path.empty();
i.res = thread_info.item_sort_tab[item_sort_index]->item_content.file_type != WINIX_ITEM_FILETYPE_NONE &&
!thread_info.item_sort_tab[item_sort_index]->item_content.file_path.empty();
}
}
@@ -382,7 +382,7 @@ void thread_sort_tab_has_static_file(Info & i)
void thread_sort_tab_has_thumb(Info & i)
{
if( item_sort_index < thread_info.item_sort_tab.size() )
i.res = thread_info.item_sort_tab[item_sort_index]->has_thumb;
i.res = thread_info.item_sort_tab[item_sort_index]->item_content.file_has_thumb;
}
@@ -410,21 +410,21 @@ void thread_sort_tab_type_is_symlink(Info & i)
void thread_sort_tab_is_link_to(Info & i)
{
if( item_sort_index < thread_info.item_sort_tab.size() )
i.res = !thread_info.item_sort_tab[item_sort_index]->link_to.empty();
i.res = !thread_info.item_sort_tab[item_sort_index]->item_content.link_to.empty();
}
void thread_sort_tab_link_to(Info & i)
{
if( item_sort_index < thread_info.item_sort_tab.size() )
i.out << thread_info.item_sort_tab[item_sort_index]->link_to;
i.out << thread_info.item_sort_tab[item_sort_index]->item_content.link_to;
}
void thread_sort_tab_is_link_redirect(Info & i)
{
if( item_sort_index < thread_info.item_sort_tab.size() )
i.res = thread_info.item_sort_tab[item_sort_index]->link_redirect == 1;
i.res = thread_info.item_sort_tab[item_sort_index]->item_content.link_redirect == 1;
}
@@ -455,7 +455,7 @@ void thread_sort_tab_last_item_date_modification_nice(Info & i)
if( thread.last_item_id != -1 )
print_date_nice(i, thread.last_item_date_modification);
else
print_date_nice(i, thread_info.item_sort_tab[item_sort_index]->date_modification);
print_date_nice(i, thread_info.item_sort_tab[item_sort_index]->item_content.date_modification);
}
}
}
@@ -476,8 +476,8 @@ void thread_sort_tab_last_item_user(Info & i)
}
else
{
User * puser = system->users.GetUser(thread_info.item_sort_tab[item_sort_index]->user_id);
print_user_name(i, puser, thread_info.item_sort_tab[item_sort_index]->guest_name);
User * puser = system->users.GetUser(thread_info.item_sort_tab[item_sort_index]->item_content.user_id);
print_user_name(i, puser, thread_info.item_sort_tab[item_sort_index]->item_content.guest_name);
}
}
}

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

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2018, Tomasz Sowa
* Copyright (c) 2010-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -99,7 +99,13 @@ void ThreadInfo::RemoveThread(long file_id)
if( tdb->GetAnswers(file_id, remove_answer_id_tab) == WINIX_ERR_OK )
{
for(size_t i=0 ; i<remove_answer_id_tab.size() ; ++i)
db->DelFileById(remove_answer_id_tab[i]);
{
Item item;
item.set_connector(model_connector);
item.id = remove_answer_id_tab[i];
item.remove(); // CHECKME is it correct to set only 'id' and call 'remove'?
//db->DelFileById(remove_answer_id_tab[i]);
}
}
tdb->RemoveThread(file_id);
@@ -116,12 +122,22 @@ void ThreadInfo::RemoveThreadAnswer(long answer_id)
void ThreadInfo::RepairAnswer(long answer_id)
{
iq.Clear();
iq.SetAll(false, false);
iq.WhereId(answer_id);
iq.WhereType(Item::file); // !! moze w przyszlosci pozwolic takze na symlinki?
// iq.Clear();
// iq.SetAll(false, false);
// iq.WhereId(answer_id);
// iq.WhereType(Item::file); // !! moze w przyszlosci pozwolic takze na symlinki?
if( db->GetItem(repair_item, iq) == WINIX_ERR_NO_ITEM )
morm::Finder<Item> finder(model_connector);
repair_item = finder.
select().
where().
eq(L"id", answer_id).
eq(L"type", static_cast<int>(Item::file)).
get();
//if( db->GetItem(repair_item, iq) == WINIX_ERR_NO_ITEM )
if( !repair_item.found() )
{
log << log3 << "ThreadInfo: there is no a file for thread answer_id: " << answer_id << logend;
tdb->RemoveAnswerOnly(answer_id);
@@ -141,12 +157,21 @@ void ThreadInfo::RepairAnswers(long file_id)
void ThreadInfo::Repair(long file_id)
{
iq.Clear();
iq.SetAll(false, false);
iq.WhereId(file_id);
iq.WhereType(Item::file); // !! moze w przyszlosci pozwolic takze na symlinki?
// iq.Clear();
// iq.SetAll(false, false);
// iq.WhereId(file_id);
// iq.WhereType(Item::file); // !! moze w przyszlosci pozwolic takze na symlinki?
if( db->GetItem(repair_item, iq) == WINIX_ERR_NO_ITEM )
morm::Finder<Item> finder(model_connector);
repair_item = finder.
select().
where().
eq(L"id", file_id).
eq(L"type", static_cast<int>(Item::file)).
get();
if( !repair_item.found() )
{
log << log3 << "ThreadInfo: there is no a file for thread file_id: " << file_id << logend;
tdb->RemoveThread(file_id);

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

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2014, Tomasz Sowa
* Copyright (c) 2010-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -36,12 +36,12 @@
#define headerfile_winix_plugins_thread_threadinfo
#include <vector>
#include "core/item.h"
#include "core/system.h"
#include "db/db.h"
#include "thread.h"
#include "tdb.h"
#include "core/winixmodel.h"
#include "models/item.h"
@@ -110,7 +110,7 @@ private:
std::vector<Item*> out_dir_tab;
std::vector<long> remove_answer_id_tab, repair_id_tab, repair_answer_tab;
Item out_item, repair_item;
DbItemQuery iq;
//DbItemQuery iq;
void RepairAnswer(long answer_id);
void RepairAnswers(long file_id);

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

@@ -6,13 +6,12 @@ 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: ../../../../winix/winixd/core/requesttypes.h
createticket.o: ../../../../pikotools/textstream/textstream.h
createticket.o: ../../../../pikotools/space/space.h
createticket.o: ../../../../pikotools/textstream/types.h
createticket.o: ../../../../pikotools/date/date.h
createticket.o: ../../../../pikotools/convert/inttostr.h
createticket.o: ../../../../winix/winixd/core/requesttypes.h
createticket.o: ../../../../pikotools/textstream/textstream.h
createticket.o: ../../../../pikotools/membuffer/membuffer.h
createticket.o: ../../../../pikotools/textstream/types.h
createticket.o: ../../../../pikotools/utf8/utf8.h
@@ -37,7 +36,6 @@ createticket.o: ../../../../winix/winixd/core/lock.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
createticket.o: ../../../../winix/winixd/db/db.h
createticket.o: ../../../../winix/winixd/db/dbbase.h
createticket.o: ../../../../winix/winixd/db/dbitemquery.h
@@ -46,6 +44,23 @@ 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/models/item.h
createticket.o: ../../../../morm/src/model.h
createticket.o: ../../../../morm/src/modelconnector.h
createticket.o: ../../../../morm/src/clearer.h
createticket.o: ../../../../morm/src/dbconnector.h
createticket.o: ../../../../morm/src/queryresult.h
createticket.o: ../../../../morm/src/flatconnector.h
createticket.o: ../../../../morm/src/dbexpression.h
createticket.o: ../../../../morm/src/baseexpression.h
createticket.o: ../../../../morm/src/morm_types.h
createticket.o: ../../../../morm/src/modelenv.h
createticket.o: ../../../../morm/src/modeldata.h
createticket.o: ../../../../morm/src/cursorhelper.h
createticket.o: ../../../../morm/src/finderhelper.h
createticket.o: ../../../../morm/src/fieldvaluehelper.h
createticket.o: ../../../../morm/src/flatexpression.h
createticket.o: ../../../../winix/winixd/models/itemcontent.h
createticket.o: ../../../../winix/winixd/core/ugcontainer.h
createticket.o: ../../../../winix/winixd/core/request.h
createticket.o: ../../../../winix/winixd/core/error.h
@@ -60,22 +75,8 @@ createticket.o: ../../../../winix/winixd/core/basethread.h
createticket.o: ../../../../winix/winixd/core/winixmodel.h
createticket.o: ../../../../winix/winixd/core/plugin.h pluginmsg.h
createticket.o: ../../../../winix/winixd/core/plugindata.h
createticket.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
createticket.o: ../../../../morm/src/model.h
createticket.o: ../../../../morm/src/modelconnector.h
createticket.o: ../../../../morm/src/clearer.h
createticket.o: ../../../../morm/src/dbconnector.h
createticket.o: ../../../../morm/src/queryresult.h
createticket.o: ../../../../morm/src/flatconnector.h
createticket.o: ../../../../morm/src/dbexpression.h
createticket.o: ../../../../morm/src/baseexpression.h
createticket.o: ../../../../morm/src/modelenv.h
createticket.o: ../../../../morm/src/modeldata.h
createticket.o: ../../../../morm/src/cursorhelper.h
createticket.o: ../../../../morm/src/finderhelper.h
createticket.o: ../../../../morm/src/fieldvaluehelper.h
createticket.o: ../../../../morm/src/flatexpression.h
createticket.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
createticket.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h
createticket.o: ../../../../morm/src/cursor.h
createticket.o: ../../../../morm/src/jsonexpression.h
createticket.o: ../../../../morm/src/postgresqlexpression.h
createticket.o: ../../../../morm/src/jsonconnector.h
@@ -110,9 +111,10 @@ createticket.o: ../../../../winix/winixd/templates/patterns.h
createticket.o: ../../../../winix/winixd/templates/locale.h
createticket.o: ../../../../winix/winixd/templates/localefilter.h
createticket.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
createticket.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
createticket.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
createticket.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
createticket.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
createticket.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
createticket.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
createticket.o: ../../../../ezc/src/pattern.h
createticket.o: ../../../../ezc/src/expressionparser.h
createticket.o: ../../../../ezc/src/patternparser.h
createticket.o: ../../../../winix/winixd/notify/notifythread.h
@@ -185,13 +187,12 @@ editticket.o: ../../../../winix/winixd/db/dbconn.h
editticket.o: ../../../../winix/winixd/db/dbtextstream.h
editticket.o: ../../../../winix/winixd/core/textstream.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/textstream/textstream.h
editticket.o: ../../../../pikotools/space/space.h
editticket.o: ../../../../pikotools/textstream/types.h
editticket.o: ../../../../pikotools/date/date.h
editticket.o: ../../../../pikotools/convert/inttostr.h
editticket.o: ../../../../winix/winixd/core/requesttypes.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
@@ -215,7 +216,6 @@ 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
@@ -223,13 +223,13 @@ editticket.o: ../../../../winix/winixd/core/winixmodel.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: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
editticket.o: ../../../../morm/src/model.h
editticket.o: ../../../../morm/src/modelconnector.h
editticket.o: ../../../../morm/src/clearer.h
editticket.o: ../../../../morm/src/dbconnector.h
editticket.o: ../../../../morm/src/queryresult.h
editticket.o: ../../../../morm/src/flatconnector.h
editticket.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
editticket.o: ../../../../morm/src/model.h
editticket.o: ../../../../morm/src/dbexpression.h
editticket.o: ../../../../morm/src/baseexpression.h
editticket.o: ../../../../morm/src/modelenv.h
@@ -253,6 +253,8 @@ 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/models/item.h
editticket.o: ../../../../winix/winixd/models/itemcontent.h
editticket.o: ../../../../winix/winixd/core/ugcontainer.h
editticket.o: ../../../../winix/winixd/core/request.h
editticket.o: ../../../../winix/winixd/core/mounts.h
@@ -284,10 +286,10 @@ editticket.o: ../../../../winix/winixd/templates/patterns.h
editticket.o: ../../../../winix/winixd/templates/locale.h
editticket.o: ../../../../winix/winixd/templates/localefilter.h
editticket.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
editticket.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
editticket.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
editticket.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
editticket.o: ../../../../ezc/src/outstreams.h
editticket.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
editticket.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
editticket.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
editticket.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h
editticket.o: ../../../../ezc/src/expressionparser.h
editticket.o: ../../../../ezc/src/patternparser.h
editticket.o: ../../../../winix/winixd/notify/notifythread.h
@@ -363,13 +365,12 @@ funticket.o: ../../../../winix/winixd/db/dbconn.h
funticket.o: ../../../../winix/winixd/db/dbtextstream.h
funticket.o: ../../../../winix/winixd/core/textstream.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/textstream/textstream.h
funticket.o: ../../../../pikotools/space/space.h
funticket.o: ../../../../pikotools/textstream/types.h
funticket.o: ../../../../pikotools/date/date.h
funticket.o: ../../../../pikotools/convert/inttostr.h
funticket.o: ../../../../winix/winixd/core/requesttypes.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
@@ -393,7 +394,6 @@ 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
@@ -401,13 +401,12 @@ funticket.o: ../../../../winix/winixd/core/winixmodel.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: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
funticket.o: ../../../../morm/src/model.h
funticket.o: ../../../../morm/src/modelconnector.h
funticket.o: ../../../../morm/src/clearer.h
funticket.o: ../../../../morm/src/dbconnector.h
funticket.o: ../../../../morm/src/queryresult.h
funticket.o: ../../../../morm/src/flatconnector.h
funticket.o: ../../../../morm/src/flatconnector.h ../../../../morm/src/morm.h
funticket.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
funticket.o: ../../../../morm/src/dbexpression.h
funticket.o: ../../../../morm/src/baseexpression.h
funticket.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
@@ -430,6 +429,8 @@ 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/models/item.h
funticket.o: ../../../../winix/winixd/models/itemcontent.h
funticket.o: ../../../../winix/winixd/core/ugcontainer.h
funticket.o: ../../../../winix/winixd/core/request.h
funticket.o: ../../../../winix/winixd/core/mounts.h
@@ -461,10 +462,10 @@ funticket.o: ../../../../winix/winixd/templates/patterns.h
funticket.o: ../../../../winix/winixd/templates/locale.h
funticket.o: ../../../../winix/winixd/templates/localefilter.h
funticket.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
funticket.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
funticket.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
funticket.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
funticket.o: ../../../../ezc/src/outstreams.h
funticket.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
funticket.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
funticket.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
funticket.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h
funticket.o: ../../../../ezc/src/expressionparser.h
funticket.o: ../../../../ezc/src/patternparser.h
funticket.o: ../../../../winix/winixd/notify/notifythread.h
@@ -539,13 +540,12 @@ init.o: ../../../../winix/winixd/db/dbconn.h
init.o: ../../../../winix/winixd/db/dbtextstream.h
init.o: ../../../../winix/winixd/core/textstream.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/textstream/textstream.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/date/date.h
init.o: ../../../../pikotools/convert/inttostr.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
@@ -568,18 +568,17 @@ 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 ../../../../morm/src/morm.h
init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
init.o: ../../../../winix/winixd/core/winixbase.h
init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
init.o: ../../../../morm/src/flatconnector.h
init.o: ../../../../morm/src/flatconnector.h ../../../../morm/src/morm.h
init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
init.o: ../../../../morm/src/dbexpression.h
init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
@@ -599,6 +598,8 @@ 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/models/item.h
init.o: ../../../../winix/winixd/models/itemcontent.h
init.o: ../../../../winix/winixd/core/ugcontainer.h
init.o: ../../../../winix/winixd/core/request.h
init.o: ../../../../winix/winixd/core/mounts.h
@@ -630,10 +631,10 @@ init.o: ../../../../winix/winixd/templates/patterns.h
init.o: ../../../../winix/winixd/templates/locale.h
init.o: ../../../../winix/winixd/templates/localefilter.h
init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
init.o: ../../../../ezc/src/outstreams.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
init.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h
init.o: ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/patternparser.h
init.o: ../../../../winix/winixd/notify/notifythread.h
@@ -719,13 +720,12 @@ showtickets.o: ../../../../winix/winixd/db/dbconn.h
showtickets.o: ../../../../winix/winixd/db/dbtextstream.h
showtickets.o: ../../../../winix/winixd/core/textstream.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/textstream/textstream.h
showtickets.o: ../../../../pikotools/space/space.h
showtickets.o: ../../../../pikotools/textstream/types.h
showtickets.o: ../../../../pikotools/date/date.h
showtickets.o: ../../../../pikotools/convert/inttostr.h
showtickets.o: ../../../../winix/winixd/core/requesttypes.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
@@ -749,7 +749,6 @@ 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
@@ -757,13 +756,13 @@ showtickets.o: ../../../../winix/winixd/core/winixmodel.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: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
showtickets.o: ../../../../morm/src/model.h
showtickets.o: ../../../../morm/src/modelconnector.h
showtickets.o: ../../../../morm/src/clearer.h
showtickets.o: ../../../../morm/src/dbconnector.h
showtickets.o: ../../../../morm/src/queryresult.h
showtickets.o: ../../../../morm/src/flatconnector.h
showtickets.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
showtickets.o: ../../../../morm/src/model.h
showtickets.o: ../../../../morm/src/dbexpression.h
showtickets.o: ../../../../morm/src/baseexpression.h
showtickets.o: ../../../../morm/src/modelenv.h
@@ -787,6 +786,8 @@ 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/models/item.h
showtickets.o: ../../../../winix/winixd/models/itemcontent.h
showtickets.o: ../../../../winix/winixd/core/ugcontainer.h
showtickets.o: ../../../../winix/winixd/core/request.h
showtickets.o: ../../../../winix/winixd/core/mounts.h
@@ -818,10 +819,10 @@ showtickets.o: ../../../../winix/winixd/templates/patterns.h
showtickets.o: ../../../../winix/winixd/templates/locale.h
showtickets.o: ../../../../winix/winixd/templates/localefilter.h
showtickets.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
showtickets.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
showtickets.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
showtickets.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
showtickets.o: ../../../../ezc/src/outstreams.h
showtickets.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
showtickets.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
showtickets.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
showtickets.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h
showtickets.o: ../../../../ezc/src/expressionparser.h
showtickets.o: ../../../../ezc/src/patternparser.h
showtickets.o: ../../../../winix/winixd/notify/notifythread.h
@@ -896,13 +897,12 @@ tdb.o: ../../../../winix/winixd/db/dbconn.h
tdb.o: ../../../../winix/winixd/db/dbtextstream.h
tdb.o: ../../../../winix/winixd/core/textstream.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/textstream/textstream.h
tdb.o: ../../../../pikotools/space/space.h
tdb.o: ../../../../pikotools/textstream/types.h
tdb.o: ../../../../pikotools/date/date.h
tdb.o: ../../../../pikotools/convert/inttostr.h
tdb.o: ../../../../winix/winixd/core/requesttypes.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
@@ -926,15 +926,14 @@ 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: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
templates.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
templates.o: ../../../../pikotools/utf8/utf8.h
templates.o: ../../../../pikotools/textstream/textstream.h
templates.o: ../../../../pikotools/space/space.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../pikotools/date/date.h
templates.o: ../../../../pikotools/convert/inttostr.h
templates.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
templates.o: ../../../../pikotools/utf8/utf8.h
templates.o: ../../../../pikotools/textstream/textstream.h
templates.o: ../../../../pikotools/membuffer/membuffer.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
@@ -943,7 +942,6 @@ templates.o: ../../../../ezc/src/expressionparser.h
templates.o: ../../../../ezc/src/patternparser.h
templates.o: ../../../../pikotools/log/log.h
templates.o: ../../../../pikotools/log/filelog.h ticketinfo.h ticket.h
templates.o: ../../../../winix/winixd/core/item.h
templates.o: ../../../../winix/winixd/core/system.h
templates.o: ../../../../winix/winixd/core/job.h
templates.o: ../../../../winix/winixd/core/basethread.h
@@ -962,13 +960,12 @@ 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: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
templates.o: ../../../../morm/src/model.h
templates.o: ../../../../morm/src/modelconnector.h
templates.o: ../../../../morm/src/clearer.h
templates.o: ../../../../morm/src/dbconnector.h
templates.o: ../../../../morm/src/queryresult.h
templates.o: ../../../../morm/src/flatconnector.h
templates.o: ../../../../morm/src/flatconnector.h ../../../../morm/src/morm.h
templates.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
templates.o: ../../../../morm/src/dbexpression.h
templates.o: ../../../../morm/src/baseexpression.h
templates.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
@@ -991,6 +988,8 @@ 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/models/item.h
templates.o: ../../../../winix/winixd/models/itemcontent.h
templates.o: ../../../../winix/winixd/core/ugcontainer.h
templates.o: ../../../../winix/winixd/core/request.h
templates.o: ../../../../winix/winixd/core/mounts.h
@@ -1113,8 +1112,7 @@ templates.o: ../../../../winix/winixd/functions/rm.h
templates.o: ../../../../winix/winixd/plugins/thread/pluginmsg.h
templates.o: ../../../../winix/winixd/templates/miscspace.h
templates.o: ../../../../winix/winixd/templates/templates.h
ticketinfo.o: ticketinfo.h ticket.h ../../../../winix/winixd/core/item.h
ticketinfo.o: ../../../../winix/winixd/core/system.h
ticketinfo.o: ticketinfo.h ticket.h ../../../../winix/winixd/core/system.h
ticketinfo.o: ../../../../winix/winixd/core/job.h
ticketinfo.o: ../../../../winix/winixd/core/basethread.h
ticketinfo.o: ../../../../winix/winixd/core/synchro.h
@@ -1141,13 +1139,13 @@ 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: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
ticketinfo.o: ../../../../morm/src/model.h
ticketinfo.o: ../../../../morm/src/modelconnector.h
ticketinfo.o: ../../../../morm/src/clearer.h
ticketinfo.o: ../../../../morm/src/dbconnector.h
ticketinfo.o: ../../../../morm/src/queryresult.h
ticketinfo.o: ../../../../morm/src/flatconnector.h
ticketinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
ticketinfo.o: ../../../../morm/src/model.h
ticketinfo.o: ../../../../morm/src/dbexpression.h
ticketinfo.o: ../../../../morm/src/baseexpression.h
ticketinfo.o: ../../../../morm/src/modelenv.h
@@ -1164,7 +1162,6 @@ ticketinfo.o: ../../../../morm/src/jsonconnector.h
ticketinfo.o: ../../../../morm/src/postgresqlconnector.h
ticketinfo.o: ../../../../morm/src/postgresqlqueryresult.h
ticketinfo.o: ../../../../winix/winixd/core/dirs.h
ticketinfo.o: ../../../../winix/winixd/core/item.h
ticketinfo.o: ../../../../winix/winixd/core/dircontainer.h
ticketinfo.o: ../../../../winix/winixd/db/db.h
ticketinfo.o: ../../../../winix/winixd/db/dbbase.h
@@ -1173,6 +1170,8 @@ 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/models/item.h
ticketinfo.o: ../../../../winix/winixd/models/itemcontent.h
ticketinfo.o: ../../../../winix/winixd/core/ugcontainer.h
ticketinfo.o: ../../../../winix/winixd/core/request.h
ticketinfo.o: ../../../../winix/winixd/core/mounts.h
@@ -1204,10 +1203,10 @@ ticketinfo.o: ../../../../winix/winixd/templates/patterns.h
ticketinfo.o: ../../../../winix/winixd/templates/locale.h
ticketinfo.o: ../../../../winix/winixd/templates/localefilter.h
ticketinfo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
ticketinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
ticketinfo.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
ticketinfo.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
ticketinfo.o: ../../../../ezc/src/outstreams.h
ticketinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
ticketinfo.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
ticketinfo.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
ticketinfo.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/outstreams.h
ticketinfo.o: ../../../../ezc/src/expressionparser.h
ticketinfo.o: ../../../../ezc/src/patternparser.h
ticketinfo.o: ../../../../winix/winixd/core/misc.h

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

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2014, Tomasz Sowa
* Copyright (c) 2008-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -112,7 +112,7 @@ void CreateTicket::Submit(Ticket & ticket, Item & item)
return;
functions->SetUser(item);
item.privileges = system->NewFilePrivileges();
item.item_content.privileges = system->NewFilePrivileges();
item.parent_id = cur->request->dir_tab.back()->id;
plugin->Call(WINIX_PL_TICKET_PREPARE_TO_ADD_TICKET, &item, &ticket);

11
winixd/plugins/ticket/editticket.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2018, Tomasz Sowa
* Copyright (c) 2008-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -182,7 +182,7 @@ PT::Space & EditTicket::PrepareSpace()
if( is_new )
{
PT::Space * ticket_space = cur->request->item.meta.FindSpace(L"ticket");
PT::Space * ticket_space = cur->request->item.item_content.meta.FindSpace(L"ticket");
if( ticket_space )
{
@@ -198,13 +198,14 @@ return new_space;
bool EditTicket::CloseTicket()
{
PT::Space & ticket_space = cur->request->item.ameta.FindAddSpace(L"ticket");
PT::Space & ticket_space = cur->request->item.item_content.meta_admin.FindAddSpace(L"ticket");
ticket_space.Add(L"closed", true);
PT::Space & thread_space = cur->request->item.ameta.FindAddSpace(L"thread");
PT::Space & thread_space = cur->request->item.item_content.meta_admin.FindAddSpace(L"thread");
thread_space.Add(L"closed", true);
if( db->EditAdminMetaById(cur->request->item.ameta, cur->request->item.id) == WINIX_ERR_OK )
//if( db->EditAdminMetaById(cur->request->item.ameta, cur->request->item.id) == WINIX_ERR_OK )
if( cur->request->item.update(false, true) )
{
log << log3 << "EditTicket: closing ticket" << logend;
return true;

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

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2018, Tomasz Sowa
* Copyright (c) 2010-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -89,7 +89,7 @@ bool ShowTickets::Sort::operator()(const Item * item1, const Item * item2)
if( item1->sort_index != item2->sort_index )
return item1->sort_index < item2->sort_index;
return item1->date_creation > item2->date_creation;
return item1->item_content.date_creation > item2->item_content.date_creation;
}
}
@@ -99,23 +99,33 @@ bool ShowTickets::Sort::operator()(const Item * item1, const Item * item2)
void ShowTickets::ReadFiles(long dir_id)
{
// reading files
DbItemQuery iq;
iq.SetAll(false, false);
iq.sel_url = true;
iq.sel_subject = true;
iq.sel_date = true;
iq.sel_user_id = true;
iq.sel_group_id = true;
iq.sel_guest_name = true;
iq.sel_privileges = true;
iq.sel_date = true;
iq.sel_meta = true;
iq.sel_sort_index = true;
iq.WhereParentId(dir_id);
iq.WhereType(Item::file);
iq.WhereFileType(WINIX_ITEM_FILETYPE_NONE);
// DbItemQuery iq;
// iq.SetAll(false, false);
// iq.sel_url = true;
// iq.sel_subject = true;
// iq.sel_date = true;
// iq.sel_user_id = true;
// iq.sel_group_id = true;
// iq.sel_guest_name = true;
// iq.sel_privileges = true;
// iq.sel_date = true;
// iq.sel_meta = true;
// iq.sel_sort_index = true;
// iq.WhereParentId(dir_id);
// iq.WhereType(Item::file);
// iq.WhereFileType(WINIX_ITEM_FILETYPE_NONE);
db->GetItems(ticket_info->item_tab, iq);
morm::Finder<Item> finder(model_connector);
finder.
select().
where().
eq(L"parent_id", dir_id).
eq(L"type", static_cast<int>(Item::file)).
eq(L"content.file_type", WINIX_ITEM_FILETYPE_NONE).
get_vector(ticket_info->item_tab);
//db->GetItems(ticket_info->item_tab, iq);
system->CheckAccessToItems(ticket_info->item_tab);
}

5
winixd/plugins/ticket/showtickets.h
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2014, Tomasz Sowa
* Copyright (c) 2010-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -37,8 +37,9 @@
#include "tdb.h"
#include "ticketinfo.h"
#include "core/item.h"
#include "functions/functionbase.h"
#include "models/item.h"
namespace Winix
{

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

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2018, Tomasz Sowa
* Copyright (c) 2008-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -307,12 +307,12 @@ void ticket_is_creating_new(Info & i)
void ticket_meta_value(Info & i)
{
if( ticket_info.item )
space_value(i, ticket_info.item->meta);
space_value(i, ticket_info.item->item_content.meta);
}
void ticket_is_closed(Info & i)
{
PT::Space * ticket_space = ticket_info.item->ameta.FindSpace(L"ticket");
PT::Space * ticket_space = ticket_info.item->item_content.meta_admin.FindSpace(L"ticket");
if( ticket_space )
i.res = ticket_space->Bool(L"closed", false);
@@ -343,7 +343,7 @@ void ticket_param_value_for_param_id(Info & i)
if( ticket_info.ticket && ticket_info.item )
{
find_ticket_value(value_for_param_id, ticket_info.ticket->par_tab, ticket_info.item->meta);
find_ticket_value(value_for_param_id, ticket_info.ticket->par_tab, ticket_info.item->item_content.meta);
ticket_print_value(i, value_for_param_id);
}
@@ -378,7 +378,7 @@ void ticket_does_param_id_have_value(Info & i)
if( ticket_info.ticket && ticket_info.item )
{
find_ticket_value(value_for_param_id, ticket_info.ticket->par_tab, ticket_info.item->meta);
find_ticket_value(value_for_param_id, ticket_info.ticket->par_tab, ticket_info.item->item_content.meta);
if( value_for_param_id.is_value )
{
@@ -545,7 +545,7 @@ void tickets_tab_is_closed(Info & i)
if( tickets_value.is_item )
{
PT::Space * ticket_space = tickets_value.item->ameta.FindSpace(L"ticket");
PT::Space * ticket_space = tickets_value.item->item_content.meta_admin.FindSpace(L"ticket");
if( ticket_space )
i.res = ticket_space->Bool(L"closed", false);
@@ -587,7 +587,7 @@ void tickets_tab_meta_value(Info & i)
tickets_tab_check_reqid();
if( tickets_value.is_item )
space_value(i, tickets_value.item->meta);
space_value(i, tickets_value.item->item_content.meta);
}
@@ -599,7 +599,7 @@ void tickets_tab_date_creation(Info & i)
tickets_tab_check_reqid();
if( tickets_value.is_item )
i.out << tickets_value.item->date_creation;
i.out << tickets_value.item->item_content.date_creation;
}
@@ -609,7 +609,7 @@ void tickets_tab_date_creation_nice(Info & i)
tickets_tab_check_reqid();
if( tickets_value.is_item )
print_date_nice(i, tickets_value.item->date_creation);
print_date_nice(i, tickets_value.item->item_content.date_creation);
}
@@ -637,7 +637,7 @@ void tickets_tab_param_value_for_param_id(Info & i)
value_for_param_id.config_par = space.spaces[param_index];
value_for_param_id.param_id = value_for_param_id.config_par->Long(L"id");
find_ticket_value(value_for_param_id, tickets_value.ticket->par_tab, tickets_value.item->meta);
find_ticket_value(value_for_param_id, tickets_value.ticket->par_tab, tickets_value.item->item_content.meta);
ticket_print_value(i, value_for_param_id);
break;
@@ -670,7 +670,7 @@ void tickets_tab_does_param_id_have_value(Info & i)
value_for_param_id.config_par = space.spaces[param_index];
value_for_param_id.param_id = value_for_param_id.config_par->Long(L"id");
find_ticket_value(value_for_param_id, tickets_value.ticket->par_tab, tickets_value.item->meta);
find_ticket_value(value_for_param_id, tickets_value.ticket->par_tab, tickets_value.item->item_content.meta);
if( value_for_param_id.is_value )
{
@@ -712,7 +712,7 @@ void tickets_tab_conf_tab(Info & i)
value.is_param = true;
value.config_par = space.spaces[conf_index];
value.param_id = value.config_par->Long(L"id");
find_ticket_value(value, tickets_value.ticket->par_tab, tickets_value.item->meta);
find_ticket_value(value, tickets_value.ticket->par_tab, tickets_value.item->item_content.meta);
}
}
}
@@ -925,7 +925,7 @@ void ticket_tab(Info & i)
value.param_id = value.config_par->Long(L"id");
if( ticket_info.ticket && ticket_info.item )
find_ticket_value(value, ticket_info.ticket->par_tab, ticket_info.item->meta);
find_ticket_value(value, ticket_info.ticket->par_tab, ticket_info.item->item_content.meta);
}
}

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

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2018, Tomasz Sowa
* Copyright (c) 2010-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -169,7 +169,7 @@ bool TicketInfo::ParseTicketConf(long mount_dir_id, const std::wstring & path)
conf_parser.SetSpace(conf_tab[mount_dir_id].conf);
conf_tab[mount_dir_id].conf.Clear();
return (conf_parser.ParseString(config_file.content) == PT::SpaceParser::ok);
return (conf_parser.ParseString(config_file.item_content.content_raw) == PT::SpaceParser::ok);
}
@@ -394,8 +394,8 @@ void TicketInfo::ReadTicketValue(PT::Space & space,
file.Clear(); // clearing and setting date
file.parent_id = upload_dir.id;
file.type = Item::file;
file.privileges = system->NewFilePrivileges();
file.file_type = SelectFileType(value.filename);
file.item_content.privileges = system->NewFilePrivileges();
file.item_content.file_type = SelectFileType(value.filename);
file.url = value.filename;
functions->PrepareUrl(file);
functions->SetUser(file);
@@ -406,7 +406,7 @@ void TicketInfo::ReadTicketValue(PT::Space & space,
PT::Space & space = FindAddMetaByParam(meta, param_id);
PT::Space & file_space = space.AddSpace(L"file");
if( file.file_type == WINIX_ITEM_FILETYPE_IMAGE )
if( file.item_content.file_type == WINIX_ITEM_FILETYPE_IMAGE )
file_space.Add(L"type", L"image");
else
file_space.Add(L"type", L"file");
@@ -616,7 +616,7 @@ void TicketInfo::RemoveTicket(long file_id)
void TicketInfo::CopyTicketSpace(PT::Space & ticket_space, Item & item)
{
PT::Space & ticket_meta = item.meta.FindAddSpace(L"ticket");
PT::Space & ticket_meta = item.item_content.meta.FindAddSpace(L"ticket");
ticket_meta = ticket_space;
ticket_meta.name = L"ticket";
}

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

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2010-2018, Tomasz Sowa
* Copyright (c) 2010-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -37,13 +37,13 @@
#include <vector>
#include "ticket.h"
#include "core/item.h"
#include "core/system.h"
#include "functions/functions.h"
#include "db/db.h"
#include "tdb.h"
#include "space/spaceparser.h"
#include "core/winixmodel.h"
#include "models/item.h"
namespace Winix