fixed: find_ticket_value (in plugins/ticket/templates.cpp)

should find the first item (can be more than one item with the same 'param')

fixed: added sorting tickets params in ReadTicketParams() (in plugins/ticket/ticketinfo.cpp)

fixed: plugin should have its own 'PluginInfo info' struct
a plugin's function can call another plugin's functions

added: removing tickets files/images

added: removing threads

changed: rm function will call WINIX_FILE_REMOVED now when deleting directories





git-svn-id: svn://ttmath.org/publicrep/winix/trunk@710 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa 2011-01-23 23:23:24 +00:00
parent 915cabdf97
commit 3071df227a
47 changed files with 418 additions and 222 deletions

View File

@ -55,9 +55,9 @@ public:
std::vector<Item*> & out_dir_tab, std::wstring & out_item);
static void SplitPath(const std::wstring & path, std::wstring & dir, std::wstring & file);
DirContainer::ParentIterator FindFirstChild(long parent_id); // !! zmienic w koncu nazwe na FindFirstChild
DirContainer::ParentIterator FindFirstChild(long parent_id);
DirContainer::ParentIterator NextChild(DirContainer::ParentIterator i);
DirContainer::ParentIterator ParentEnd();
DirContainer::ParentIterator ParentEnd(); // !! pozostalo do zamiany na child
// these methods return null if there is no such a dir

View File

@ -184,6 +184,7 @@ void Plugin::LoadPlugin(const char * filename)
Fun1 fun_init;
void * plugin_handle;
int old_current_plugin;
PluginInfo info;
if( !SetPointers(info) )
return;
@ -244,7 +245,7 @@ bool Plugin::HasPlugin(const std::wstring & name)
void Plugin::Call(int message, Slots::iterator & slot)
void Plugin::Call(int message, Slots::iterator & slot, PluginInfo & info)
{
if( !SetPointers(info) )
return;
@ -295,6 +296,7 @@ void Plugin::Call(int message, void * p1_, void * p2_, long l1_, long l2_)
int ret_false_loc = 0;
int ret_true_loc = 0;
int old_current_plugin = current_plugin;
PluginInfo info;
Slots::iterator i = slots.lower_bound(message);
@ -306,7 +308,7 @@ int old_current_plugin = current_plugin;
info.l1 = l1_;
info.l2 = l2_;
Call(message, i);
Call(message, i, info);
if( info.res )
++ret_true_loc;

View File

@ -202,12 +202,10 @@ private:
typedef std::multimap<int, Slot> Slots;
Slots slots;
PluginInfo info;
std::string afilename;
void * LoadInitFun(const char * filename, Fun1 & fun_init);
void Call(int message, Slots::iterator & slot);
void Call(int message, Slots::iterator & slot, PluginInfo & info);
bool SetPointers(PluginInfo & info);
};

View File

@ -56,8 +56,9 @@
// the is not any session available (cur->session is null)
#define WINIX_CLOSE 3004
// item was removed (rm function)
// a file or symlink was removed (rm function)
// PluginInfo::l1 is the file (item) id
// !! moze zmienic nazwe i dodac symlink w nazwie?
#define WINIX_FILE_REMOVED 3005
// directory was removed (rm function)

View File

@ -13,7 +13,7 @@
#define WINIX_VER_MAJOR 0
#define WINIX_VER_MINOR 4
#define WINIX_VER_REVISION 5
#define WINIX_VER_REVISION 6
#endif

View File

