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

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