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

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);