@ -433,9 +433,8 @@ long Db::GetContentId(long item_id)
if( Rows(r) == 1 && Cols(r) == 1 )
result = AssertValueLong(r, 0, 0);
}
catch(const Error & e)
catch(const Error)
{
result = e;
}
ClearResult(r);
@ -1204,16 +1203,18 @@ return EndTrans(result);
Error Db::DelItemDelItem(const Item & item)
Error Db::DelItemDelItem(long item_id, int type)
{
PGresult * r = 0;
PGresult * r = 0;
Error result = WINIX_ERR_OK;
try
{
query.Clear();
query << R("delete from core.item where id=")
<< item.id
<< item_id
<< R(" and type=")
<< type
<< R(";");
r = AssertQuery(query);
@ -1234,20 +1235,20 @@ return result;
Error Db::DelItemDelContent(const Item & item)
Error Db::DelItemDelContent(long content_id)
{
PGresult * r = 0;
Error result = WINIX_ERR_OK;
try
{
result = DecrementContentRef(item.content_id);
result = DecrementContentRef(content_id);
if( result == WINIX_ERR_OK )
{
query.Clear();
query << R("delete from core.content where ref=0 and id=")
<< item.content_id
<< content_id
<< R(";");
r = AssertQuery(query);
@ -1278,17 +1279,17 @@ Error result = WINIX_ERR_NO_ITEM;
if( item.type == Item::file )
{
BeginTrans();
result = DelItemDelContent(item);
result = DelItemDelContent(item.content_id);
if( result == WINIX_ERR_OK )
result = DelItemDelItem(item);
result = DelItemDelItem(item.id, 1);
result = EndTrans(result);
}
else
if( item.type == Item::symlink )
{
result = DelItemDelItem(item);
result = DelItemDelItem(item.id, 2);
}
else
if( item.type == Item::dir )
@ -1302,6 +1303,33 @@ return result;
Error Db::DelFileById(long file_id)
{
Error result = WINIX_ERR_NO_ITEM;
BeginTrans();
long content_id = GetContentId(file_id);
if( content_id != -1 )
{
result = DelItemDelContent(content_id);
if( result == WINIX_ERR_OK )
result = DelItemDelItem(file_id, 1);
}
result = EndTrans(result);
return result;
}
Error Db::DelSymlinkById(long symlink_id)
{
return DelItemDelItem(symlink_id, 2);
}
void Db::GetDirs(DirContainer & dir_tab)

View File

@ -60,7 +60,10 @@ public:
Error EditParentUrlById(Item & item, long id);
Error EditFileById(const Item & item, long id); // file_path, file_fs, file_type
Error EditHasThumbById(bool has_thumb, long id);
Error DelDirById(long id);
Error DelFileById(long file_id);
Error DelSymlinkById(long symlink_id);
Error EditSubjectById(Item & item, long id);
@ -106,8 +109,8 @@ protected:
PGresult * GetItemsQuery(const DbItemQuery & iq, bool skip_other_sel = false);
Error DelItemDelItem(const Item & item);
Error DelItemDelContent(const Item & item);
Error DelItemDelItem(long item_id, int type);
Error DelItemDelContent(long content_id);
Error IncrementContentRef(long content_id);
Error DecrementContentRef(long content_id);

View File

@ -422,7 +422,7 @@ Error DbBase::EndTrans(Error err)
}
else
{
// we returned the old err code
// we return the old err code
RollbackTrans();
}

View File

@ -76,20 +76,20 @@ return true;
void Rm::Prepare()
{
// selecting files and symlinks (without directories)
content_dir_iq.SetAll(false, false);
content_dir_iq.sel_parent_id = true;
content_dir_iq.sel_type = true;
content_dir_iq.sel_url = true;
content_dir_iq.sel_file = true;
content_dir_iq.WhereType(Item::dir, false);
static_iq.SetAll(false, false);
static_iq.sel_parent_id = true;
static_iq.sel_type = true;
static_iq.sel_url = true;
static_iq.sel_file = true;
static_iq.WhereType(Item::file);
static_iq.WhereFileType(WINIX_ITEM_FILETYPE_NONE, false);
// selecting files, symlinks and directories
content_dir_iq2.SetAll(false, false);
content_dir_iq2.sel_parent_id = true;
content_dir_iq2.sel_type = true;
content_dir_iq2.sel_url = true;
content_dir_iq2.sel_file = true;
}
@ -147,16 +147,31 @@ void Rm::RemoveFileOrSymlink(Item & item)
TemplatesFunctions::pattern_cacher.DeletePattern(item);
plugin.Call(WINIX_FILE_REMOVED, item.id);
// !! nie potrzebne
//db->EditThreadRemoveItem(item.parent_id);
if( item.file_type != WINIX_ITEM_FILETYPE_NONE )
RemoveStaticFile(item);
}
else
}
// for other uses (plugins etc)
void Rm::RemoveItemById(long item_id)
{
// selecting files, symlinks and directories
rm_by_id_iq.SetAll(false, false);
rm_by_id_iq.sel_parent_id = true;
rm_by_id_iq.sel_type = true;
rm_by_id_iq.sel_url = true;
rm_by_id_iq.sel_file = true;
rm_by_id_iq.WhereId(item_id);
if( db->GetItem(rm_by_id_item, rm_by_id_iq) == WINIX_ERR_OK )
{
// cur->request->status = WINIX_ERR_NO_ITEM;
if( rm_by_id_item.type == Item::dir )
RemoveDir(rm_by_id_item);
else
RemoveFileOrSymlink(rm_by_id_item);
}
}
@ -175,19 +190,15 @@ void Rm::RemoveDirTree(long dir_id)
plugin.Call(WINIX_DIR_PREPARE_TO_REMOVE, dir_id);
static_iq.WhereParentId(dir_id);
db->GetItems(static_item_tab, static_iq);
content_dir_iq.WhereParentId(dir_id);
db->GetItems(content_item_tab, content_dir_iq);
for(size_t i=0 ; i<static_item_tab.size() ; ++i)
RemoveStaticFile(static_item_tab[i]);
for(size_t i=0 ; i<content_item_tab.size() ; ++i)
RemoveFileOrSymlink(content_item_tab[i]);
if( db->DelDirById(dir_id) == WINIX_ERR_OK )
{
system->dirs.DelDir(dir_id);
// !! nie potrzebne
//db->RemoveThread(dir_id);
plugin.Call(WINIX_DIR_REMOVED, dir_id);
}
}
@ -215,6 +226,21 @@ void Rm::RemoveFile()
void Rm::RemoveDirContent(const Item & dir)
{
content_dir_iq2.WhereParentId(dir.id);
db->GetItems(content_item_tab2, content_dir_iq2);
for(size_t i=0 ; i<content_item_tab2.size() ; ++i)
{
if( content_item_tab2[i].type == Item::dir )
RemoveDir(content_item_tab2[i]);
else
RemoveFileOrSymlink(content_item_tab2[i]);
}
}
void Rm::RemoveDirContent()
{
if( !cur->request->IsParam(L"r") )
@ -223,16 +249,7 @@ void Rm::RemoveDirContent()
return;
}
content_dir_iq.WhereParentId(cur->request->dir_tab.back()->id);
db->GetItems(item_tab, content_dir_iq);
for(size_t i=0 ; i<item_tab.size() ; ++i)
{
if( item_tab[i].type == Item::dir )
RemoveDir(item_tab[i]);
else
RemoveFileOrSymlink(item_tab[i]);
}
RemoveDirContent(*cur->request->dir_tab.back());
if( cur->request->status == WINIX_ERR_OK )
system->RedirectToLastDir();
@ -261,8 +278,8 @@ void Rm::RemoveDir()
void Rm::Clear()
{
static_item_tab.clear();
item_tab.clear();
content_item_tab.clear();
content_item_tab2.clear();
}

View File

@ -26,25 +26,34 @@ public:
bool HasAccess();
void MakePost();
void RemoveDir(const Item & dir);
void RemoveDirContent(const Item & dir);
void RemoveFileOrSymlink(Item & item);
// removing either a directory or a symlink or a file
void RemoveItemById(long item_id);
private:
// for static files
DbItemQuery static_iq;
std::vector<Item> static_item_tab;
// for deleting content in a directory (files and symlinks)
DbItemQuery content_dir_iq;
std::vector<Item> content_item_tab;
std::wstring path;
// for directory content
DbItemQuery content_dir_iq;
std::vector<Item> item_tab;
// for deleting content in a directory (files, symlinks and directories)
DbItemQuery content_dir_iq2;
std::vector<Item> content_item_tab2;
// for logging
std::wstring old_url;
// for removing an item by id
DbItemQuery rm_by_id_iq;
Item rm_by_id_item;
bool HasAccess(const Item & item);
void Prepare();
void Clear();
void RemoveFileOrSymlink(Item & item);
void RemoveDir(const Item & dir);
bool RemoveStaticFile(const std::wstring & path);
void RemoveStaticFile(Item & item);
void RemoveDirTree(long dir_id);

View File

@ -9,22 +9,32 @@
[end]
<div class="threadbox">
[if item_can_write]<a class="threadedit" href="[item_link]/emacs" rel="nofollow">\[{edit}\]</a>[end]
[if mount_thread_arg_is "subject"]<h2[if mount_thread_arg_is "info"] class="withinfo"[end]>[item_subject]</h2>[end]
[if mount_thread_arg_is "info"][include "item_info.html"][end]
[item_print_content]
</div>
[if-no thread_mount_arg_is "sort_desc"]
<div class="threadbox">
[if item_can_write]<a class="threadedit" href="[item_link]/emacs" rel="nofollow">\[{edit}\]</a>[end]
[if thread_mount_arg_is "subject"]<h2[if thread_mount_arg_is "info"] class="withinfo"[end]>[item_subject]</h2>[end]
[if thread_mount_arg_is "info"][include "item_info.html"][end]
[item_print_content]
</div>
[end]
[for thread_sort_tab]
<div class="threadbox[if-index even] threadboxcolor[end]">
[if thread_sort_tab_can_write]<a class="threadedit" href="[thread_sort_tab_link]/emacs" rel="nofollow">\[{edit}\]</a>[end]
[if mount_thread_arg_is "subject"]<h2[if mount_thread_arg_is "info"] class="withinfo"[end]>[thread_sort_tab_subject]</h2>[end]
[if mount_thread_arg_is "info"][include "thread_sort_tab_info.html"][end]
[if thread_mount_arg_is "subject"]<h2[if thread_mount_arg_is "info"] class="withinfo"[end]>[thread_sort_tab_subject]</h2>[end]
[if thread_mount_arg_is "info"][include "thread_sort_tab_info.html"][end]
[thread_sort_tab_print_content]
</div>
[end]
[if thread_mount_arg_is "sort_desc"]
<div class="threadbox">
[if item_can_write]<a class="threadedit" href="[item_link]/emacs" rel="nofollow">\[{edit}\]</a>[end]
[if thread_mount_arg_is "subject"]<h2[if thread_mount_arg_is "info"] class="withinfo"[end]>[item_subject]</h2>[end]
[if thread_mount_arg_is "info"][include "item_info.html"][end]
[item_print_content]
</div>
[end]

View File

@ -36,21 +36,23 @@
</div>
[if thread_can_reply]
<ul class="itemmenu">
<li><a href="[doc_base_url][dir][item_url]/reply" rel="nofollow">{thread_reply_in_this_thread}</a></li>
</ul>
[if winix_has_plugin "thread"]
[if thread_can_reply]
<ul class="itemmenu">
<li><a href="[doc_base_url][dir][item_url]/reply" rel="nofollow">{thread_reply_in_this_thread}</a></li>
</ul>
[end]
[for thread_sort_tab]
<div class="threadbox[if-index odd] threadboxcolor[end]">
[if thread_sort_tab_can_write]<a class="threadedit" href="[thread_sort_tab_link]/emacs" rel="nofollow">\[{edit}\]</a>[end]
[if thread_mount_arg_is "subject"]<h2[if thread_mount_arg_is "info"] class="withinfo"[end]>[thread_sort_tab_subject]</h2>[end]
[if thread_mount_arg_is "info"][include "thread_sort_tab_info.html"][end]
[thread_sort_tab_print_content]
</div>
[end]
[end]
[for thread_sort_tab]
<div class="threadbox[if-index even] threadboxcolor[end]">
[if thread_sort_tab_can_write]<a class="threadedit" href="[thread_sort_tab_link]/emacs" rel="nofollow">\[{edit}\]</a>[end]
[if mount_thread_arg_is "subject"]<h2[if mount_thread_arg_is "info"] class="withinfo"[end]>[thread_sort_tab_subject]</h2>[end]
[if mount_thread_arg_is "info"][include "thread_sort_tab_info.html"][end]
[thread_sort_tab_print_content]
</div>
[end]

View File

@ -1,4 +1,4 @@
<p class="[if-index odd]itemtabinfo[else][if mount_thread_arg_is "subject"]itemtabinfo[else]itemtabinfo2[end][end]">
<p class="[if-index even]itemtabinfo[else][if thread_mount_arg_is "subject"]itemtabinfo[else]itemtabinfo2[end][end]">
{added_by}: [thread_sort_tab_user], [thread_sort_tab_date_creation_nice][if-no thread_sort_tab_dates_equal],
{last_modified}[if thread_sort_tab_users_different] {by}: [thread_sort_tab_modification_user],[else]:[end]

View File

@ -39,6 +39,7 @@ void print_syntax()
int main(int argv, char ** argc)
{
std::srand(std::time(0));

View File

@ -178,20 +178,6 @@ void RemoveFile(PluginInfo & info)
void RemoveDir(PluginInfo & info)
{
DbItemQuery query;
std::vector<long> items;
size_t i;
// !! may only files can be retrieved here?
query.SetAll(false, false);
query.WhereParentId(info.l1);
info.db->GetItems(items, query);
// removing childs
for(i=0 ; i<items.size() ; ++i)
stats.RemoveItem(items[i]);
// removing the directory
stats.RemoveItem(info.l1);
}

View File

@ -214,7 +214,7 @@ showthreads.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h
showthreads.o: threadinfo.h
tdb.o: tdb.h thread.h ../../db/dbbase.h ../../core/error.h ../../core/log.h
tdb.o: ../../core/textstream.h ../../core/log.h
templates.o: threadinfo.h thread.h ../../core/item.h ../../core/system.h
templates.o: threadinfo.h ../../core/item.h ../../core/system.h
templates.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
templates.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
templates.o: ../../db/dbtextstream.h ../../core/textstream.h
@ -240,15 +240,15 @@ templates.o: ../../core/mount.h ../../core/mountparser.h ../../core/config.h
templates.o: ../../core/confparser.h ../../core/htmlfilter.h
templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h
templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h
templates.o: reply.h ../../functions/functionbase.h ../../core/request.h
templates.o: thread.h tdb.h ../../db/dbbase.h reply.h
templates.o: ../../functions/functionbase.h ../../core/request.h
templates.o: ../../core/requesttypes.h ../../templates/htmltextstream.h
templates.o: ../../core/synchro.h tdb.h ../../db/dbbase.h funthread.h
templates.o: createthread.h showthreads.h ../../core/misc.h
templates.o: ../../core/plugin.h pluginmsg.h ../../core/system.h
templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
templates.o: ../../functions/functions.h ../../functions/functionbase.h
templates.o: ../../functions/functionparser.h ../../core/cur.h
templates.o: ../../functions/adduser.h ../../functions/cat.h
templates.o: ../../core/synchro.h funthread.h createthread.h showthreads.h
templates.o: ../../core/misc.h ../../core/plugin.h pluginmsg.h
templates.o: ../../core/system.h ../../core/sessionmanager.h
templates.o: ../../core/sessioncontainer.h ../../functions/functions.h
templates.o: ../../functions/functionbase.h ../../functions/functionparser.h
templates.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h
templates.o: ../../functions/chmod.h ../../functions/privchanger.h
templates.o: ../../functions/chown.h ../../functions/ckeditor.h
templates.o: ../../functions/cp.h ../../functions/default.h
@ -269,7 +269,7 @@ templates.o: ../../templates/patterncacher.h
templates.o: ../../templates/ckeditorgetparser.h
templates.o: ../../core/httpsimpleparser.h ../../core/log.h
templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h
threadinfo.o: threadinfo.h thread.h ../../core/item.h ../../core/system.h
threadinfo.o: threadinfo.h ../../core/item.h ../../core/system.h
threadinfo.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
threadinfo.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
threadinfo.o: ../../db/dbtextstream.h ../../core/textstream.h
@ -295,3 +295,4 @@ threadinfo.o: ../../core/mount.h ../../core/mountparser.h ../../core/config.h
threadinfo.o: ../../core/confparser.h ../../core/htmlfilter.h
threadinfo.o: ../../core/users.h ../../core/groups.h ../../core/group.h
threadinfo.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h
threadinfo.o: thread.h tdb.h ../../db/dbbase.h

View File

@ -69,7 +69,7 @@ void CreateThread::MakePost()
if( cur->request->status == WINIX_ERR_OK )
{
thread.Clear();
thread.file_id = cur->request->item.id;
thread.file_id = cur->request->item.id;
cur->request->status = tdb->AddThread(thread);
}

View File

@ -51,9 +51,6 @@ return true;
void FunThread::PrepareThread(long file_id)
{
thread_info->Clear();
//cur->request->status = tdb->GetThreadByFileId(file_id, thread);
cur->request->status = tdb->GetAnswers(file_id, id_tab);
if( !id_tab.empty() )
@ -68,6 +65,7 @@ void FunThread::PrepareThread(long file_id)
iq.WhereFileType(WINIX_ITEM_FILETYPE_NONE);
db->GetItems(thread_info->item_tab, iq);
system->CheckAccessToItems(thread_info->item_tab);
thread_info->item_sort_tab.resize(thread_info->item_tab.size());
@ -75,8 +73,6 @@ void FunThread::PrepareThread(long file_id)
for(size_t i=0 ; i<thread_info->item_tab.size() ; ++i)
thread_info->item_sort_tab[i] = &thread_info->item_tab[i];
}
system->CheckAccessToItems(thread_info->item_tab);
}

View File

@ -74,7 +74,7 @@ void AddMounts(PluginInfo & info)
void RemoveThread(PluginInfo & i)
{
thread_info.RemoveThread(i.l1);
}
@ -97,6 +97,9 @@ void SetSortTab(PluginInfo & info)
typedef std::vector<Item*> SortTab;
SortTab * psort_tab = reinterpret_cast<SortTab*>(info.p1);
// !! dodac jakies czyszczenie tej tablicy wskaznikow na koncu przetwarzania requestu
// aby kiedys przypadkowo nie odwolac sie do nie istniejacego obiektu
// poprzez bezposrednie uzycie jakiejs funkcji z ezc
thread_info.item_sort_tab = *psort_tab;
}
@ -130,23 +133,25 @@ void Init(PluginInfo & info)
{
using namespace Thread;
plugin.Assign(WINIX_CREATE_FUNCTIONS, AddFunctions);
plugin.Assign(WINIX_SELECT_DEFAULT_FUNCTION, SelectDefaultFunction);
plugin.Assign(WINIX_ADD_MOUNTS, AddMounts);
plugin.Assign(WINIX_FILE_REMOVED, RemoveThread);
plugin.Assign(WINIX_NOTIFY_ADD_TEMPLATE, AddNotifyTemplate);
plugin.Assign(WINIX_TEMPLATES_CREATEFUNCTIONS, AddEzcFunctions);
plugin.Assign(WINIX_CREATE_FUNCTIONS, AddFunctions);
plugin.Assign(WINIX_SELECT_DEFAULT_FUNCTION, SelectDefaultFunction);
plugin.Assign(WINIX_ADD_MOUNTS, AddMounts);
plugin.Assign(WINIX_FILE_REMOVED, RemoveThread);
plugin.Assign(WINIX_NOTIFY_ADD_TEMPLATE, AddNotifyTemplate);
plugin.Assign(WINIX_TEMPLATES_CREATEFUNCTIONS, AddEzcFunctions);
// for other plugins
plugin.Assign(WINIX_PL_THREAD_SET_SORTTAB, SetSortTab);
plugin.Assign(WINIX_PL_THREAD_READ_THREADS, ReadThreads);
plugin.Assign(WINIX_PL_THREAD_SET_SORTTAB, SetSortTab);
plugin.Assign(WINIX_PL_THREAD_READ_THREADS, ReadThreads);
plugin.Assign(WINIX_PL_THREAD_SET_SORTTAB_INDEX, SetSortTabIndex);
plugin.Assign(WINIX_PL_THREAD_PREPARE_THREAD, PrepareThread);
plugin.Assign(WINIX_PL_THREAD_PREPARE_THREAD, PrepareThread);
tdb.SetConn(info.db->GetConn());
tdb.LogQueries(info.config->log_db_query);
// thread_info and fun_show_threads are used in 'ticket' plugins too
thread_info.SetDb(info.db);
thread_info.SetTDb(&tdb);
thread_info.SetSystem(info.system);
thread_info.plugin_id = info.plugin_id;

View File

@ -12,11 +12,13 @@
#define WINIX_PL_THREAD_SET_SORTTAB 4000
#define WINIX_PL_THREAD_READ_THREADS 4001
#define WINIX_PL_THREAD_SET_SORTTAB_INDEX 4002
#define WINIX_PL_THREAD_CAN_USE_REPLY 4003
#define WINIX_PL_THREAD_PREPARE_THREAD 4004
#define WINIX_PL_THREAD_SET_SORTTAB 4000
#define WINIX_PL_THREAD_READ_THREADS 4001
#define WINIX_PL_THREAD_SET_SORTTAB_INDEX 4002
#define WINIX_PL_THREAD_PREPARE_THREAD 4003
#endif

View File

@ -21,6 +21,7 @@ namespace Thread
Reply::Reply()
{
fun.url = L"reply";
files_dir = 0;
}
@ -37,22 +38,18 @@ void Reply::SetThreadInfo(ThreadInfo * pthread_info)
}
/*
we can use 'reply' function everywhere where 'thread_dir' mount option is defined
if there is no such a thread in 'thread' table it will be added automatically
*/
bool Reply::HasAccess()
{
if( !cur->request->is_item )
return false;
Item * dir = thread_info->FindThreadDir();
files_dir = thread_info->FindThreadDir();
if( !dir || !system->HasWriteAccess(*dir) )
return false;
plugin.Call(WINIX_PL_THREAD_CAN_USE_REPLY);
if( plugin.True() > 0 )
return true;
if( system->mounts.pmount->type != thread_info->mount_type_thread )
if( !files_dir || !system->HasWriteAccess(*files_dir) )
return false;
return true;
@ -62,13 +59,8 @@ return true;
void Reply::MakePost()
{
Item * dir = thread_info->FindThreadDir();
if( !dir )
{
cur->request->status = WINIX_ERR_PERMISSION_DENIED;
return;
}
// !! jak bedzie dostepne assert
// ASSERT(files_dir)
if( tdb->GetThreadByFileId(cur->request->item.id, thread) != WINIX_ERR_OK )
{
@ -85,7 +77,7 @@ void Reply::MakePost()
functions->ReadItem(answer, Item::file);
functions->SetUser(answer);
functions->PrepareUrl(answer);
answer.parent_id = dir->id;
answer.parent_id = files_dir->id;
answer.privileges = 0644; // !! tymczasowo
if( functions->CheckAbuse() )

View File

@ -38,6 +38,7 @@ private:
ThreadInfo * thread_info;
Item answer;
Thread thread;
Item * files_dir;
};

View File

@ -96,17 +96,6 @@ void ShowThreads::ReadFiles()
}
void ShowThreads::ReadThreads()
{
// reading threads for the files
file_id_tab.resize(thread_info->item_sort_tab.size());
for(size_t i=0 ; i<thread_info->item_sort_tab.size() ; ++i)
file_id_tab[i] = thread_info->item_sort_tab[i]->id;
tdb->GetThreads(file_id_tab, thread_info->thread_tab);
}
void ShowThreads::CreatePointers()
{
@ -118,7 +107,6 @@ void ShowThreads::CreatePointers()
}
void ShowThreads::SortPointers()
{
int sort_type = 1;
@ -132,6 +120,19 @@ void ShowThreads::SortPointers()
void ShowThreads::ReadThreads()
{
// reading threads for the files
file_id_tab.resize(thread_info->item_sort_tab.size());
for(size_t i=0 ; i<thread_info->item_sort_tab.size() ; ++i)
file_id_tab[i] = thread_info->item_sort_tab[i]->id;
tdb->GetThreads(file_id_tab, thread_info->thread_tab);
}
void ShowThreads::MakeGet()
{
thread_info->Clear();

View File

@ -175,12 +175,12 @@ return status;
Error TDb::EditThreadAddItem(long file_id, long item_id)
Error TDb::EditThreadAddItem(long file_id, long answer_id)
{
query.Clear();
query << R("insert into plugins.thread_files (file_id, answer_id) values (")
<< file_id
<< item_id
<< answer_id
<< R(");");
Error status = DoCommand(query);
@ -190,7 +190,7 @@ Error TDb::EditThreadAddItem(long file_id, long item_id)
query.Clear();
query << R("update plugins.thread set (last_item, replies) = (")
<< item_id
<< answer_id
<< R(", replies+1) where file_id=")
<< file_id
<< R(";");

View File

@ -17,6 +17,7 @@
#include "core/error.h"
namespace Thread
{
@ -29,7 +30,7 @@ public:
Error GetThreadByFileId(long file_id, Thread & thread);
Error GetThreads(const std::vector<long> & file_id_tab, std::vector<Thread> & thread_tab);
Error GetAnswers(long file_id, std::vector<long> & answer_id_tab);
Error EditThreadAddItem(long file_id, long item_id);
Error EditThreadAddItem(long file_id, long answer_id);
Error EditThreadRemoveItem(long file_id);
Error RemoveThread(long file_id);
long FindLastItem(long file_id);

View File

@ -472,6 +472,14 @@ void thread_can_create(Info & i)
void thread_mount_arg_is(Info & i)
{
if( system->mounts.pmount )
i.res = system->mounts.pmount->IsArg(thread_info.mount_par_thread, i.par);
}
void AddEzcFunctions(PluginInfo & info)
@ -518,6 +526,7 @@ void AddEzcFunctions(PluginInfo & info)
fun->Insert("thread_can_reply", thread_can_reply);
fun->Insert("thread_can_create", thread_can_create);
fun->Insert("thread_mount_arg_is", thread_mount_arg_is);
}

View File

@ -14,6 +14,17 @@
namespace Thread
{
void ThreadInfo::SetDb(Db * pdb)
{
db = pdb;
}
void ThreadInfo::SetTDb(TDb * ptdb)
{
tdb = ptdb;
}
void ThreadInfo::SetSystem(System * psystem)
{
@ -47,6 +58,18 @@ return out_dir_tab.back();
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]);
}
tdb->RemoveThread(file_id);
}
} // namespace

View File

@ -11,10 +11,11 @@
#define headerfile_winix_plugins_thread_threadinfo
#include <vector>
#include "thread.h"
#include "core/item.h"
#include "core/system.h"
#include "db/db.h"
#include "thread.h"
#include "tdb.h"
@ -26,10 +27,14 @@ class ThreadInfo
public:
void SetDb(Db * pdb);
void SetTDb(TDb * ptdb);
void SetSystem(System * psystem);
void Clear();
Item * FindThreadDir();
// id of a mount type
int mount_type_thread;
@ -57,11 +62,18 @@ public:
// template index for notifications
size_t template_index;
void RemoveThread(long file_id);
private:
Db * db;
TDb * tdb;
System * system;
std::vector<Item*> out_dir_tab;
std::vector<long> remove_answer_id_tab;
Item out_item;

View File

@ -51,6 +51,7 @@ createticket.o: ../../functions/tinymce.h ../../functions/uname.h
createticket.o: ../../functions/upload.h ../../functions/uptime.h
createticket.o: ../../functions/who.h ../../functions/vim.h
createticket.o: ../../core/htmlfilter.h sessiondata.h ../../core/plugindata.h
createticket.o: ../../functions/rm.h
editticket.o: editticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
editticket.o: ../../db/dbtextstream.h ../../core/textstream.h
editticket.o: ../../core/misc.h ../../core/item.h ../../core/error.h
@ -99,7 +100,7 @@ editticket.o: ../../functions/uname.h ../../functions/upload.h
editticket.o: ../../functions/uptime.h ../../functions/who.h
editticket.o: ../../functions/vim.h ../../core/htmlfilter.h
editticket.o: ../../functions/functionbase.h ../../core/synchro.h
editticket.o: sessiondata.h ../../core/plugindata.h
editticket.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h
funticket.o: funticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
funticket.o: ../../db/dbtextstream.h ../../core/textstream.h
funticket.o: ../../core/misc.h ../../core/item.h ../../core/error.h
@ -206,9 +207,11 @@ init.o: ../../templates/templates.h ../../templates/patterncacher.h
init.o: ../../templates/ckeditorgetparser.h ../../core/httpsimpleparser.h
init.o: ../../core/log.h ../../templates/indexpatterns.h
init.o: ../../core/sessionmanager.h sessiondata.h ../../core/plugindata.h
init.o: ../../plugins/thread/showthreads.h ../../plugins/thread/threadinfo.h
init.o: ../../plugins/thread/thread.h ../../plugins/thread/pluginmsg.h
init.o: ../../functions/rm.h ../../plugins/thread/showthreads.h
init.o: ../../plugins/thread/threadinfo.h ../../plugins/thread/thread.h
init.o: ../../plugins/thread/pluginmsg.h
sessiondata.o: sessiondata.h ../../core/plugindata.h ticket.h
sessiondata.o: ../../functions/rm.h
showtickets.o: showtickets.h tdb.h ticket.h ../../db/dbbase.h
showtickets.o: ../../db/dbconn.h ../../db/dbtextstream.h
showtickets.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
@ -324,7 +327,7 @@ templates.o: ../../templates/templates.h ../../templates/patterncacher.h
templates.o: ../../templates/ckeditorgetparser.h
templates.o: ../../core/httpsimpleparser.h ../../core/log.h
templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h
templates.o: sessiondata.h ../../core/plugindata.h
templates.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h
templates.o: ../../plugins/thread/pluginmsg.h
ticketconf.o: ticketconf.h
ticketinfo.o: ticketinfo.h ticket.h ticketparser.h ticketconf.h
@ -375,6 +378,6 @@ ticketinfo.o: ../../functions/uptime.h ../../functions/who.h
ticketinfo.o: ../../functions/vim.h ../../core/htmlfilter.h tdb.h
ticketinfo.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
ticketinfo.o: ../../core/error.h ../../core/log.h ../../core/misc.h
ticketinfo.o: sessiondata.h ../../core/plugindata.h
ticketinfo.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h
ticketparser.o: ticketparser.h ticketconf.h ../../core/log.h
ticketparser.o: ../../core/misc.h

View File

@ -53,7 +53,7 @@ return true;
void CreateTicket::AddTicket(Ticket & ticket, Item & item)
{
ticket.file_id = item.id;
ticket.file_id = item.id;
cur->request->status = tdb->AddTicket(ticket);
if( cur->request->status == WINIX_ERR_OK )
@ -91,7 +91,7 @@ void CreateTicket::Submit(Ticket & ticket, Item & item)
if( cur->request->status == WINIX_ERR_OK )
{
log << log2 << "CreateTicket: added a new ticket" << logend;
RemoveTicket();
RemoveTmpTicket();
system->RedirectTo(item);
}
else
@ -103,13 +103,14 @@ void CreateTicket::Submit(Ticket & ticket, Item & item)
void CreateTicket::RemoveTicket()
void CreateTicket::RemoveTmpTicket()
{
SessionData * session_data = reinterpret_cast<SessionData*>(
cur->session->plugin_data.Get(ticket_info->plugin_id) );
long dir_id = cur->request->dir_tab.back()->id;
session_data->create_ticket_map.erase(dir_id);
session_data->create_file_map.erase(dir_id);
}
@ -126,6 +127,17 @@ return ticket;
}
std::vector<long> & CreateTicket::PrepareFileMap()
{
SessionData * session_data = reinterpret_cast<SessionData*>(
cur->session->plugin_data.Get(ticket_info->plugin_id) );
long dir_id = cur->request->dir_tab.back()->id;
std::vector<long> & file_map = session_data->GetFileTab(dir_id, session_data->create_file_map);
return file_map;
}
void CreateTicket::MakePost()
{
@ -135,8 +147,9 @@ void CreateTicket::MakePost()
Ticket & ticket = PrepareTicket();
Item & item = cur->request->item;
ticket_info->ticket = &ticket;
std::vector<long> & file_map = PrepareFileMap();
ticket_info->ReadTicketParams(ticket, false);
ticket_info->ReadTicketParams(ticket, false, &file_map);
functions->ReadItem(item, Item::file);
if( !cur->request->IsPostVar(L"fileuploadsubmit") )

View File

@ -36,8 +36,9 @@ private:
void AddTicket(Ticket & ticket, Item & item);
void Submit(Ticket & ticket, Item & item);
void RemoveTicket();
void RemoveTmpTicket();
Ticket & PrepareTicket();
std::vector<long> & PrepareFileMap();
TDb * tdb;
TicketInfo * ticket_info;

View File

@ -91,7 +91,7 @@ void EditTicket::Submit(Ticket & ticket, Item & item)
if( cur->request->status == WINIX_ERR_OK )
{
log << log2 << "EditTicket: ticket modified" << logend;
RemoveTicket();
RemoveTmpTicket();
system->RedirectTo(item);
}
else
@ -104,13 +104,13 @@ void EditTicket::Submit(Ticket & ticket, Item & item)
void EditTicket::RemoveTicket()
void EditTicket::RemoveTmpTicket()
{
SessionData * session_data = reinterpret_cast<SessionData*>(
cur->session->plugin_data.Get(ticket_info->plugin_id) );
long file_id = cur->request->item.id;
session_data->create_ticket_map.erase(file_id);
session_data->edit_ticket_map.erase(file_id);
session_data->new_file_map.erase(file_id);
}

View File

@ -34,7 +34,7 @@ public:
private:
void RemoveTicket();
void RemoveTmpTicket();
Ticket & PrepareTicket();
std::vector<long> & PrepareFileMap();
std::wstring old_url;

View File

@ -88,7 +88,7 @@ void ProcessRequest(PluginInfo & info)
void RemoveTicket(PluginInfo & i)
{
tdb.RemoveTicket(i.l1);
ticket_info.RemoveTicket(i.l1);
}
@ -107,6 +107,8 @@ void AddNotifyTemplate(PluginInfo & info)
void CreateSession(PluginInfo & info)
{
SessionData * p = new SessionData();
p->fun_rm = &info.functions->fun_rm;
info.cur->session->plugin_data.Assign(p);
log << log4 << "Ticket: created ticket plugin data: " << (void*)p << logend;
}
@ -115,14 +117,7 @@ void CreateSession(PluginInfo & info)
void RemoveSession(PluginInfo & info)
{
delete info.plugin_data_base;
log << log4 << "Ticket: removed ticket plugin date: " << (void*)info.plugin_data_base << logend;
}
void CanUseReply(PluginInfo & info)
{
if( info.system->mounts.pmount && info.system->mounts.pmount->type == ticket_info.mount_type_ticket )
info.res = true;
log << log4 << "Ticket: removed ticket plugin data: " << (void*)info.plugin_data_base << logend;
}
@ -149,7 +144,6 @@ using namespace Ticket;
plugin.Assign(WINIX_NOTIFY_ADD_TEMPLATE, AddNotifyTemplate);
plugin.Assign(WINIX_SESSION_CREATED, CreateSession);
plugin.Assign(WINIX_SESSION_REMOVE, RemoveSession);
plugin.Assign(WINIX_PL_THREAD_CAN_USE_REPLY, CanUseReply);
tdb.SetConn(info.db->GetConn());
tdb.LogQueries(info.config->log_db_query);

View File

@ -13,6 +13,39 @@
namespace Ticket
{
SessionData::SessionData()
{
fun_rm = 0;
}
SessionData::~SessionData()
{
RemoveFileMap(create_file_map);