added: now plugin ticket uses a new horizontal table (plugins.ticket)

columns: dir_id, param, value
we are able to build complicated tickets 



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@664 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa 2010-10-19 00:31:20 +00:00
parent 33057acd62
commit 1b053c03ba
53 changed files with 1680 additions and 1902 deletions

View File

@ -3,9 +3,9 @@
acceptbaseparser.o: acceptbaseparser.h
app.o: app.h config.h confparser.h htmlfilter.h system.h dirs.h item.h
app.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
app.o: ../db/dbtextstream.h ../core/textstream.h ../db/dbitemquery.h
app.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
app.o: ../core/thread.h ../core/error.h log.h ../core/dircontainer.h
app.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h log.h
app.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
app.o: ../core/user.h ../core/group.h ../core/thread.h ../core/dircontainer.h
app.o: ../core/ugcontainer.h request.h requesttypes.h session.h error.h
app.o: user.h plugindata.h rebus.h mounts.h mount.h mountparser.h users.h
app.o: ugcontainer.h lastcontainer.h groups.h group.h loadavg.h
@ -38,12 +38,12 @@ config.o: config.h confparser.h htmlfilter.h log.h plugin.h pluginmsg.h
config.o: plugindata.h request.h requesttypes.h session.h item.h error.h
config.o: user.h rebus.h system.h dirs.h dircontainer.h ../db/db.h
config.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
config.o: ../core/textstream.h ../db/dbitemquery.h ../core/item.h
config.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
config.o: ../core/thread.h ../core/error.h ../core/dircontainer.h
config.o: ../core/ugcontainer.h mounts.h mount.h mountparser.h users.h
config.o: ugcontainer.h lastcontainer.h groups.h group.h loadavg.h
config.o: sessionmanager.h sessioncontainer.h ../functions/functions.h
config.o: ../core/textstream.h ../core/error.h ../db/dbitemquery.h
config.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
config.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
config.o: mounts.h mount.h mountparser.h users.h ugcontainer.h
config.o: lastcontainer.h groups.h group.h loadavg.h sessionmanager.h
config.o: sessioncontainer.h ../functions/functions.h
config.o: ../functions/functionbase.h ../core/request.h ../core/config.h
config.o: ../core/system.h ../core/notify.h ../../ezc/src/ezc.h
config.o: ../functions/functionparser.h ../functions/adduser.h
@ -66,21 +66,21 @@ config.o: ../core/sessionmanager.h
confparser.o: confparser.h misc.h item.h
dircontainer.o: dircontainer.h item.h log.h
dirs.o: dirs.h item.h dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
dirs.o: ../db/dbtextstream.h ../core/textstream.h ../db/dbitemquery.h
dirs.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
dirs.o: ../core/thread.h ../core/error.h log.h ../core/dircontainer.h
dirs.o: ../core/ugcontainer.h request.h requesttypes.h session.h error.h
dirs.o: user.h plugindata.h rebus.h config.h confparser.h htmlfilter.h
dirs.o: notify.h ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
dirs.o: ../core/mount.h ../core/locale.h ../core/config.h ../templates/misc.h
dirs.o: ../templates/localefilter.h ../core/locale.h system.h mounts.h
dirs.o: mount.h mountparser.h users.h ugcontainer.h lastcontainer.h groups.h
dirs.o: group.h loadavg.h
dirs.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h log.h
dirs.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
dirs.o: ../core/user.h ../core/group.h ../core/thread.h
dirs.o: ../core/dircontainer.h ../core/ugcontainer.h request.h requesttypes.h
dirs.o: session.h error.h user.h plugindata.h rebus.h config.h confparser.h
dirs.o: htmlfilter.h notify.h ../templatesnotify/templatesnotify.h
dirs.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h ../core/config.h
dirs.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
dirs.o: system.h mounts.h mount.h mountparser.h users.h ugcontainer.h
dirs.o: lastcontainer.h groups.h group.h loadavg.h
groups.o: groups.h group.h ugcontainer.h ../db/db.h ../db/dbbase.h
groups.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
groups.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
groups.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
groups.o: log.h ../core/dircontainer.h ../core/ugcontainer.h
groups.o: ../core/error.h log.h ../db/dbitemquery.h ../core/item.h
groups.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
groups.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
htmlfilter.o: htmlfilter.h
httpsimpleparser.o: httpsimpleparser.h
lastcontainer.o: lastcontainer.h log.h
@ -91,27 +91,27 @@ misc.o: misc.h item.h log.h
mount.o: mount.h
mountparser.o: mountparser.h mount.h item.h error.h dirs.h dircontainer.h
mountparser.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
mountparser.o: ../core/textstream.h ../db/dbitemquery.h ../core/item.h
mountparser.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
mountparser.o: ../core/thread.h ../core/error.h log.h ../core/dircontainer.h
mountparser.o: ../core/textstream.h ../core/error.h log.h ../db/dbitemquery.h
mountparser.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h
mountparser.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
mountparser.o: ../core/ugcontainer.h request.h requesttypes.h session.h
mountparser.o: user.h plugindata.h rebus.h config.h confparser.h htmlfilter.h
mountparser.o: misc.h
mounts.o: mounts.h mount.h error.h dirs.h item.h dircontainer.h ../db/db.h
mounts.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
mounts.o: ../core/textstream.h ../db/dbitemquery.h ../core/item.h
mounts.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
mounts.o: ../core/thread.h ../core/error.h log.h ../core/dircontainer.h
mounts.o: ../core/ugcontainer.h request.h requesttypes.h session.h user.h
mounts.o: plugindata.h rebus.h config.h confparser.h htmlfilter.h
mounts.o: mountparser.h plugin.h pluginmsg.h system.h users.h ugcontainer.h
mounts.o: lastcontainer.h groups.h group.h loadavg.h sessionmanager.h
mounts.o: sessioncontainer.h ../functions/functions.h
mounts.o: ../functions/functionbase.h ../core/request.h ../core/config.h
mounts.o: ../core/system.h ../core/notify.h ../../ezc/src/ezc.h
mounts.o: ../functions/functionparser.h ../functions/adduser.h
mounts.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
mounts.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
mounts.o: ../core/textstream.h ../core/error.h log.h ../db/dbitemquery.h
mounts.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
mounts.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
mounts.o: request.h requesttypes.h session.h user.h plugindata.h rebus.h
mounts.o: config.h confparser.h htmlfilter.h mountparser.h plugin.h
mounts.o: pluginmsg.h system.h users.h ugcontainer.h lastcontainer.h groups.h
mounts.o: group.h loadavg.h sessionmanager.h sessioncontainer.h
mounts.o: ../functions/functions.h ../functions/functionbase.h
mounts.o: ../core/request.h ../core/config.h ../core/system.h
mounts.o: ../core/notify.h ../../ezc/src/ezc.h ../functions/functionparser.h
mounts.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
mounts.o: ../functions/privchanger.h ../functions/chown.h
mounts.o: ../functions/ckeditor.h ../functions/cp.h
mounts.o: ../functions/createthread.h ../functions/default.h
mounts.o: ../functions/download.h ../functions/emacs.h ../functions/last.h
mounts.o: ../functions/login.h ../functions/logout.h ../functions/ls.h
@ -129,24 +129,25 @@ mounts.o: ../core/sessionmanager.h
notify.o: log.h notify.h ../templatesnotify/templatesnotify.h
notify.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h confparser.h
notify.o: ../core/config.h ../templates/misc.h ../templates/localefilter.h
notify.o: ../core/locale.h request.h requesttypes.h session.h item.h error.h
notify.o: user.h plugindata.h rebus.h config.h htmlfilter.h system.h dirs.h
notify.o: dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
notify.o: ../db/dbtextstream.h ../core/textstream.h ../db/dbitemquery.h
notify.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
notify.o: ../core/thread.h ../core/error.h ../core/dircontainer.h
notify.o: ../core/ugcontainer.h mounts.h mount.h mountparser.h users.h
notify.o: ugcontainer.h lastcontainer.h groups.h group.h loadavg.h misc.h
notify.o: ../core/locale.h ../core/user.h request.h requesttypes.h session.h
notify.o: item.h error.h user.h plugindata.h rebus.h config.h htmlfilter.h
notify.o: system.h dirs.h dircontainer.h ../db/db.h ../db/dbbase.h
notify.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
notify.o: ../core/error.h ../db/dbitemquery.h ../core/item.h
notify.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
notify.o: ../core/dircontainer.h ../core/ugcontainer.h mounts.h mount.h
notify.o: mountparser.h users.h ugcontainer.h lastcontainer.h groups.h
notify.o: group.h loadavg.h misc.h
plugin.o: plugin.h pluginmsg.h log.h plugindata.h config.h confparser.h
plugin.o: htmlfilter.h request.h requesttypes.h session.h item.h error.h
plugin.o: user.h rebus.h system.h dirs.h dircontainer.h ../db/db.h
plugin.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
plugin.o: ../core/textstream.h ../db/dbitemquery.h ../core/item.h
plugin.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
plugin.o: ../core/thread.h ../core/error.h ../core/dircontainer.h
plugin.o: ../core/ugcontainer.h mounts.h mount.h mountparser.h users.h
plugin.o: ugcontainer.h lastcontainer.h groups.h group.h loadavg.h
plugin.o: sessionmanager.h sessioncontainer.h ../functions/functions.h
plugin.o: ../core/textstream.h ../core/error.h ../db/dbitemquery.h
plugin.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
plugin.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
plugin.o: mounts.h mount.h mountparser.h users.h ugcontainer.h
plugin.o: lastcontainer.h groups.h group.h loadavg.h sessionmanager.h
plugin.o: sessioncontainer.h ../functions/functions.h
plugin.o: ../functions/functionbase.h ../core/request.h ../core/config.h
plugin.o: ../core/system.h ../core/notify.h ../../ezc/src/ezc.h
plugin.o: ../functions/functionparser.h ../functions/adduser.h
@ -170,9 +171,9 @@ plugindata.o: plugindata.h plugin.h pluginmsg.h log.h config.h confparser.h
plugindata.o: htmlfilter.h request.h requesttypes.h session.h item.h error.h
plugindata.o: user.h rebus.h system.h dirs.h dircontainer.h ../db/db.h
plugindata.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
plugindata.o: ../core/textstream.h ../db/dbitemquery.h ../core/item.h
plugindata.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
plugindata.o: ../core/thread.h ../core/error.h ../core/dircontainer.h
plugindata.o: ../core/textstream.h ../core/error.h ../db/dbitemquery.h
plugindata.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h
plugindata.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
plugindata.o: ../core/ugcontainer.h mounts.h mount.h mountparser.h users.h
plugindata.o: ugcontainer.h lastcontainer.h groups.h group.h loadavg.h
plugindata.o: sessionmanager.h sessioncontainer.h ../functions/functions.h
@ -205,9 +206,9 @@ request.o: request.h requesttypes.h session.h item.h error.h user.h
request.o: plugindata.h rebus.h config.h confparser.h htmlfilter.h log.h
request.o: plugin.h pluginmsg.h system.h dirs.h dircontainer.h ../db/db.h
request.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
request.o: ../core/textstream.h ../db/dbitemquery.h ../core/item.h
request.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
request.o: ../core/thread.h ../core/error.h ../core/dircontainer.h
request.o: ../core/textstream.h ../core/error.h ../db/dbitemquery.h
request.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h
request.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
request.o: ../core/ugcontainer.h mounts.h mount.h mountparser.h users.h
request.o: ugcontainer.h lastcontainer.h groups.h group.h loadavg.h
request.o: sessionmanager.h sessioncontainer.h ../functions/functions.h
@ -238,9 +239,9 @@ sessionmanager.o: error.h user.h plugindata.h rebus.h lastcontainer.h
sessionmanager.o: config.h confparser.h htmlfilter.h request.h requesttypes.h
sessionmanager.o: system.h dirs.h dircontainer.h ../db/db.h ../db/dbbase.h
sessionmanager.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
sessionmanager.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
sessionmanager.o: ../core/user.h ../core/group.h ../core/thread.h
sessionmanager.o: ../core/error.h log.h ../core/dircontainer.h
sessionmanager.o: ../core/error.h log.h ../db/dbitemquery.h ../core/item.h
sessionmanager.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
sessionmanager.o: ../core/thread.h ../core/dircontainer.h
sessionmanager.o: ../core/ugcontainer.h mounts.h mount.h mountparser.h
sessionmanager.o: users.h ugcontainer.h groups.h group.h loadavg.h
sessionmanager.o: sessionparser.h plugin.h pluginmsg.h
@ -272,28 +273,33 @@ sessionparser.o: sessionparser.h session.h item.h error.h user.h plugindata.h
sessionparser.o: rebus.h sessioncontainer.h lastcontainer.h users.h
sessionparser.o: ugcontainer.h request.h requesttypes.h config.h confparser.h
sessionparser.o: htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
sessionparser.o: ../db/dbtextstream.h ../core/textstream.h
sessionparser.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
sessionparser.o: ../core/user.h ../core/group.h ../core/thread.h
sessionparser.o: ../core/error.h log.h ../core/dircontainer.h
sessionparser.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h
sessionparser.o: log.h ../db/dbitemquery.h ../core/item.h
sessionparser.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
sessionparser.o: ../core/thread.h ../core/dircontainer.h
sessionparser.o: ../core/ugcontainer.h
system.o: system.h dirs.h item.h dircontainer.h ../db/db.h ../db/dbbase.h
system.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
system.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
system.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
system.o: log.h ../core/dircontainer.h ../core/ugcontainer.h request.h
system.o: requesttypes.h session.h error.h user.h plugindata.h rebus.h
system.o: config.h confparser.h htmlfilter.h mounts.h mount.h mountparser.h
system.o: users.h ugcontainer.h lastcontainer.h groups.h group.h loadavg.h
system.o: misc.h notify.h ../templatesnotify/templatesnotify.h
system.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
system.o: ../core/config.h ../templates/misc.h ../templates/localefilter.h
system.o: ../core/locale.h
system.o: ../core/error.h log.h ../db/dbitemquery.h ../core/item.h
system.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
system.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
system.o: request.h requesttypes.h session.h error.h user.h plugindata.h
system.o: rebus.h config.h confparser.h htmlfilter.h mounts.h mount.h
system.o: mountparser.h users.h ugcontainer.h lastcontainer.h groups.h
system.o: group.h loadavg.h misc.h notify.h
system.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
system.o: ../core/mount.h ../core/locale.h ../core/config.h
system.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
system.o: ../templates/templates.h ../templates/patterncacher.h
system.o: ../core/item.h ../templates/ckeditorgetparser.h
system.o: ../core/httpsimpleparser.h ../core/log.h
system.o: ../templates/indexpatterns.h ../core/request.h ../core/system.h
system.o: ../core/sessionmanager.h
textstream.o: textstream.h
users.o: users.h user.h ugcontainer.h lastcontainer.h request.h
users.o: requesttypes.h session.h item.h error.h plugindata.h rebus.h
users.o: config.h confparser.h htmlfilter.h ../db/db.h ../db/dbbase.h
users.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
users.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
users.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
users.o: log.h ../core/dircontainer.h ../core/ugcontainer.h
users.o: ../core/error.h log.h ../db/dbitemquery.h ../core/item.h
users.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
users.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h

View File

@ -117,7 +117,8 @@ return true;
// !! dac clearowanie childs_tab
// !! ewentualnie mozna dodac trzeci domyslny parametr bool clear_tab = true
bool Dirs::GetDirChilds(long parent, std::vector<Item*> & childs_tab)
{
if( parent != -1 && !IsDir(parent) )

View File

@ -36,7 +36,7 @@ public:
// these methods return false if there is no such a dir
bool IsDir(long dir_id);
bool GetDirChilds(long parent_id, std::vector<Item*> & childs_tab);
bool GetDirChilds(long parent_id, std::vector<Item*> & childs_tab); // !! zamienic na GetChilds()
bool MakePath(long dir_id, std::string & path);
bool ChangeParent(long dir_id, long new_parent_id);
bool HasParent(long dir_id, long parent_id);
@ -45,7 +45,7 @@ public:
int AnalyzePath(const std::string & path, long & dir_id, std::string & dir, std::string & file);
static void SplitPath(const std::string & path, std::string & dir, std::string & file);
DirContainer::ParentIterator FindFirstParent(long parent_id);
DirContainer::ParentIterator FindFirstParent(long parent_id); // !! zmienic w koncu nazwe na FindFirstChild
DirContainer::ParentIterator NextParent(DirContainer::ParentIterator i);
DirContainer::ParentIterator ParentEnd();

View File

@ -514,6 +514,13 @@ return false;
}
bool IsSubString(const std::string & short_str, const std::string & long_str)
{
return IsSubString(short_str.c_str(), long_str.c_str());
}
bool IsSubStringNoCase(const char * short_str, const char * long_str)
{
while( *short_str && *long_str && ToSmall(*short_str) == ToSmall(*long_str) )
@ -529,6 +536,12 @@ return false;
}
bool IsSubStringNoCase(const std::string & short_str, const std::string & long_str)
{
return IsSubStringNoCase(short_str.c_str(), long_str.c_str());
}
bool EqualNoCase(const char * str1, const char * str2)
{
while( *str1 && *str2 && ToSmall(*str1) == ToSmall(*str2) )

View File

@ -54,7 +54,9 @@ const char * SkipWhite(const char * s);
const char * ToStr(int value);
bool IsSubString(const char * short_str, const char * long_str);
bool IsSubString(const std::string & short_str, const std::string & long_str);
bool IsSubStringNoCase(const char * short_str, const char * long_str);
bool IsSubStringNoCase(const std::string & short_str, const std::string & long_str);
bool EqualNoCase(const char * str1, const char * str2);
bool EqualNoCase(const std::string & str1, const std::string & str2);

View File

@ -11,7 +11,7 @@
#include "misc.h"
#include "error.h"
#include "notify.h"
#include "templates/templates.h"
@ -485,7 +485,7 @@ bool System::MakePath(Item & item, bool create_dir)
Error System::AddFile(Item & item)
Error System::AddFile(Item & item, bool notify)
{
if( item.type == Item::dir )
return WINIX_ERR_FILE_EXPECTED;
@ -497,7 +497,8 @@ Error System::AddFile(Item & item)
log << log2 << "System: added a new file, url: " << item.url << ", id: " << item.id
<< ", parent_id: " << item.parent_id << logend;
request->notify_code |= WINIX_NOTIFY_ITEM_ADD;
if( notify )
request->notify_code |= WINIX_NOTIFY_ITEM_ADD;
}
return status;
@ -506,7 +507,7 @@ return status;
Error System::EditFile(Item & item, bool with_url)
Error System::EditFile(Item & item, bool with_url, bool notify)
{
if( item.type == Item::dir )
return WINIX_ERR_FILE_EXPECTED;
@ -521,13 +522,14 @@ Error System::EditFile(Item & item, bool with_url)
if( status == WINIX_ERR_OK )
{
TemplatesFunctions::pattern_cacher.UpdatePattern(item);
log << log2 << "System: modified an item" << logend;
request->notify_code |= WINIX_NOTIFY_ITEM_EDIT;
if( notify )
request->notify_code |= WINIX_NOTIFY_ITEM_EDIT;
}
return status;
}

View File

@ -83,8 +83,8 @@ public:
bool MakePath(const Item & item, std::string & path, bool create_dir);
bool MakePath(Item & item, bool create_dir); // output path is: item.auth_path
Error AddFile(Item & item);
Error EditFile(Item & item, bool with_url = true);
Error AddFile(Item & item, bool notify = true);
Error EditFile(Item & item, bool with_url = true, bool notify = true);
private:
Request * request;

View File

@ -1,15 +1,16 @@
# DO NOT DELETE
db.o: db.h dbbase.h dbconn.h dbtextstream.h ../core/textstream.h
db.o: dbitemquery.h ../core/item.h dbitemcolumns.h ../core/user.h
db.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
db.o: ../core/error.h ../core/log.h dbitemquery.h ../core/item.h
db.o: dbitemcolumns.h ../core/user.h ../core/group.h ../core/thread.h
db.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
db.o: ../core/log.h ../core/misc.h
dbbase.o: dbbase.h dbconn.h dbtextstream.h ../core/textstream.h ../core/log.h
dbbase.o: ../core/error.h ../core/log.h
dbbase.o: dbbase.h dbconn.h dbtextstream.h ../core/textstream.h
dbbase.o: ../core/error.h ../core/log.h ../core/log.h
dbconn.o: dbconn.h dbtextstream.h ../core/textstream.h ../core/log.h
dbconn.o: ../core/error.h ../core/log.h
dbitemcolumns.o: dbitemcolumns.h ../core/item.h dbbase.h dbconn.h
dbitemcolumns.o: dbtextstream.h ../core/textstream.h
dbitemcolumns.o: dbtextstream.h ../core/textstream.h ../core/error.h
dbitemcolumns.o: ../core/log.h
dbitemquery.o: dbitemquery.h ../core/item.h
dbtextstream.o: dbtextstream.h ../core/textstream.h

View File

@ -659,13 +659,20 @@ PGresult * Db::GetItemsQuery(const DbItemQuery & iq, bool skip_other_sel)
}
}
query << R(" order by item.date_creation");
if( iq.sort_asc )
query << R(" asc;");
query << R(" asc");
else
query << R(" desc;");
query << R(" desc");
if( iq.limit != 0 )
query << R(" limit ") << iq.limit;
if( iq.offset != 0 )
query << R(" offset ") << iq.offset;
query << R(";");
return AssertQuery(query);
}
@ -875,6 +882,7 @@ return result;
long Db::GetItemId(long parent_id, const std::string & url, Item::Type type)
{
PGresult * r = 0;

View File

@ -24,7 +24,6 @@
#include "core/user.h"
#include "core/group.h"
#include "core/thread.h"
#include "core/error.h"
#include "core/dircontainer.h"
#include "core/ugcontainer.h"
@ -52,7 +51,7 @@ public:
void CheckAllUrlSubject();
// !! nie zwracac zadnych kodow bledow?
void GetItems(std::vector<Item> & item_tab, const DbItemQuery & item_query);
void GetItems(std::vector<long> & item_tab, const DbItemQuery & item_query);

View File

@ -300,7 +300,72 @@ return buffer;
void DbBase::CreateIdList(const std::vector<long> & id_tab, std::string & list, bool add_parentheses)
{
char buffer[50];
list.clear();
if( add_parentheses )
list += '(';
for(size_t i=0 ; i<id_tab.size() ; ++i)
{
sprintf(buffer, "%lu", (unsigned long)id_tab[i]);
list += buffer;
if( i+1 < id_tab.size() )
list += ',';
}
if( add_parentheses )
list += ')';
}
Error DbBase::DoCommand(const char * command)
{
PGresult * r = 0;
Error status = WINIX_ERR_OK;
try
{
bquery.Clear();
bquery << R(command);
r = AssertQuery(bquery);
AssertResult(r, PGRES_COMMAND_OK);
}
catch(const Error & e)
{
status = e;
}
ClearResult(r);
return status;
}
Error DbBase::BeginTrans()
{
return DoCommand("BEGIN;");
}
Error DbBase::RollbackTrans()
{
return DoCommand("ROLLBACK;");
}
Error DbBase::CommitTrans()
{
return DoCommand("COMMIT;");
}

View File

@ -13,6 +13,9 @@
#include "dbconn.h"
#include "dbtextstream.h"
#include <vector>
#include <string>
#include "core/error.h"
class DbBase
@ -50,6 +53,12 @@ public:
static tm ConvertTime(const char * str);
static const char * ConvertTime(const tm & t); // warning: it uses its own static buffer
void CreateIdList(const std::vector<long> & id_tab, std::string & list, bool add_parentheses = true);
Error DoCommand(const char * command);
Error BeginTrans();
Error RollbackTrans();
Error CommitTrans();
protected:

View File

@ -23,6 +23,9 @@ DbItemQuery::DbItemQuery()
parent_id = -1;
type = Item::none;
auth = Item::auth_none;
limit = 0; // limit and offset not used by default
offset = 0;
}
@ -95,3 +98,15 @@ void DbItemQuery::WhereAuth(Item::Auth st, bool equal)
auth_equal = equal;
}
void DbItemQuery::Limit(long l)
{
limit = l;
}
void DbItemQuery::Offset(long o)
{
offset = o;
}

View File

@ -45,6 +45,8 @@ struct DbItemQuery
bool auth_equal; // if true means auth should be equal
bool sort_asc;
long limit;
long offset;
DbItemQuery();
@ -56,6 +58,9 @@ struct DbItemQuery
void WhereParentId(long parent_id_);
void WhereType(Item::Type type_);
void WhereAuth(Item::Auth st, bool equal = true);
void Limit(long l); // setting 0 turns off
void Offset(long o); // setting 0 turns off
};

View File

@ -2,25 +2,25 @@
adduser.o: adduser.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
adduser.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
adduser.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
adduser.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
adduser.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
adduser.o: ../core/request.h ../core/requesttypes.h ../core/session.h
adduser.o: ../core/error.h ../core/user.h ../core/plugindata.h
adduser.o: ../core/rebus.h ../core/config.h ../core/confparser.h
adduser.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
adduser.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
adduser.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
adduser.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
adduser.o: ../core/groups.h ../core/group.h ../core/loadavg.h
adduser.o: ../core/notify.h ../templatesnotify/templatesnotify.h
adduser.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
adduser.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
adduser.o: ../core/system.h
adduser.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
adduser.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
adduser.o: ../core/thread.h ../core/dircontainer.h ../core/item.h
adduser.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
adduser.o: ../core/session.h ../core/error.h ../core/user.h
adduser.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
adduser.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
adduser.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
adduser.o: ../core/request.h ../core/mounts.h ../core/mount.h
adduser.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
adduser.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
adduser.o: ../core/loadavg.h ../core/notify.h
adduser.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
adduser.o: ../core/mount.h ../core/locale.h ../templates/misc.h
adduser.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
cat.o: cat.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
cat.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
cat.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
cat.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
cat.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
cat.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h ../core/thread.h
cat.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
cat.o: ../core/request.h ../core/requesttypes.h ../core/session.h
cat.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
@ -35,52 +35,54 @@ cat.o: ../core/mount.h ../core/locale.h ../templates/misc.h
cat.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
chmod.o: chmod.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
chmod.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
chmod.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
chmod.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
chmod.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
chmod.o: ../core/request.h ../core/requesttypes.h ../core/session.h
chmod.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
chmod.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
chmod.o: ../core/config.h ../core/system.h ../core/dirs.h
chmod.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
chmod.o: ../core/mount.h ../core/mountparser.h ../core/users.h
chmod.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
chmod.o: ../core/group.h ../core/loadavg.h ../core/notify.h
chmod.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
chmod.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
chmod.o: ../core/thread.h ../core/dircontainer.h ../core/item.h
chmod.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
chmod.o: ../core/session.h ../core/error.h ../core/user.h
chmod.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
chmod.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
chmod.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
chmod.o: ../core/request.h ../core/mounts.h ../core/mount.h
chmod.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
chmod.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
chmod.o: ../core/loadavg.h ../core/notify.h
chmod.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
chmod.o: ../core/mount.h ../core/locale.h ../templates/misc.h
chmod.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
chmod.o: privchanger.h
chown.o: chown.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
chown.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
chown.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
chown.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
chown.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
chown.o: ../core/request.h ../core/requesttypes.h ../core/session.h
chown.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
chown.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
chown.o: ../core/config.h ../core/system.h ../core/dirs.h
chown.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
chown.o: ../core/mount.h ../core/mountparser.h ../core/users.h
chown.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
chown.o: ../core/group.h ../core/loadavg.h ../core/notify.h
chown.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
chown.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
chown.o: ../core/thread.h ../core/dircontainer.h ../core/item.h
chown.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
chown.o: ../core/session.h ../core/error.h ../core/user.h
chown.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
chown.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
chown.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
chown.o: ../core/request.h ../core/mounts.h ../core/mount.h
chown.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
chown.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
chown.o: ../core/loadavg.h ../core/notify.h
chown.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
chown.o: ../core/mount.h ../core/locale.h ../templates/misc.h
chown.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
chown.o: privchanger.h
ckeditor.o: ckeditor.h functionbase.h ../core/item.h ../db/db.h
ckeditor.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
ckeditor.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h
ckeditor.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
ckeditor.o: ../core/log.h ../core/dircontainer.h ../core/item.h
ckeditor.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
ckeditor.o: ../core/session.h ../core/error.h ../core/user.h
ckeditor.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
ckeditor.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
ckeditor.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
ckeditor.o: ../core/request.h ../core/mounts.h ../core/mount.h
ckeditor.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
ckeditor.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
ckeditor.o: ../core/loadavg.h ../core/notify.h
ckeditor.o: ../core/textstream.h ../core/error.h ../core/log.h
ckeditor.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
ckeditor.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
ckeditor.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
ckeditor.o: ../core/requesttypes.h ../core/session.h ../core/error.h
ckeditor.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
ckeditor.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
ckeditor.o: ../core/config.h ../core/system.h ../core/dirs.h
ckeditor.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
ckeditor.o: ../core/mount.h ../core/mountparser.h ../core/users.h
ckeditor.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
ckeditor.o: ../core/group.h ../core/loadavg.h ../core/notify.h
ckeditor.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
ckeditor.o: ../core/mount.h ../core/locale.h ../templates/misc.h
ckeditor.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
@ -91,13 +93,13 @@ ckeditor.o: reload.h rm.h run.h subject.h funthread.h template.h tinymce.h
ckeditor.o: uname.h upload.h uptime.h who.h ../core/htmlfilter.h
cp.o: cp.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
cp.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
cp.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
cp.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
cp.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
cp.o: ../core/request.h ../core/requesttypes.h ../core/session.h
cp.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
cp.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
cp.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/dircontainer.h
cp.o: ../core/error.h ../core/log.h ../db/dbitemquery.h ../db/dbitemcolumns.h
cp.o: ../core/user.h ../core/group.h ../core/thread.h ../core/dircontainer.h
cp.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
cp.o: ../core/requesttypes.h ../core/session.h ../core/error.h ../core/user.h
cp.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
cp.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
cp.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
cp.o: ../core/request.h ../core/mounts.h ../core/mount.h
cp.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
cp.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
@ -111,17 +113,17 @@ cp.o: priv.h reload.h rm.h run.h subject.h funthread.h template.h tinymce.h
cp.o: uname.h upload.h uptime.h who.h ../core/htmlfilter.h
createthread.o: createthread.h functionbase.h ../core/item.h ../db/db.h
createthread.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
createthread.o: ../core/textstream.h ../db/dbitemquery.h
createthread.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
createthread.o: ../core/thread.h ../core/error.h ../core/log.h
createthread.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
createthread.o: ../core/request.h ../core/requesttypes.h ../core/session.h
createthread.o: ../core/error.h ../core/user.h ../core/plugindata.h
createthread.o: ../core/rebus.h ../core/config.h ../core/confparser.h
createthread.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
createthread.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
createthread.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
createthread.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
createthread.o: ../core/textstream.h ../core/error.h ../core/log.h
createthread.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
createthread.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
createthread.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
createthread.o: ../core/requesttypes.h ../core/session.h ../core/error.h
createthread.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
createthread.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
createthread.o: ../core/config.h ../core/system.h ../core/dirs.h
createthread.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
createthread.o: ../core/mount.h ../core/mountparser.h ../core/users.h
createthread.o: ../core/ugcontainer.h ../core/lastcontainer.h
createthread.o: ../core/groups.h ../core/group.h ../core/loadavg.h
createthread.o: ../core/notify.h ../templatesnotify/templatesnotify.h
createthread.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
@ -134,51 +136,52 @@ createthread.o: rm.h run.h subject.h funthread.h template.h tinymce.h uname.h
createthread.o: upload.h uptime.h who.h ../core/htmlfilter.h
default.o: default.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
default.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
default.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
default.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
default.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
default.o: ../core/request.h ../core/requesttypes.h ../core/session.h
default.o: ../core/error.h ../core/user.h ../core/plugindata.h
default.o: ../core/rebus.h ../core/config.h ../core/confparser.h
default.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
default.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
default.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
default.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
default.o: ../core/groups.h ../core/group.h ../core/loadavg.h
default.o: ../core/notify.h ../templatesnotify/templatesnotify.h
default.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
default.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
default.o: ../core/system.h
default.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
default.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
default.o: ../core/thread.h ../core/dircontainer.h ../core/item.h
default.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
default.o: ../core/session.h ../core/error.h ../core/user.h
default.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
default.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
default.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
default.o: ../core/request.h ../core/mounts.h ../core/mount.h
default.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
default.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
default.o: ../core/loadavg.h ../core/notify.h
default.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
default.o: ../core/mount.h ../core/locale.h ../templates/misc.h
default.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
download.o: download.h functionbase.h ../core/item.h ../db/db.h
download.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
download.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h
download.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
download.o: ../core/log.h ../core/dircontainer.h ../core/item.h
download.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
download.o: ../core/session.h ../core/error.h ../core/user.h
download.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
download.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
download.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
download.o: ../core/request.h ../core/mounts.h ../core/mount.h
download.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
download.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
download.o: ../core/loadavg.h ../core/notify.h
download.o: ../core/textstream.h ../core/error.h ../core/log.h
download.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
download.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
download.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
download.o: ../core/requesttypes.h ../core/session.h ../core/error.h
download.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
download.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
download.o: ../core/config.h ../core/system.h ../core/dirs.h
download.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
download.o: ../core/mount.h ../core/mountparser.h ../core/users.h
download.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
download.o: ../core/group.h ../core/loadavg.h ../core/notify.h
download.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
download.o: ../core/mount.h ../core/locale.h ../templates/misc.h
download.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
emacs.o: emacs.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
emacs.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
emacs.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
emacs.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
emacs.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
emacs.o: ../core/request.h ../core/requesttypes.h ../core/session.h
emacs.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
emacs.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
emacs.o: ../core/config.h ../core/system.h ../core/dirs.h
emacs.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
emacs.o: ../core/mount.h ../core/mountparser.h ../core/users.h
emacs.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
emacs.o: ../core/group.h ../core/loadavg.h ../core/notify.h
emacs.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
emacs.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
emacs.o: ../core/thread.h ../core/dircontainer.h ../core/item.h
emacs.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
emacs.o: ../core/session.h ../core/error.h ../core/user.h
emacs.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
emacs.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
emacs.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
emacs.o: ../core/request.h ../core/mounts.h ../core/mount.h
emacs.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
emacs.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
emacs.o: ../core/loadavg.h ../core/notify.h
emacs.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
emacs.o: ../core/mount.h ../core/locale.h ../templates/misc.h
emacs.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
@ -193,9 +196,9 @@ emacs.o: node.h priv.h reload.h rm.h run.h subject.h funthread.h template.h
emacs.o: tinymce.h uname.h upload.h uptime.h who.h ../core/htmlfilter.h
functionbase.o: functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
functionbase.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
functionbase.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
functionbase.o: ../core/group.h ../core/thread.h ../core/error.h
functionbase.o: ../core/log.h ../core/dircontainer.h ../core/item.h
functionbase.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
functionbase.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
functionbase.o: ../core/thread.h ../core/dircontainer.h ../core/item.h
functionbase.o: ../core/ugcontainer.h ../core/request.h
functionbase.o: ../core/requesttypes.h ../core/session.h ../core/error.h
functionbase.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
@ -220,10 +223,10 @@ functionparser.o: ../core/session.h ../core/item.h ../core/error.h
functionparser.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
functionparser.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
functionparser.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h
functionparser.o: ../db/dbtextstream.h ../core/textstream.h
functionparser.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
functionparser.o: ../core/user.h ../core/group.h ../core/thread.h
functionparser.o: ../core/error.h ../core/log.h ../core/dircontainer.h
functionparser.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h
functionparser.o: ../core/log.h ../db/dbitemquery.h ../core/item.h
functionparser.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
functionparser.o: ../core/thread.h ../core/dircontainer.h
functionparser.o: ../core/ugcontainer.h ../core/system.h ../core/dirs.h
functionparser.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
functionparser.o: ../core/mount.h ../core/mountparser.h ../core/users.h
@ -241,18 +244,18 @@ functionparser.o: funthread.h template.h tinymce.h uname.h upload.h uptime.h
functionparser.o: who.h ../core/htmlfilter.h
functions.o: functions.h functionbase.h ../core/item.h ../db/db.h
functions.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
functions.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h
functions.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
functions.o: ../core/log.h ../core/dircontainer.h ../core/item.h
functions.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
functions.o: ../core/session.h ../core/error.h ../core/user.h
functions.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
functions.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
functions.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
functions.o: ../core/request.h ../core/mounts.h ../core/mount.h
functions.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
functions.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
functions.o: ../core/loadavg.h ../core/notify.h
functions.o: ../core/textstream.h ../core/error.h ../core/log.h
functions.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
functions.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
functions.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
functions.o: ../core/requesttypes.h ../core/session.h ../core/error.h
functions.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
functions.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
functions.o: ../core/config.h ../core/system.h ../core/dirs.h
functions.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
functions.o: ../core/mount.h ../core/mountparser.h ../core/users.h
functions.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
functions.o: ../core/group.h ../core/loadavg.h ../core/notify.h
functions.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
functions.o: ../core/mount.h ../core/locale.h ../templates/misc.h
functions.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
@ -270,25 +273,25 @@ functions.o: ../core/log.h ../templates/indexpatterns.h
functions.o: ../core/sessionmanager.h
funthread.o: funthread.h functionbase.h ../core/item.h ../db/db.h
funthread.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
funthread.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h
funthread.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
funthread.o: ../core/log.h ../core/dircontainer.h ../core/item.h
funthread.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
funthread.o: ../core/session.h ../core/error.h ../core/user.h
funthread.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
funthread.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
funthread.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
funthread.o: ../core/request.h ../core/mounts.h ../core/mount.h
funthread.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
funthread.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
funthread.o: ../core/loadavg.h ../core/notify.h
funthread.o: ../core/textstream.h ../core/error.h ../core/log.h
funthread.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
funthread.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
funthread.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
funthread.o: ../core/requesttypes.h ../core/session.h ../core/error.h
funthread.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
funthread.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
funthread.o: ../core/config.h ../core/system.h ../core/dirs.h
funthread.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
funthread.o: ../core/mount.h ../core/mountparser.h ../core/users.h
funthread.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
funthread.o: ../core/group.h ../core/loadavg.h ../core/notify.h
funthread.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
funthread.o: ../core/mount.h ../core/locale.h ../templates/misc.h
funthread.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
last.o: last.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
last.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
last.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
last.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
last.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
last.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h ../core/thread.h
last.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
last.o: ../core/request.h ../core/requesttypes.h ../core/session.h
last.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
@ -303,45 +306,47 @@ last.o: ../core/mount.h ../core/locale.h ../templates/misc.h
last.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
login.o: login.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
login.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
login.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
login.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
login.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
login.o: ../core/request.h ../core/requesttypes.h ../core/session.h
login.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
login.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
login.o: ../core/config.h ../core/system.h ../core/dirs.h
login.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
login.o: ../core/mount.h ../core/mountparser.h ../core/users.h
login.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
login.o: ../core/group.h ../core/loadavg.h ../core/notify.h
login.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
login.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
login.o: ../core/thread.h ../core/dircontainer.h ../core/item.h
login.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
login.o: ../core/session.h ../core/error.h ../core/user.h
login.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
login.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
login.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
login.o: ../core/request.h ../core/mounts.h ../core/mount.h
login.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
login.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
login.o: ../core/loadavg.h ../core/notify.h
login.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
login.o: ../core/mount.h ../core/locale.h ../templates/misc.h
login.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
logout.o: logout.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
logout.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
logout.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
logout.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
logout.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
logout.o: ../core/request.h ../core/requesttypes.h ../core/session.h
logout.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
logout.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
logout.o: ../core/config.h ../core/system.h ../core/dirs.h
logout.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
logout.o: ../core/mount.h ../core/mountparser.h ../core/users.h
logout.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
logout.o: ../core/group.h ../core/loadavg.h ../core/notify.h
logout.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
logout.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
logout.o: ../core/thread.h ../core/dircontainer.h ../core/item.h
logout.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
logout.o: ../core/session.h ../core/error.h ../core/user.h
logout.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
logout.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
logout.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
logout.o: ../core/request.h ../core/mounts.h ../core/mount.h
logout.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
logout.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
logout.o: ../core/loadavg.h ../core/notify.h
logout.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
logout.o: ../core/mount.h ../core/locale.h ../templates/misc.h
logout.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
ls.o: ls.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
ls.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
ls.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
ls.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
ls.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
ls.o: ../core/request.h ../core/requesttypes.h ../core/session.h
ls.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
ls.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
ls.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/dircontainer.h
ls.o: ../core/error.h ../core/log.h ../db/dbitemquery.h ../db/dbitemcolumns.h
ls.o: ../core/user.h ../core/group.h ../core/thread.h ../core/dircontainer.h
ls.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
ls.o: ../core/requesttypes.h ../core/session.h ../core/error.h ../core/user.h
ls.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
ls.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
ls.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
ls.o: ../core/request.h ../core/mounts.h ../core/mount.h
ls.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
ls.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
@ -351,17 +356,18 @@ ls.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
ls.o: ../core/system.h
mkdir.o: mkdir.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
mkdir.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
mkdir.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
mkdir.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
mkdir.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
mkdir.o: ../core/request.h ../core/requesttypes.h ../core/session.h
mkdir.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
mkdir.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
mkdir.o: ../core/config.h ../core/system.h ../core/dirs.h
mkdir.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
mkdir.o: ../core/mount.h ../core/mountparser.h ../core/users.h
mkdir.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
mkdir.o: ../core/group.h ../core/loadavg.h ../core/notify.h
mkdir.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
mkdir.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
mkdir.o: ../core/thread.h ../core/dircontainer.h ../core/item.h
mkdir.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
mkdir.o: ../core/session.h ../core/error.h ../core/user.h
mkdir.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
mkdir.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
mkdir.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
mkdir.o: ../core/request.h ../core/mounts.h ../core/mount.h
mkdir.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
mkdir.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
mkdir.o: ../core/loadavg.h ../core/notify.h
mkdir.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
mkdir.o: ../core/mount.h ../core/locale.h ../templates/misc.h
mkdir.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
@ -372,13 +378,13 @@ mkdir.o: subject.h funthread.h template.h tinymce.h uname.h upload.h uptime.h
mkdir.o: who.h ../core/htmlfilter.h
mv.o: mv.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
mv.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
mv.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
mv.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
mv.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
mv.o: ../core/request.h ../core/requesttypes.h ../core/session.h
mv.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
mv.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
mv.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/dircontainer.h
mv.o: ../core/error.h ../core/log.h ../db/dbitemquery.h ../db/dbitemcolumns.h
mv.o: ../core/user.h ../core/group.h ../core/thread.h ../core/dircontainer.h
mv.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
mv.o: ../core/requesttypes.h ../core/session.h ../core/error.h ../core/user.h
mv.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
mv.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
mv.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
mv.o: ../core/request.h ../core/mounts.h ../core/mount.h
mv.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
mv.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
@ -392,8 +398,8 @@ mv.o: reload.h rm.h run.h subject.h funthread.h template.h tinymce.h uname.h
mv.o: upload.h uptime.h who.h ../core/htmlfilter.h
node.o: node.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
node.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
node.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
node.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
node.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
node.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h ../core/thread.h
node.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
node.o: ../core/request.h ../core/requesttypes.h ../core/session.h
node.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
@ -408,8 +414,8 @@ node.o: ../core/mount.h ../core/locale.h ../templates/misc.h
node.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
priv.o: priv.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
priv.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
priv.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
priv.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
priv.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
priv.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h ../core/thread.h
priv.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
priv.o: ../core/request.h ../core/requesttypes.h ../core/session.h
priv.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
@ -429,26 +435,27 @@ privchanger.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
privchanger.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
privchanger.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
privchanger.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
privchanger.o: ../core/textstream.h ../db/dbitemquery.h ../core/item.h
privchanger.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
privchanger.o: ../core/thread.h ../core/error.h ../core/log.h
privchanger.o: ../core/textstream.h ../core/error.h ../core/log.h
privchanger.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
privchanger.o: ../core/user.h ../core/group.h ../core/thread.h
privchanger.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
privchanger.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
privchanger.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
privchanger.o: ../core/groups.h ../core/group.h ../core/loadavg.h
reload.o: reload.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
reload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
reload.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
reload.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
reload.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
reload.o: ../core/request.h ../core/requesttypes.h ../core/session.h
reload.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
reload.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
reload.o: ../core/config.h ../core/system.h ../core/dirs.h
reload.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
reload.o: ../core/mount.h ../core/mountparser.h ../core/users.h
reload.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
reload.o: ../core/group.h ../core/loadavg.h ../core/notify.h
reload.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
reload.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
reload.o: ../core/thread.h ../core/dircontainer.h ../core/item.h
reload.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
reload.o: ../core/session.h ../core/error.h ../core/user.h
reload.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
reload.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
reload.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
reload.o: ../core/request.h ../core/mounts.h ../core/mount.h
reload.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
reload.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
reload.o: ../core/loadavg.h ../core/notify.h
reload.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
reload.o: ../core/mount.h ../core/locale.h ../templates/misc.h
reload.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
@ -459,13 +466,13 @@ reload.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h
reload.o: ../core/sessioncontainer.h
rm.o: rm.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
rm.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
rm.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
rm.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
rm.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
rm.o: ../core/request.h ../core/requesttypes.h ../core/session.h
rm.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
rm.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
rm.o: ../core/config.h ../core/system.h ../core/dirs.h ../core/dircontainer.h
rm.o: ../core/error.h ../core/log.h ../db/dbitemquery.h ../db/dbitemcolumns.h
rm.o: ../core/user.h ../core/group.h ../core/thread.h ../core/dircontainer.h
rm.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
rm.o: ../core/requesttypes.h ../core/session.h ../core/error.h ../core/user.h
rm.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
rm.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
rm.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
rm.o: ../core/request.h ../core/mounts.h ../core/mount.h
rm.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
rm.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
@ -480,8 +487,8 @@ rm.o: ../templates/ckeditorgetparser.h ../core/httpsimpleparser.h
rm.o: ../core/log.h ../templates/indexpatterns.h ../core/sessionmanager.h
run.o: run.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
run.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
run.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
run.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
run.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
run.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h ../core/thread.h
run.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
run.o: ../core/request.h ../core/requesttypes.h ../core/session.h
run.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
@ -496,113 +503,117 @@ run.o: ../core/mount.h ../core/locale.h ../templates/misc.h
run.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
subject.o: subject.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
subject.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
subject.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
subject.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
subject.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
subject.o: ../core/request.h ../core/requesttypes.h ../core/session.h
subject.o: ../core/error.h ../core/user.h ../core/plugindata.h
subject.o: ../core/rebus.h ../core/config.h ../core/confparser.h
subject.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
subject.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
subject.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
subject.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
subject.o: ../core/groups.h ../core/group.h ../core/loadavg.h
subject.o: ../core/notify.h ../templatesnotify/templatesnotify.h
subject.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
subject.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
subject.o: ../core/system.h
subject.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
subject.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
subject.o: ../core/thread.h ../core/dircontainer.h ../core/item.h
subject.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
subject.o: ../core/session.h ../core/error.h ../core/user.h
subject.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
subject.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
subject.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
subject.o: ../core/request.h ../core/mounts.h ../core/mount.h
subject.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
subject.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
subject.o: ../core/loadavg.h ../core/notify.h
subject.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
subject.o: ../core/mount.h ../core/locale.h ../templates/misc.h
subject.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
template.o: template.h functionbase.h ../core/item.h ../db/db.h
template.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
template.o: ../core/textstream.h ../db/dbitemquery.h ../db/dbitemcolumns.h
template.o: ../core/user.h ../core/group.h ../core/thread.h ../core/error.h
template.o: ../core/log.h ../core/dircontainer.h ../core/item.h
template.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
template.o: ../core/session.h ../core/error.h ../core/user.h
template.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
template.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
template.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
template.o: ../core/request.h ../core/mounts.h ../core/mount.h
template.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
template.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
template.o: ../core/loadavg.h ../core/notify.h
template.o: ../core/textstream.h ../core/error.h ../core/log.h
template.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
template.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
template.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
template.o: ../core/requesttypes.h ../core/session.h ../core/error.h
template.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
template.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
template.o: ../core/config.h ../core/system.h ../core/dirs.h
template.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
template.o: ../core/mount.h ../core/mountparser.h ../core/users.h
template.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
template.o: ../core/group.h ../core/loadavg.h ../core/notify.h
template.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
template.o: ../core/mount.h ../core/locale.h ../templates/misc.h
template.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
template.o: ../core/misc.h
tinymce.o: tinymce.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
tinymce.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
tinymce.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
tinymce.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
tinymce.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
tinymce.o: ../core/request.h ../core/requesttypes.h ../core/session.h
tinymce.o: ../core/error.h ../core/user.h ../core/plugindata.h
tinymce.o: ../core/rebus.h ../core/config.h ../core/confparser.h
tinymce.o: ../core/htmlfilter.h ../core/config.h ../core/system.h
tinymce.o: ../core/dirs.h ../core/dircontainer.h ../core/request.h
tinymce.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
tinymce.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
tinymce.o: ../core/groups.h ../core/group.h ../core/loadavg.h
tinymce.o: ../core/notify.h ../templatesnotify/templatesnotify.h
tinymce.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h
tinymce.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
tinymce.o: ../core/system.h functions.h functionparser.h adduser.h cat.h
tinymce.o: chmod.h privchanger.h chown.h ckeditor.h cp.h createthread.h
tinymce.o: default.h download.h emacs.h last.h login.h logout.h ls.h mkdir.h
tinymce.o: mv.h node.h priv.h reload.h rm.h run.h subject.h funthread.h
tinymce.o: template.h uname.h upload.h uptime.h who.h ../core/htmlfilter.h
tinymce.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
tinymce.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
tinymce.o: ../core/thread.h ../core/dircontainer.h ../core/item.h
tinymce.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
tinymce.o: ../core/session.h ../core/error.h ../core/user.h
tinymce.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
tinymce.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
tinymce.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
tinymce.o: ../core/request.h ../core/mounts.h ../core/mount.h
tinymce.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
tinymce.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
tinymce.o: ../core/loadavg.h ../core/notify.h
tinymce.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
tinymce.o: ../core/mount.h ../core/locale.h ../templates/misc.h
tinymce.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
tinymce.o: functions.h functionparser.h adduser.h cat.h chmod.h privchanger.h
tinymce.o: chown.h ckeditor.h cp.h createthread.h default.h download.h
tinymce.o: emacs.h last.h login.h logout.h ls.h mkdir.h mv.h node.h priv.h
tinymce.o: reload.h rm.h run.h subject.h funthread.h template.h uname.h
tinymce.o: upload.h uptime.h who.h ../core/htmlfilter.h
uname.o: uname.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
uname.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
uname.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
uname.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
uname.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
uname.o: ../core/request.h ../core/requesttypes.h ../core/session.h
uname.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
uname.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
uname.o: ../core/config.h ../core/system.h ../core/dirs.h
uname.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
uname.o: ../core/mount.h ../core/mountparser.h ../core/users.h
uname.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
uname.o: ../core/group.h ../core/loadavg.h ../core/notify.h
uname.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
uname.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
uname.o: ../core/thread.h ../core/dircontainer.h ../core/item.h
uname.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
uname.o: ../core/session.h ../core/error.h ../core/user.h
uname.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
uname.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
uname.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
uname.o: ../core/request.h ../core/mounts.h ../core/mount.h
uname.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
uname.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
uname.o: ../core/loadavg.h ../core/notify.h
uname.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
uname.o: ../core/mount.h ../core/locale.h ../templates/misc.h
uname.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
upload.o: upload.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
upload.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
upload.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
upload.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
upload.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
upload.o: ../core/request.h ../core/requesttypes.h ../core/session.h
upload.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
upload.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
upload.o: ../core/config.h ../core/system.h ../core/dirs.h
upload.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
upload.o: ../core/mount.h ../core/mountparser.h ../core/users.h
upload.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
upload.o: ../core/group.h ../core/loadavg.h ../core/notify.h
upload.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
upload.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
upload.o: ../core/thread.h ../core/dircontainer.h ../core/item.h
upload.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
upload.o: ../core/session.h ../core/error.h ../core/user.h
upload.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
upload.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
upload.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
upload.o: ../core/request.h ../core/mounts.h ../core/mount.h
upload.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
upload.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
upload.o: ../core/loadavg.h ../core/notify.h
upload.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
upload.o: ../core/mount.h ../core/locale.h ../templates/misc.h
upload.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
upload.o: ../core/misc.h ../functions/functions.h
uptime.o: uptime.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
uptime.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
uptime.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
uptime.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
uptime.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
uptime.o: ../core/request.h ../core/requesttypes.h ../core/session.h
uptime.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
uptime.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
uptime.o: ../core/config.h ../core/system.h ../core/dirs.h
uptime.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
uptime.o: ../core/mount.h ../core/mountparser.h ../core/users.h
uptime.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
uptime.o: ../core/group.h ../core/loadavg.h ../core/notify.h
uptime.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
uptime.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h
uptime.o: ../core/thread.h ../core/dircontainer.h ../core/item.h
uptime.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
uptime.o: ../core/session.h ../core/error.h ../core/user.h
uptime.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
uptime.o: ../core/confparser.h ../core/htmlfilter.h ../core/config.h
uptime.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
uptime.o: ../core/request.h ../core/mounts.h ../core/mount.h
uptime.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
uptime.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
uptime.o: ../core/loadavg.h ../core/notify.h
uptime.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
uptime.o: ../core/mount.h ../core/locale.h ../templates/misc.h
uptime.o: ../templates/localefilter.h ../core/locale.h ../core/system.h
who.o: who.h functionbase.h ../core/item.h ../db/db.h ../db/dbbase.h
who.o: ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
who.o: ../db/dbitemquery.h ../db/dbitemcolumns.h ../core/user.h
who.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
who.o: ../core/error.h ../core/log.h ../db/dbitemquery.h
who.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h ../core/thread.h
who.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
who.o: ../core/request.h ../core/requesttypes.h ../core/session.h
who.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h

View File

@ -115,9 +115,6 @@ void Emacs::MakePost()
else
{
request->status = system->EditFile(request->item, request->item.url != old_url);
if( request->status == WINIX_ERR_OK )
TemplatesFunctions::pattern_cacher.UpdatePattern(request->item);
}

View File

@ -358,6 +358,28 @@ void Functions::CheckGetPostTimes(time_t difference)
// !!uwaga zwracana wartoϾ zmieniona (true/false)
bool Functions::CheckAbuse()
{
if( !system->rebus.CheckRebus() )
{
request->status = WINIX_ERR_INCORRECT_REBUS;
return true;
}
CheckGetPostTimes();
if( request->session->spam_score > 0 )
{
request->status = WINIX_ERR_SPAM;
log << log1 << "Functions: ignoring due to suspected spamming" << logend;
return true;
}
return false;
}
// returning true if the 'url' has to be changed

View File

@ -110,6 +110,8 @@ public:
void CheckGetPostTimes(time_t difference = 10);
bool CheckAbuse();
// !! dac lepsze nazwy
void ReadItemFilterHtml(Item & item);
void ReadItemContent(Item & item, const std::string & content_type);

View File

@ -1 +1,17 @@
<p class="iteminfo">{added_by}: [dir_last_user], [dir_last_date_creation][if-no dir_last_dates_equal], {last_modified}: [dir_last_date_modification][end]</p>
<p class="iteminfo">
{added_by}: [dir_last_user], [dir_last_date_creation_nice]
[if-no dir_last_dates_equal]
, {last_modified}
[if dir_last_users_different]
{by}: [dir_last_modification_user],
[else]
:
[end]
[dir_last_date_modification_nice]
[end]
</p>

View File

@ -17,146 +17,41 @@
[end]
<p class="withnext">{title}:</p>
<input class="edit" type="text" name="subject" value="[item_subject]">
<input class="edit" type="text" name="subject" value="[ticket_item_subject]">
<table class="ticket">
[if-one ticket_type_tab_defined]
[if-one ticket_type_tab]
[if ticket_tab]
<table class="ticket">
[for ticket_tab]
<tr>
<th>{form_ticket_type}:</th>
<th>[ticket_tab_param]:</th>
<td>
<select name="type">
[for ticket_type_tab]
<option [if-one ticket_type_tab_isdefault]selected [end]value="[ticket_type_tab_index]">[ticket_type_tab_name]</option>
[if ticket_tab_is_select]
<select name="ticketparam[ticket_tab_param_index]">
[for ticket_tab_select_tab]
<option [if ticket_tab_select_tab_is_default]selected [end]value="[ticket_tab_select_tab_id]">[ticket_tab_select_tab_name]</option>
[end]
</select>
[end]
</select>
[if ticket_tab_is_integer]
<input type="text" name="ticketparam[ticket_tab_param_index]" value="[ticket_tab_value]">
[end]
</td>
</tr>
[end]
[else]
<tr>
<th>{form_ticket_type}:</th>
<td>
<select name="type">
<option value="0">-</option>
</select>
</td>
</tr>
</table>
[end]
[if-one ticket_status_tab_defined]
[if-one ticket_status_tab]
<tr>
<th>{form_ticket_status}:</th>
<td>
<select name="status">
[for ticket_status_tab]
<option [if-one ticket_status_tab_isdefault]selected [end]value="[ticket_status_tab_index]">[ticket_status_tab_name]</option>
[end]
</select>
</td>
</tr>
[end]
[else]
<tr>
<th>{form_ticket_status}:</th>
<td>
<select name="status">
<option value="0">-</option>
</select>
</td>
</tr>
[end]
[if-one ticket_priority_tab_defined]
[if-one ticket_priority_tab]
<tr>
<th>{form_ticket_priority}:</th>
<td>
<select name="priority">
[for ticket_priority_tab]
<option [if-one ticket_priority_tab_isdefault]selected [end]value="[ticket_priority_tab_index]">[ticket_priority_tab_name]</option>
[end]
</select>
</td>
</tr>
[end]
[else]
<tr>
<th>{form_ticket_priority}:</th>
<td>
<select name="priority">
<option value="0">-</option>
</select>
</td>
</tr>
[end]
[if-one ticket_category_tab_defined]
[if-one ticket_category_tab]
<tr>
<th>{form_ticket_category}:</th>
<td>
<select name="category">
[for ticket_category_tab]
<option [if-one ticket_category_tab_isdefault]selected [end]value="[ticket_category_tab_index]">[ticket_category_tab_name]</option>
[end]
</select>
</td>
</tr>
[end]
[else]
<tr>
<th>{form_ticket_category}:</th>
<td>
<select name="category">
<option value="0">-</option>
</select>
</td>
</tr>
[end]
[if-one ticket_expected_tab_defined]
[if-one ticket_expected_tab]
<tr>
<th>{form_ticket_expected}:</th>
<td>
<select name="expected">
[for ticket_expected_tab]
<option [if-one ticket_expected_tab_isdefault]selected [end]value="[ticket_expected_tab_index]">[ticket_expected_tab_name]</option>
[end]
</select>
</td>
</tr>
[end]
[else]
<tr>
<th>{form_ticket_expected}:</th>
<td>
<select name="expected">
<option value="0">-</option>
</select>
</td>
</tr>
[end]
<tr>
<th>{form_ticket_progress}:</th>
<td><input type="text" name="progress" value="[ticket_progress]"></td>
</tr>
</table>
[# !! change names form_emacs_content_thread and form_emacs_content_ticket]
<p class="withnext">{form_emacs_content_ticket}</p>

View File

@ -9,26 +9,30 @@
[end]
[if-one ticket_tab]
[if tickets_tab]
<table class="tickettab">
<tr>
<th>{ticket_tab_name}</th>
[if-any ticket_type_tab]<th>{ticket_tab_type}</th>[end]
[if-any ticket_status_tab]<th>{ticket_tab_status}</th>[end]
<th>{ticket_info_progress}</th>
[if-any ticket_priority_tab]<th>{ticket_tab_priority}</th>[end]
[if-any ticket_expected_tab]<th>{ticket_tab_expected}</th>[end]
<th>{tickets_header_name}</th>
[for ticket_tab]
<th>[ticket_tab_param]</th>
[end]
</tr>
[for ticket_tab]
[for tickets_tab]
<tr>
<td class="tickettabtitle"><a href="[doc_base_url][dir][ticket_tab_url]">[if-no ticket_tab_subject_empty][ticket_tab_subject][else]&lt;[ticket_tab_url]&gt;[else]</a></td>
[if-any ticket_type_tab]<td>[ticket_tab_type]</td>[end]
[if-any ticket_status_tab]<td>[ticket_tab_status]</td>[end]
<td><img src="[doc_base_url_common]/{ticket_progress_image_path}/progress_[ticket_tab_progress_image_number].gif" alt="progress [ticket_tab_progress]%"></td>
[if-any ticket_priority_tab]<td>[ticket_tab_priority]</td>[end]
[if-any ticket_expected_tab]<td>[ticket_tab_expected]</td>[end]
<td class="tickettabtitle"><a href="[doc_base_url][dir][tickets_tab_url]">[if-no tickets_tab_subject_empty][tickets_tab_subject][else]&lt;[tickets_tab_url]&gt;[end]</a></td>
[for tickets_tab_conf_tab]
[if tickets_tab_conf_tab_is_progress]
<td><img src="[doc_base_url_common]/{ticket_progress_image_path}/progress_[tickets_tab_conf_tab_progress_image_number].gif" alt="progress [tickets_tab_conf_tab_value]%"></td>
[else]
<td>[tickets_tab_conf_tab_value]</td>
[end]
[end]
</tr>
[end]
</table>
[end]
@ -37,12 +41,9 @@
<div class="ticketinfo">
[if-one ticket_can_edit]<p class="edit"><a href="[doc_base_url][dir]editticket">\[{edit}\]</a></p>[end]
<table>
[if-any ticket_type_tab]<tr><th>{ticket_info_type}:</th><td>[ticket_type]</td></tr>[end]
[if-any ticket_status_tab]<tr><th>{ticket_info_status}:</th><td>[ticket_status]</td></tr>[end]
[if-any ticket_priority_tab]<tr><th>{ticket_info_priority}:</th><td>[ticket_priority]</td></tr>[end]
[if-any ticket_category_tab]<tr><th>{ticket_info_category}:</th><td>[ticket_category]</td></tr>[end]
[if-any ticket_expected_tab]<tr><th>{ticket_info_expected}:</th><td>[ticket_expected]</td></tr>[end]
<tr><th>{ticket_info_progress}:</th><td>[ticket_progress]%</td></tr>
[for ticket_tab]
<tr><th>[ticket_tab_param]:</th><td>[ticket_tab_value]</td></th></tr>
[end]
</table>
[ticket_item_print_content]
</div>

View File

@ -1 +1,16 @@
<p class="iteminfo">{added_by}: [item_user], [item_date_creation_nice][if-no item_dates_equal], {last_modified}[if-one item_users_different] {by}: [item_modification_user], [else]: [end][item_date_modification_nice][end]</p>
<p class="iteminfo">
{added_by}: [item_user], [item_date_creation_nice]
[if-no item_dates_equal]
, {last_modified}
[if item_users_different]
{by}: [item_modification_user],
[else]
:
[end]
[item_date_modification_nice]
[end]
</p>

View File

@ -1 +1,18 @@
<p class="[if-index item_tab odd]itemtabinfo[else][if mount_thread_arg_is "subject"]itemtabinfo[else]itemtabinfo2[end][end]">{added_by}: [item_tab_user], [item_tab_date_creation_nice][if-no item_tab_dates_equal], {last_modified}[if-one item_tab_users_different] {by}: [item_tab_modification_user], [else]: [end][item_tab_date_modification_nice][end]</p>
<p class="[if-index item_tab odd]itemtabinfo[else][if mount_thread_arg_is "subject"]itemtabinfo[else]itemtabinfo2[end][end]">
{added_by}: [item_tab_user], [item_tab_date_creation_nice]
[if-no item_tab_dates_equal]
, {last_modified}
[if-one item_tab_users_different]
{by}: [item_tab_modification_user],
[else]
:
[end]
[item_tab_date_modification_nice]
[end]
</p>

View File

@ -136,11 +136,8 @@ thread_reply_in_this_thread = Reply in this thread
ticket_progress_image_path = ticket_progress
ticket_create_new = Create a new ticket
ticket_tab_name = Ticket
ticket_tab_type = Type
ticket_tab_status = Status
ticket_tab_priority = Priority
ticket_tab_expected = Expected in
tickets_header_name = Ticket
ticket_info_type = Type
ticket_info_status = Status

View File

@ -138,11 +138,7 @@ thread_reply_in_this_thread = Odpowiedz w tym w
ticket_progress_image_path = ticket_progress
ticket_create_new = Załóż nowe zgłoszenie
ticket_tab_name = Zg³oszenie
ticket_tab_type = Rodzaj
ticket_tab_status = Status
ticket_tab_priority = Priorytet
ticket_tab_expected = Oczeki-<br>wany w
tickets_header_name = Zg這szenie
ticket_info_type = Rodzaj zgłoszenia

View File

@ -3,21 +3,21 @@
main.o: ../core/log.h ../core/app.h ../core/config.h ../core/confparser.h
main.o: ../core/htmlfilter.h ../core/system.h ../core/dirs.h ../core/item.h
main.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
main.o: ../db/dbtextstream.h ../core/textstream.h ../db/dbitemquery.h
main.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
main.o: ../core/thread.h ../core/error.h ../core/log.h ../core/dircontainer.h
main.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
main.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h
main.o: ../core/rebus.h ../core/mounts.h ../core/mount.h
main.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
main.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
main.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
main.o: ../core/notify.h ../templatesnotify/templatesnotify.h
main.o: ../../ezc/src/ezc.h ../core/mount.h ../core/locale.h ../core/config.h
main.o: ../templates/misc.h ../templates/localefilter.h ../core/locale.h
main.o: ../functions/functions.h ../functions/functionbase.h
main.o: ../core/request.h ../core/system.h ../core/notify.h
main.o: ../functions/functionparser.h ../functions/adduser.h
main.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h
main.o: ../core/log.h ../db/dbitemquery.h ../core/item.h
main.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h ../core/thread.h
main.o: ../core/dircontainer.h ../core/ugcontainer.h ../core/request.h
main.o: ../core/requesttypes.h ../core/session.h ../core/error.h
main.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/mounts.h
main.o: ../core/mount.h ../core/mountparser.h ../core/users.h
main.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
main.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
main.o: ../core/sessioncontainer.h ../core/notify.h
main.o: ../templatesnotify/templatesnotify.h ../../ezc/src/ezc.h
main.o: ../core/mount.h ../core/locale.h ../core/config.h ../templates/misc.h
main.o: ../templates/localefilter.h ../core/locale.h ../functions/functions.h
main.o: ../functions/functionbase.h ../core/request.h ../core/system.h
main.o: ../core/notify.h ../functions/functionparser.h ../functions/adduser.h
main.o: ../functions/cat.h ../functions/chmod.h ../functions/privchanger.h
main.o: ../functions/chown.h ../functions/ckeditor.h ../functions/cp.h
main.o: ../functions/createthread.h ../functions/default.h

View File

@ -7,9 +7,9 @@ init.o: ../../core/log.h ../../core/user.h ../../core/plugindata.h
init.o: ../../core/rebus.h ../../core/config.h ../../core/confparser.h
init.o: ../../core/htmlfilter.h ../../core/config.h ../../db/db.h
init.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
init.o: ../../core/textstream.h ../../db/dbitemquery.h ../../core/item.h
init.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
init.o: ../../core/thread.h ../../core/error.h ../../core/dircontainer.h
init.o: ../../core/textstream.h ../../core/error.h ../../db/dbitemquery.h
init.o: ../../core/item.h ../../db/dbitemcolumns.h ../../core/user.h
init.o: ../../core/group.h ../../core/thread.h ../../core/dircontainer.h
init.o: ../../core/ugcontainer.h bot.h stats.h templates.h
init.o: ../../core/plugin.h ../../core/pluginmsg.h ../../core/request.h
init.o: ../../core/system.h ../../core/dirs.h ../../core/dircontainer.h
@ -49,9 +49,10 @@ templates.o: ../../core/confparser.h ../../core/htmlfilter.h
templates.o: ../../core/request.h ../../core/system.h ../../core/dirs.h
templates.o: ../../core/item.h ../../core/dircontainer.h ../../db/db.h
templates.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
templates.o: ../../core/textstream.h ../../db/dbitemquery.h ../../core/item.h
templates.o: ../../core/textstream.h ../../core/error.h
templates.o: ../../db/dbitemquery.h ../../core/item.h
templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
templates.o: ../../core/thread.h ../../core/error.h ../../core/dircontainer.h
templates.o: ../../core/thread.h ../../core/dircontainer.h
templates.o: ../../core/ugcontainer.h ../../core/mounts.h ../../core/mount.h
templates.o: ../../core/error.h ../../core/mountparser.h ../../core/users.h
templates.o: ../../core/user.h ../../core/ugcontainer.h

View File

@ -3,28 +3,28 @@
createticket.o: createticket.h tdb.h ticket.h ../../db/dbbase.h
createticket.o: ../../db/dbconn.h ../../db/dbtextstream.h
createticket.o: ../../core/textstream.h ../../core/error.h ../../core/log.h
createticket.o: ticketinfo.h ticketparser.h ticketconf.h ../../core/item.h
createticket.o: ../../core/system.h ../../core/dirs.h ../../core/item.h
createticket.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
createticket.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
createticket.o: ../../core/user.h ../../core/group.h ../../core/thread.h
createticket.o: ../../core/dircontainer.h ../../core/ugcontainer.h
createticket.o: ../../functions/functionbase.h ../../core/item.h
createticket.o: ../../db/db.h ../../db/dbbase.h ../../db/dbitemquery.h
createticket.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
createticket.o: ../../core/thread.h ../../core/dircontainer.h
createticket.o: ../../core/item.h ../../core/ugcontainer.h
createticket.o: ../../core/request.h ../../core/requesttypes.h
createticket.o: ../../core/session.h ../../core/error.h ../../core/user.h
createticket.o: ../../core/plugindata.h ../../core/rebus.h
createticket.o: ../../core/config.h ../../core/confparser.h
createticket.o: ../../core/htmlfilter.h ../../core/mounts.h
createticket.o: ../../core/mount.h ../../core/mountparser.h
createticket.o: ../../core/users.h ../../core/ugcontainer.h
createticket.o: ../../core/lastcontainer.h ../../core/groups.h
createticket.o: ../../core/group.h ../../core/loadavg.h
createticket.o: ../../functions/functionbase.h ../../core/request.h
createticket.o: ../../core/config.h ../../core/notify.h
createticket.o: ../../templatesnotify/templatesnotify.h
createticket.o: ../../core/htmlfilter.h ../../core/config.h
createticket.o: ../../core/system.h ../../core/dirs.h
createticket.o: ../../core/dircontainer.h ../../core/request.h
createticket.o: ../../core/mounts.h ../../core/mount.h
createticket.o: ../../core/mountparser.h ../../core/users.h
createticket.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
createticket.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h
createticket.o: ../../core/notify.h ../../templatesnotify/templatesnotify.h
createticket.o: ../../../ezc/src/ezc.h ../../core/mount.h ../../core/locale.h
createticket.o: ../../templates/misc.h ../../templates/localefilter.h
createticket.o: ../../core/locale.h ../../core/system.h readticket.h
createticket.o: ../../functions/functions.h ../../functions/functionbase.h
createticket.o: ../../core/locale.h ../../core/system.h ticketinfo.h
createticket.o: ticketparser.h ticketconf.h ../../functions/functions.h
createticket.o: ../../functions/functionbase.h
createticket.o: ../../functions/functionparser.h ../../functions/adduser.h
createticket.o: ../../functions/cat.h ../../functions/chmod.h
createticket.o: ../../functions/privchanger.h ../../functions/chown.h
@ -50,19 +50,19 @@ editticket.o: ../../db/db.h ../../db/dbbase.h ../../db/dbitemquery.h
editticket.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
editticket.o: ../../core/thread.h ../../core/dircontainer.h
editticket.o: ../../core/ugcontainer.h ../../core/request.h
editticket.o: ../../core/requesttypes.h ../../core/session.h
editticket.o: ../../core/error.h ../../core/user.h ../../core/plugindata.h
editticket.o: ../../core/rebus.h ../../core/config.h ../../core/confparser.h
editticket.o: ../../core/htmlfilter.h ../../core/mounts.h ../../core/mount.h
editticket.o: ../../core/mountparser.h ../../core/users.h
editticket.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
editticket.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h
editticket.o: ../../core/mounts.h ../../core/mount.h ../../core/error.h
editticket.o: ../../core/mountparser.h ../../core/config.h
editticket.o: ../../core/confparser.h ../../core/htmlfilter.h
editticket.o: ../../core/users.h ../../core/user.h ../../core/ugcontainer.h
editticket.o: ../../core/lastcontainer.h ../../core/groups.h
editticket.o: ../../core/group.h ../../core/rebus.h ../../core/loadavg.h
editticket.o: ../../functions/functionbase.h ../../core/request.h
editticket.o: ../../core/config.h ../../core/notify.h
editticket.o: ../../core/requesttypes.h ../../core/session.h
editticket.o: ../../core/plugindata.h ../../core/config.h ../../core/notify.h
editticket.o: ../../templatesnotify/templatesnotify.h ../../../ezc/src/ezc.h
editticket.o: ../../core/mount.h ../../core/locale.h ../../templates/misc.h
editticket.o: ../../templates/localefilter.h ../../core/locale.h
editticket.o: ../../core/system.h readticket.h ../../functions/functions.h
editticket.o: ../../core/system.h ../../functions/functions.h
editticket.o: ../../functions/functionbase.h ../../functions/functionparser.h
editticket.o: ../../functions/adduser.h ../../functions/cat.h
editticket.o: ../../functions/chmod.h ../../functions/privchanger.h
@ -89,15 +89,15 @@ funticket.o: ../../db/db.h ../../db/dbbase.h ../../db/dbitemquery.h
funticket.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
funticket.o: ../../core/thread.h ../../core/dircontainer.h
funticket.o: ../../core/ugcontainer.h ../../core/request.h
funticket.o: ../../core/requesttypes.h ../../core/session.h
funticket.o: ../../core/error.h ../../core/user.h ../../core/plugindata.h
funticket.o: ../../core/rebus.h ../../core/config.h ../../core/confparser.h
funticket.o: ../../core/htmlfilter.h ../../core/mounts.h ../../core/mount.h
funticket.o: ../../core/mountparser.h ../../core/users.h
funticket.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
funticket.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h
funticket.o: ../../core/mounts.h ../../core/mount.h ../../core/error.h
funticket.o: ../../core/mountparser.h ../../core/config.h
funticket.o: ../../core/confparser.h ../../core/htmlfilter.h
funticket.o: ../../core/users.h ../../core/user.h ../../core/ugcontainer.h
funticket.o: ../../core/lastcontainer.h ../../core/groups.h
funticket.o: ../../core/group.h ../../core/rebus.h ../../core/loadavg.h
funticket.o: ../../functions/functionbase.h ../../core/request.h
funticket.o: ../../core/config.h ../../core/notify.h
funticket.o: ../../core/requesttypes.h ../../core/session.h
funticket.o: ../../core/plugindata.h ../../core/config.h ../../core/notify.h
funticket.o: ../../templatesnotify/templatesnotify.h ../../../ezc/src/ezc.h
funticket.o: ../../core/mount.h ../../core/locale.h ../../templates/misc.h
funticket.o: ../../templates/localefilter.h ../../core/locale.h
@ -110,14 +110,14 @@ init.o: ../../core/item.h ../../core/dircontainer.h ../../db/db.h
init.o: ../../db/dbbase.h ../../db/dbitemquery.h ../../db/dbitemcolumns.h
init.o: ../../core/user.h ../../core/group.h ../../core/thread.h
init.o: ../../core/dircontainer.h ../../core/ugcontainer.h
init.o: ../../core/request.h ../../core/requesttypes.h ../../core/session.h
init.o: ../../core/error.h ../../core/user.h ../../core/plugindata.h
init.o: ../../core/rebus.h ../../core/config.h ../../core/confparser.h
init.o: ../../core/htmlfilter.h ../../core/mounts.h ../../core/mount.h
init.o: ../../core/mountparser.h ../../core/users.h ../../core/ugcontainer.h
init.o: ../../core/lastcontainer.h ../../core/groups.h ../../core/group.h
init.o: ../../core/request.h ../../core/mounts.h ../../core/mount.h
init.o: ../../core/error.h ../../core/mountparser.h ../../core/config.h
init.o: ../../core/confparser.h ../../core/htmlfilter.h ../../core/users.h
init.o: ../../core/user.h ../../core/ugcontainer.h ../../core/lastcontainer.h
init.o: ../../core/groups.h ../../core/group.h ../../core/rebus.h
init.o: ../../core/loadavg.h ../../functions/functionbase.h
init.o: ../../core/request.h ../../core/config.h ../../core/notify.h
init.o: ../../core/request.h ../../core/requesttypes.h ../../core/session.h
init.o: ../../core/plugindata.h ../../core/config.h ../../core/notify.h
init.o: ../../templatesnotify/templatesnotify.h ../../../ezc/src/ezc.h
init.o: ../../core/mount.h ../../core/locale.h ../../templates/misc.h
init.o: ../../templates/localefilter.h ../../core/locale.h
@ -144,23 +144,6 @@ init.o: ../../templates/misc.h ../../templates/patterncacher.h
init.o: ../../core/item.h ../../templates/ckeditorgetparser.h
init.o: ../../core/httpsimpleparser.h ../../core/log.h
init.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h
readticket.o: readticket.h ticket.h ticketinfo.h ticketparser.h ticketconf.h
readticket.o: ../../core/item.h ../../core/system.h ../../core/dirs.h
readticket.o: ../../core/item.h ../../core/dircontainer.h ../../db/db.h
readticket.o: ../../db/dbbase.h ../../db/dbitemquery.h
readticket.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
readticket.o: ../../core/thread.h ../../core/error.h ../../core/log.h
readticket.o: ../../core/dircontainer.h ../../core/ugcontainer.h
readticket.o: ../../core/request.h ../../core/requesttypes.h
readticket.o: ../../core/session.h ../../core/error.h ../../core/user.h
readticket.o: ../../core/plugindata.h ../../core/rebus.h ../../core/config.h
readticket.o: ../../core/confparser.h ../../core/htmlfilter.h
readticket.o: ../../core/mounts.h ../../core/mount.h ../../core/mountparser.h
readticket.o: ../../core/users.h ../../core/ugcontainer.h
readticket.o: ../../core/lastcontainer.h ../../core/groups.h
readticket.o: ../../core/group.h ../../core/loadavg.h tdb.h ../../db/dbbase.h
readticket.o: ../../db/dbconn.h ../../db/dbtextstream.h
readticket.o: ../../core/textstream.h ../../core/request.h
tdb.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
tdb.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/error.h
tdb.o: ../../core/log.h ../../core/log.h
@ -169,20 +152,19 @@ templates.o: ticketconf.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/dbitemquery.h
templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
templates.o: ../../core/thread.h ../../core/error.h ../../core/log.h
templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
templates.o: ../../core/request.h ../../core/requesttypes.h
templates.o: ../../core/session.h ../../core/error.h ../../core/user.h
templates.o: ../../core/plugindata.h ../../core/rebus.h ../../core/config.h
templates.o: ../../core/thread.h ../../core/dircontainer.h
templates.o: ../../core/ugcontainer.h ../../core/log.h ../../core/request.h
templates.o: ../../core/mounts.h ../../core/mount.h ../../core/error.h
templates.o: ../../core/mountparser.h ../../core/config.h
templates.o: ../../core/confparser.h ../../core/htmlfilter.h
templates.o: ../../core/mounts.h ../../core/mount.h ../../core/mountparser.h
templates.o: ../../core/users.h ../../core/ugcontainer.h
templates.o: ../../core/users.h ../../core/user.h ../../core/ugcontainer.h
templates.o: ../../core/lastcontainer.h ../../core/groups.h
templates.o: ../../core/group.h ../../core/loadavg.h tdb.h ../../db/dbbase.h
templates.o: ../../db/dbconn.h ../../db/dbtextstream.h
templates.o: ../../core/textstream.h editticket.h
templates.o: ../../core/group.h ../../core/rebus.h ../../core/loadavg.h tdb.h
templates.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
templates.o: ../../core/textstream.h ../../core/error.h editticket.h
templates.o: ../../functions/functionbase.h ../../core/request.h
templates.o: ../../core/config.h ../../core/notify.h
templates.o: ../../core/requesttypes.h ../../core/session.h
templates.o: ../../core/plugindata.h ../../core/config.h ../../core/notify.h
templates.o: ../../templatesnotify/templatesnotify.h ../../core/mount.h
templates.o: ../../core/locale.h ../../templates/misc.h
templates.o: ../../templates/localefilter.h ../../core/locale.h
@ -217,16 +199,15 @@ ticketinfo.o: ../../core/item.h ../../core/system.h ../../core/dirs.h
ticketinfo.o: ../../core/item.h ../../core/dircontainer.h ../../db/db.h
ticketinfo.o: ../../db/dbbase.h ../../db/dbitemquery.h
ticketinfo.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
ticketinfo.o: ../../core/thread.h ../../core/error.h ../../core/log.h
ticketinfo.o: ../../core/dircontainer.h ../../core/ugcontainer.h
ticketinfo.o: ../../core/request.h ../../core/requesttypes.h
ticketinfo.o: ../../core/session.h ../../core/error.h ../../core/user.h
ticketinfo.o: ../../core/plugindata.h ../../core/rebus.h ../../core/config.h
ticketinfo.o: ../../core/thread.h ../../core/dircontainer.h
ticketinfo.o: ../../core/ugcontainer.h ../../core/log.h ../../core/request.h
ticketinfo.o: ../../core/mounts.h ../../core/mount.h ../../core/error.h
ticketinfo.o: ../../core/mountparser.h ../../core/config.h
ticketinfo.o: ../../core/confparser.h ../../core/htmlfilter.h
ticketinfo.o: ../../core/mounts.h ../../core/mount.h ../../core/mountparser.h
ticketinfo.o: ../../core/users.h ../../core/ugcontainer.h
ticketinfo.o: ../../core/users.h ../../core/user.h ../../core/ugcontainer.h
ticketinfo.o: ../../core/lastcontainer.h ../../core/groups.h
ticketinfo.o: ../../core/group.h ../../core/loadavg.h tdb.h ../../db/dbbase.h
ticketinfo.o: ../../db/dbconn.h ../../db/dbtextstream.h
ticketinfo.o: ../../core/textstream.h ../../core/log.h
ticketinfo.o: ../../core/group.h ../../core/rebus.h ../../core/loadavg.h
ticketinfo.o: tdb.h ../../db/dbbase.h ../../db/dbconn.h
ticketinfo.o: ../../db/dbtextstream.h ../../core/textstream.h
ticketinfo.o: ../../core/error.h ../../core/log.h ../../core/misc.h
ticketparser.o: ticketparser.h ticketconf.h ../../core/log.h

View File

@ -1 +1 @@
o = createticket.o editticket.o funticket.o init.o readticket.o tdb.o templates.o ticketconf.o ticketinfo.o ticketparser.o
o = createticket.o editticket.o funticket.o init.o tdb.o templates.o ticketconf.o ticketinfo.o ticketparser.o

View File

@ -8,7 +8,6 @@
*/
#include "createticket.h"
#include "readticket.h"
#include "functions/functions.h"
@ -80,45 +79,16 @@ bool CreateTicket::HasAccess()
}
bool CreateTicket::FunCreateTicketCheckAbuse()
{
if( !system->rebus.CheckRebus() )
{
request->status = WINIX_ERR_INCORRECT_REBUS;
return false;
}
functions->CheckGetPostTimes();
if( request->session->spam_score > 0 )
{
request->status = WINIX_ERR_SPAM;
log << log1 << "Content: ignoring due to suspected spamming" << logend;
return false;
}
return true;
}
void CreateTicket::AddTicket()
{
static std::string temp;
ticket_info->ticket.dir_id = request->dir_tab.back()->id; // a new directory created by Mkdir()
ticket_info->ticket.item_id = request->item.id; // this id is set by PostFunEmacsAdd()
// a new directory created by system->AddDir()
ticket_info->ticket.dir_id = request->dir_tab.back()->id;
request->status = tdb->AddTicket(ticket_info->ticket);
if( request->status == WINIX_ERR_OK )
{
}
}
void CreateTicket::PostFunCreateTicketLogAndRedirect()
void CreateTicket::LogAndRedirect()
{
if( request->status == WINIX_ERR_OK )
{
@ -136,42 +106,42 @@ void CreateTicket::PostFunCreateTicketLogAndRedirect()
void CreateTicket::MakePost()
{
functions->ReadItem(request->item, Item::dir);
functions->SetUser(request->item);
ticket_info->FindCurrentConf();
functions->ReadItem(ticket_info->item, Item::file);
functions->SetUser(ticket_info->item);
ticket_info->item.privileges = request->dir_tab.back()->privileges; // !! tymczasowo takie same jak z katalogu nadrzednego
ReadTicket read_ticket;
read_ticket.Read(system, request, ticket_info, &ticket_info->ticket);
ticket_info->ReadTicketParams();
request->item.privileges = 0777; // !! tymczasowo 777 aby wszyscy mogli wysylac posty
if( !FunCreateTicketCheckAbuse() )
{
functions->ReadItemContentWithType(request->item); // for correctly displaying the form
if( functions->CheckAbuse() )
return;
}
request->status = system->dirs.AddDirectory(request->item, true);
ticket_info->item.type = Item::dir;
request->status = system->dirs.AddDirectory(ticket_info->item, true);
if( request->status == WINIX_ERR_OK )
{
functions->ReadItemContentWithType(request->item);
request->item.type = Item::file;
request->item.privileges = 0644; // !! tymczasowo
request->item.parent_id = request->dir_tab.back()->id;
ticket_info->item.type = Item::file;
ticket_info->item.privileges = 0644; // !! tymczasowo
ticket_info->item.parent_id = request->dir_tab.back()->id;
request->status = system->AddFile(request->item);
// adding without notificating
request->status = system->AddFile(ticket_info->item, false);
if( request->status == WINIX_ERR_OK )
AddTicket();
}
PostFunCreateTicketLogAndRedirect();
LogAndRedirect();
}
void CreateTicket::MakeGet()
{
ticket_info->FindCurrentConf();
}
} // namespace

View File

@ -11,8 +11,8 @@
#define headerfile_winix_plugins_ticket_createticket
#include "tdb.h"
#include "ticketinfo.h"
#include "functions/functionbase.h"
#include "ticketinfo.h"
namespace Ticket
@ -31,12 +31,12 @@ public:
bool HasAccess(bool check_root);
bool HasAccess();
void MakePost();
void MakeGet();
private:
bool FunCreateTicketCheckAbuse();
void AddTicket();
void PostFunCreateTicketLogAndRedirect();
void LogAndRedirect();
TDb * tdb;
TicketInfo * ticket_info;

View File

@ -8,7 +8,6 @@
*/
#include "editticket.h"
#include "readticket.h"
#include "functions/functions.h"
@ -68,17 +67,23 @@ return true;
void EditTicket::EditTicketCheckFirstItem()
void EditTicket::GetFirstItem(Item & item)
{
if( request->status != WINIX_ERR_OK )
return;
DbItemQuery iq;
iq.Limit(1);
iq.WhereParentId(request->dir_tab.back()->id);
db->GetItems(item_tab, iq); // !! chwilowo GetItems() nie zwraca zadnych kodow bledow
if( ticket_info->ticket.item_id == -1 )
if( request->status != WINIX_ERR_OK )
return;
if( item_tab.empty() )
{
// creating a new item (the item was deleted by a user)
Item item;
item.parent_id = request->dir_tab.back()->id;
item.subject = request->dir_tab.back()->subject;
item.type = Item::file;
@ -86,146 +91,118 @@ void EditTicket::EditTicketCheckFirstItem()
functions->SetUser(item);
functions->PrepareUrl(item);
request->status = db->AddItem(item); // !! moze system->AddFile() tutaj?
request->status = system->AddFile(item);
if( request->status == WINIX_ERR_OK )
{
log << log2 << "EditTicket: added the first item with content for the ticket, item.id: " << item.id << logend;
ticket_info->ticket.item_id = item.id;
}
log << log2 << "EditTicket: added the first item with content for the ticket, item.id: "
<< item.id << logend;
}
else
{
item = item_tab[0];
}
}
void EditTicket::EditTicketModTicket()
void EditTicket::ModifyTicket()
{
if( request->status != WINIX_ERR_OK )
return;
Ticket ticket;
ReadTicket read_ticket;
read_ticket.Read(system, request, ticket_info, &ticket);
ticket_info->ticket.type = ticket.type;
ticket_info->ticket.status = ticket.status;
ticket_info->ticket.priority = ticket.priority;
ticket_info->ticket.category = ticket.category;
ticket_info->ticket.expected = ticket.expected;
ticket_info->ticket.progress = ticket.progress;
request->status = tdb->EditTicketById(ticket_info->ticket);
ticket_info->ReadTicketParams();
request->status = tdb->RemoveAddTicket(ticket_info->ticket);
}
void EditTicket::EditTicketModDir()
void EditTicket::ModifyLastDir()
{
if( request->status != WINIX_ERR_OK )
return;
// we don't modify the url
Item & dir = *request->dir_tab.back();
bool edit_dir_subject = (dir.subject != request->item.subject);
if( edit_dir_subject )
if( dir.subject != ticket_info->item.subject )
{
dir.subject = request->item.subject;
dir.subject = ticket_info->item.subject;
request->status = db->EditItemById(dir, false);
}
}
void EditTicket::EditTicketModFirstItem()
void EditTicket::ModifyFirstItem()
{
if( request->status != WINIX_ERR_OK )
return;
// modyfing the first item (the one with content)
functions->ReadItemContentWithType(request->item);
Item item;
db->GetItemById(ticket_info->ticket.item_id, item);
item.subject = request->item.subject;
item.content = request->item.content;
item.content_type = request->item.content_type;
// the url doesn't matter
db->EditItemById(item, false);
// we don't modify the url and don't use notifications
system->EditFile(ticket_info->item, false, false);
}
void EditTicket::PostFunEditTicketLogAndRedirect()
void EditTicket::LogAndRedirect()
{
if( request->status == WINIX_ERR_OK )
{
log << log2 << "Content: edited a ticket" << logend;
log << log2 << "EditTicket: edited a ticket" << logend;
system->RedirectToLastDir();
}
else
{
log << log1 << "Content: problem with editing a ticket, error code: "
log << log1 << "EditTicket: problem with editing a ticket, error code: "
<< request->status << logend;
}
}
bool EditTicket::FunCreateTicketCheckAbuse()
{
if( !system->rebus.CheckRebus() )
{
request->status = WINIX_ERR_INCORRECT_REBUS;
return false;
}
functions->CheckGetPostTimes();
if( request->session->spam_score > 0 )
{
request->status = WINIX_ERR_SPAM;
log << log1 << "Content: ignoring due to suspected spamming" << logend;
return false;
}
return true;
}
void EditTicket::MakePost()
{
functions->ReadItem(request->item, Item::dir);
// co z uzytkownikiem i grup¹? chyba nie wczytane? !!! (wczesniej bylo SetUser() w ReadItem() - teraz nie ma)
// dodac informacje o modyfikacji !!!
ticket_info->FindCurrentConf();
if( !FunCreateTicketCheckAbuse() )
{
functions->ReadItemContentWithType(request->item); // for correctly displaying the form
// reading the first item from the db or creating it if not exists
GetFirstItem(ticket_info->item);
// reading information from POST
functions->ReadItem(ticket_info->item, Item::file);
if( functions->CheckAbuse() )
return;
}
if( tdb->GetTicketByDirId(request->dir_tab.back()->id, ticket_info->ticket) != WINIX_ERR_OK )
if( tdb->GetTicket(request->dir_tab.back()->id, ticket_info->ticket) != WINIX_ERR_OK )
{
request->status = WINIX_ERR_PERMISSION_DENIED;
return;
}
EditTicketCheckFirstItem();
EditTicketModTicket();
EditTicketModDir();
EditTicketModFirstItem();
PostFunEditTicketLogAndRedirect();
ModifyTicket();
ModifyLastDir();
ModifyFirstItem();
LogAndRedirect();
}
void EditTicket::MakeGet()
{
db->GetItemById(ticket_info->ticket.item_id, request->item);
ticket_info->FindCurrentConf();
// the subject we get from the last directory
request->item.subject = request->dir_tab.back()->subject;
DbItemQuery iq;
iq.Limit(1);
iq.WhereParentId(request->dir_tab.back()->id);
db->GetItems(item_tab, iq); // !! chwilowo GetItems() nie zwraca kodow bledow
if( request->status != WINIX_ERR_OK )
{
request->status = WINIX_ERR_PERMISSION_DENIED;
return;
}
if( !item_tab.empty() )
ticket_info->item = item_tab[0];
}

View File

@ -35,15 +35,15 @@ public:
private:
void EditTicketCheckFirstItem();
void EditTicketModTicket();
void EditTicketModDir();
void EditTicketModFirstItem();
void PostFunEditTicketLogAndRedirect();
bool FunCreateTicketCheckAbuse();
void GetFirstItem(Item & item);
void ModifyTicket();
void ModifyLastDir();
void ModifyFirstItem();
void LogAndRedirect();
TDb * tdb;
TicketInfo * ticket_info;
std::vector<Item> item_tab;
};

View File

@ -8,6 +8,9 @@
*/
#include "funticket.h"
#include <ctime>
#include <algorithm>
namespace Ticket
@ -41,58 +44,94 @@ void FunTicket::Clear()
bool FunTicket::HasAccess()
{
if( request->is_item || system->mounts.pmount->type != ticket_info->mount_type_ticket )
return false;
return true;
return !request->is_item;
}
void FunTicket::TicketDeleteFirst()
{
if( !ticket_info->is_ticket )
return;
for(size_t i=0 ; i<request->item_tab.size() ; ++i)
{
if( request->item_tab[i].id == ticket_info->ticket.item_id )
{
// this is the first item with the content for the ticket
if( !system->HasReadAccess(request->item_tab[i]) )
request->status = WINIX_ERR_PERMISSION_DENIED;
request->item_tab.erase(request->item_tab.begin() + i);
break;
}
}
}
void FunTicket::MakeGet()
{
ticket_info->FindCurrentConf();
ticket_info->ReadTicket(request->dir_tab.back()->id);
DbItemQuery iq;
iq.WhereParentId(request->dir_tab.back()->id);
iq.WhereType(Item::file);
iq.WhereAuth(Item::auth_none);
db->GetItems(request->item_tab, iq);
tdb->GetTickets(request->dir_tab.back()->id, ticket_info->ticket_tab);
ticket_info->SortTickets();
TicketDeleteFirst();
if( !request->item_tab.empty() )
{
if( system->HasReadAccess(request->item_tab[0]) )
{
ticket_info->item = request->item_tab[0];
request->item_tab.erase(request->item_tab.begin());
}
else
{
request->status = WINIX_ERR_PERMISSION_DENIED;
return;
}
}
system->CheckAccessToItems(request->item_tab);
SelectTickets();
}
void FunTicket::SelectTickets()
{
child_tab.clear();
system->dirs.GetDirChilds(request->dir_tab.back()->id, child_tab);
SortDirs();
PageDirs();
CreateIdTab();
tdb->GetTickets(id_tab, ticket_info->ticket_tab);
ticket_info->SortTickets();
}
bool FunTicket::SortByDate::operator()(const Item * item1, const Item * item2)
{
tm tm1 = item1->date_creation;
tm tm2 = item2->date_creation;
time_t time1 = mktime(&tm1);
time_t time2 = mktime(&tm2);
return time1 < time2;
}
void FunTicket::SortDirs()
{
// temporarily sorting by date
SortByDate sort(this);
std::sort(child_tab.begin(), child_tab.end(), sort);
}
void FunTicket::PageDirs()
{
// temporarily show every tickets
}
void FunTicket::CreateIdTab()
{
id_tab.clear();
for(size_t i=0 ; i<child_tab.size() ; ++i)
id_tab.push_back(child_tab[i]->id);
}
} // namespace

View File

@ -34,9 +34,23 @@ public:
private:
void TicketDeleteFirst();
TDb * tdb;
TicketInfo * ticket_info;
std::vector<Item*> child_tab;
std::vector<long> id_tab;
struct SortByDate
{
FunTicket * fun_ticket;
SortByDate(FunTicket * f) : fun_ticket(f) {}
bool operator()(const Item * item1, const Item * item2);
};
void SelectTickets();
void SortDirs();
void PageDirs();
void CreateIdTab();
};

View File

@ -89,6 +89,11 @@ void ContentMake(PluginInfo & info)
}
void InitTicket(PluginInfo & info)
{
ticket_info.progress_prefix = info.config->Text("ticket_form_progress_prefix", "progress");
}
void AddEzcFunctions(PluginInfo & info);
} // namespace Ticket
@ -99,6 +104,7 @@ void Init(PluginInfo & info)
{
using namespace Ticket;
plugin.Assign(WINIX_PLUGIN_INIT, InitTicket);
plugin.Assign(WINIX_TEMPLATES_CREATEFUNCTIONS, AddEzcFunctions);
plugin.Assign(WINIX_CREATE_FUNCTIONS, AddFunctions);
plugin.Assign(WINIX_SELECT_DEFAULT_FUNCTION, SelectDefaultFunction);
@ -107,10 +113,12 @@ using namespace Ticket;
plugin.Assign(WINIX_CONTENT_MAKE, ContentMake);
tdb.SetConn(info.db->GetConn());
tdb.LogQueries(info.config->log_db_query);
ticket_info.SetDb(info.db);
ticket_info.SetTDb(&tdb);
ticket_info.SetSystem(info.system);
ticket_info.SetRequest(info.request);
fun_ticket.SetTDb(&tdb);
fun_ticket.SetTicketInfo(&ticket_info);

View File

@ -1,129 +0,0 @@
/*
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2010, Tomasz Sowa
* All rights reserved.
*
*/
#include "readticket.h"
namespace Ticket
{
ReadTicket::ReadTicket()
{
}
void ReadTicket::ReadTicketType()
{
static std::string temp;
request->PostVar("type", temp);
ticket->type = atoi(temp.c_str());
if( ticket->type >= system->mounts.pmount->param[ticket_info->mount_par_ticket_type].arg.size() )
ticket->type = system->mounts.pmount->param[ticket_info->mount_par_ticket_type].arg.size();
}
void ReadTicket::ReadTicketStatus()
{
static std::string temp;
request->PostVar("status", temp);
ticket->status = atoi(temp.c_str());
if( ticket->status >= system->mounts.pmount->param[ticket_info->mount_par_ticket_status].arg.size() )
ticket->status = system->mounts.pmount->param[ticket_info->mount_par_ticket_status].arg.size();
}
void ReadTicket::ReadTicketPriority()
{
static std::string temp;
request->PostVar("priority", temp);
ticket->priority = atoi(temp.c_str());
if( ticket->priority >= system->mounts.pmount->param[ticket_info->mount_par_ticket_priority].arg.size() )
ticket->priority = system->mounts.pmount->param[ticket_info->mount_par_ticket_priority].arg.size();
}
void ReadTicket::ReadTicketCategory()
{
static std::string temp;
request->PostVar("category", temp);
ticket->category = atoi(temp.c_str());
if( ticket->category >= system->mounts.pmount->param[ticket_info->mount_par_ticket_category].arg.size() )
ticket->category = system->mounts.pmount->param[ticket_info->mount_par_ticket_category].arg.size();
}
void ReadTicket::ReadTicketExpected()
{
static std::string temp;
request->PostVar("expected", temp);
ticket->expected = atoi(temp.c_str());
if( ticket->expected >= system->mounts.pmount->param[ticket_info->mount_par_ticket_expected].arg.size() )
ticket->expected = system->mounts.pmount->param[ticket_info->mount_par_ticket_expected].arg.size();
}
void ReadTicket::ReadTicketProgress()
{
static std::string temp;
request->PostVar("progress", temp);
int p = atoi(temp.c_str());
if( p < 0 )
p = 0;
if( p > 100 )
p = 100;
ticket->progress = p;
}
void ReadTicket::Read(System * psystem, Request * prequest, TicketInfo * pinfo, Ticket * pticket)
{
system = psystem;
request = prequest;
ticket = pticket;
ticket_info = pinfo;
ticket->parent_id = request->dir_tab.back()->id;
ReadTicketType();
ReadTicketStatus();
ReadTicketPriority();
ReadTicketCategory();
ReadTicketExpected();
ReadTicketProgress();
}
} // namespace

View File

@ -1,48 +0,0 @@
/*
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2010, Tomasz Sowa
* All rights reserved.
*
*/
#ifndef headerfile_winix_plugins_ticket_readticket
#define headerfile_winix_plugins_ticket_readticket
#include "ticket.h"
#include "ticketinfo.h"
#include "core/request.h"
#include "core/system.h"
namespace Ticket
{
class ReadTicket
{
public:
ReadTicket();
void Read(System * psystem, Request * prequest, TicketInfo * pinfo, Ticket * pticket);
private:
Request * request;
Ticket * ticket;
System * system;
TicketInfo * ticket_info;
void ReadTicketType();
void ReadTicketStatus();
void ReadTicketPriority();
void ReadTicketCategory();
void ReadTicketExpected();
void ReadTicketProgress();
};
} // namespace
#endif

View File

@ -17,17 +17,16 @@ namespace Ticket
Error TDb::GetTicketByDirId(long dir_id, Ticket & ticket)
Error TDb::GetTicket(long dir_id, Ticket & ticket)
{
PGresult * r = 0;
Error status = WINIX_ERR_OK;
ticket.Clear();
try
{
query.Clear();
query << R("select ticket.id, ticket.dir_id, ticket.parent_id, ticket.type, ticket.status, ticket.priority, "
"ticket.category, ticket.expected, ticket.progress, ticket.item_id "
"from core.ticket "
query << R("select dir_id, param, value from plugins.ticket "
"where ticket.dir_id=") << dir_id << R(";");
r = AssertQuery(query);
@ -35,57 +34,20 @@ Error TDb::GetTicketByDirId(long dir_id, Ticket & ticket)
int rows = Rows(r);
if( rows > 1 )
log << log1 << "Db: there is more than one ticket with dir_id: " << dir_id << logend;
else
if( rows == 0 )
throw Error(WINIX_ERR_NO_TICKET);
TicketColumns tc;
Ticket::TicketParam par;
ticket.dir_id = dir_id;
tc.SetColumns(r);
tc.SetTicket(r, 0, ticket);
}
catch(const Error & e)
{
status = e;
}
ClearResult(r);
return status;
}
Error TDb::GetTickets(long parent_id, std::vector<Ticket> & ticket_tab)
{
PGresult * r = 0;
Error status = WINIX_ERR_OK;
try
{
query.Clear();
query << R("select ticket.id, ticket.dir_id, ticket.parent_id, ticket.type, ticket.status, ticket.priority, "
"ticket.category, ticket.expected, ticket.progress, ticket.item_id "
"from core.ticket "
"where ticket.parent_id = ") << parent_id << R(";");
r = AssertQuery(query);
AssertResult(r, PGRES_TUPLES_OK);
int rows = Rows(r);
Ticket ticket;
TicketColumns tc;
tc.SetColumns(r);
int cparam = AssertColumn(r, "param");
int cvalue = AssertColumn(r, "value");
for(int i=0 ; i<rows ; ++i)
{
tc.SetTicket(r, i, ticket);
ticket_tab.push_back(ticket);
par.param = AssertValueInt(r, i, cparam);
par.value = AssertValueInt(r, i, cvalue);
ticket.par_tab.push_back(par);
}
}
catch(const Error & e)
@ -95,66 +57,92 @@ Error TDb::GetTickets(long parent_id, std::vector<Ticket> & ticket_tab)
ClearResult(r);
return status;
}
/*
bool TDb::IsTicket(long dir_id)
Error TDb::GetTickets(const std::vector<long> & dir_id_tab, std::vector<Ticket> & ticket_tab)
{
PGresult * r = 0;
bool is_ticket = false;
PGresult * r = 0;
Error status = WINIX_ERR_OK;
ticket_tab.clear();
if( dir_id_tab.empty() )
return status;
try
{
query.Clear();
query << "select ticket.id from core.ticket "
"where ticket.dir_id = '" << dir_id << "';";
CreateIdList(dir_id_tab, dir_list);
query << R("select dir_id, param, value from plugins.ticket "
"where ticket.dir_id in ") << R(dir_list) << R(" order by dir_id;");
// !! moze dodac operator <<(std::vector(long)) do query?
r = AssertQuery(query);
AssertResult(r, PGRES_TUPLES_OK);
is_ticket = (Rows(r) == 1);
int rows = Rows(r);
Ticket::TicketParam par;
int cdir_id = AssertColumn(r, "dir_id");
int cparam = AssertColumn(r, "param");
int cvalue = AssertColumn(r, "value");
long last_dir_id = -1;
for(int i=0 ; i<rows ; ++i)
{
long dir_id = AssertValueLong(r, i, cdir_id);
if( i==0 || last_dir_id != dir_id )
{
ticket_tab.push_back(Ticket());
ticket_tab.back().dir_id = dir_id;
last_dir_id = dir_id;
}
par.param = AssertValueInt(r, i, cparam);
par.value = AssertValueInt(r, i, cvalue);
ticket_tab.back().par_tab.push_back(par);
}
}
catch(const Error &)
catch(const Error & e)
{
status = e;
}
ClearResult(r);
dir_list.clear();
return is_ticket;
return status;
}
*/
Error TDb::AddTicket(Ticket & ticket)
Error TDb::AddTicket(const Ticket & ticket)
{
PGresult * r = 0;
Error status = WINIX_ERR_OK;
try
{
query.Clear();
query << R("insert into core.ticket (dir_id, parent_id, type, status, priority, "
"category, expected, progress, item_id) values (")
<< ticket.dir_id
<< ticket.parent_id
<< ticket.type
<< ticket.status
<< ticket.priority
<< ticket.category
<< ticket.expected
<< ticket.progress
<< ticket.item_id
<< R(");");
r = AssertQuery(query);
AssertResult(r, PGRES_COMMAND_OK);
ticket.id = AssertCurrval("core.ticket_id_seq");
for(size_t i=0 ; i<ticket.par_tab.size() ; ++i)
{
query.Clear();
query << R("insert into plugins.ticket (dir_id, param, value) values (")
<< ticket.dir_id
<< ticket.par_tab[i].param
<< ticket.par_tab[i].value
<< R(");");
r = AssertQuery(query);
AssertResult(r, PGRES_COMMAND_OK);
}
}
catch(const Error & e)
{
@ -169,67 +157,28 @@ return status;
Error TDb::EditTicketById(Ticket & ticket)
Error TDb::RemoveAddTicket(const Ticket & ticket)
{
PGresult * r = 0;
Error status = WINIX_ERR_OK;
Error status = BeginTrans();
try
{
query.Clear();
query << R("update core.ticket set (dir_id, parent_id, type, status, "
"priority, category, expected, progress, item_id) = (")
<< ticket.dir_id
<< ticket.parent_id
<< ticket.type
<< ticket.status
<< ticket.priority
<< ticket.category
<< ticket.expected
<< ticket.progress
<< ticket.item_id
<< R(") where id=")
<< ticket.id
<< R(";");
if( status != WINIX_ERR_OK )
return status;
r = AssertQuery(query);
AssertResult(r, PGRES_COMMAND_OK);
}
catch(const Error & e)
{
status = e;
}
ClearResult(r);
status = RemoveTicket(ticket.dir_id);
if( status == WINIX_ERR_OK )
status = AddTicket(ticket);
if( status == WINIX_ERR_OK )
status = CommitTrans();
else
RollbackTrans();
return status;
}
Error TDb::EditTicketRemoveItem(long item_id)
{
PGresult * r = 0;
Error status = WINIX_ERR_OK;
try
{
query.Clear();
query << R("update core.ticket set item_id = -1 where item_id=") << item_id << R(";");
r = AssertQuery(query);
AssertResult(r, PGRES_COMMAND_OK);
}
catch(const Error & e)
{
status = e;
}
ClearResult(r);
return status;
}
Error TDb::RemoveTicket(long dir_id)
@ -240,7 +189,7 @@ Error TDb::RemoveTicket(long dir_id)
try
{
query.Clear();
query << R("delete from core.ticket where dir_id=") << dir_id << R(";");
query << R("delete from plugins.ticket where dir_id=") << dir_id << R(";");
r = AssertQuery(query);
AssertResult(r, PGRES_COMMAND_OK);
@ -248,7 +197,7 @@ Error TDb::RemoveTicket(long dir_id)
long rows = AffectedRows(r);
if( rows > 0 )
log << log2 << "Db: deleted " << rows << " rows from core.ticket" << logend;
log << log2 << "Db: deleted " << rows << " rows from plugins.ticket" << logend;
}
catch(const Error & e)
@ -265,36 +214,5 @@ return status;
void TDb::TicketColumns::SetColumns(PGresult * r)
{
// PQfnumber returns -1 if there is no such a column
id = PQfnumber(r, "id");
dir_id = PQfnumber(r, "dir_id");
parent_id = PQfnumber(r, "parent_id");
type = PQfnumber(r, "type");
status = PQfnumber(r, "status");
priority = PQfnumber(r, "priority");
category = PQfnumber(r, "category");
expected = PQfnumber(r, "expected");
progress = PQfnumber(r, "progress");
item_id = PQfnumber(r, "item_id");
}
void TDb::TicketColumns::SetTicket(PGresult * r, long row, Ticket & ticket)
{
if( id != -1 ) ticket.id = DbBase::AssertValueLong(r, row, id);
if( dir_id != -1 ) ticket.dir_id = DbBase::AssertValueLong(r, row, dir_id);
if( parent_id != -1 ) ticket.parent_id = DbBase::AssertValueLong(r, row, parent_id);
if( type != -1 ) ticket.type = DbBase::AssertValueInt(r, row, type);
if( status != -1 ) ticket.status = DbBase::AssertValueInt(r, row, status);
if( priority != -1 ) ticket.priority = DbBase::AssertValueInt(r, row, priority);
if( category != -1 ) ticket.category = DbBase::AssertValueInt(r, row, category);
if( expected != -1 ) ticket.expected = DbBase::AssertValueInt(r, row, expected);
if( progress != -1 ) ticket.progress = DbBase::AssertValueInt(r, row, progress);
if( item_id != -1 ) ticket.item_id = DbBase::AssertValueLong(r, row, item_id);
}
} // namespace

View File

@ -23,32 +23,19 @@ namespace Ticket
class TDb : public DbBase
{
public:
Error GetTicketByDirId(long dir_id, Ticket & ticket);
Error GetTickets(long parent_id, std::vector<Ticket> & ticket_tab);
//bool IsTicket(long dir_id);
Error AddTicket(Ticket & ticket);
Error EditTicketById(Ticket & ticket);
Error EditTicketRemoveItem(long item_id);
Error GetTicket(long dir_id, Ticket & ticket);
Error GetTickets(const std::vector<long> & dir_id_tab, std::vector<Ticket> & ticket_tab);
Error AddTicket(const Ticket & ticket);
Error RemoveAddTicket(const Ticket & ticket); // first removing and then adding a ticket
Error RemoveTicket(long dir_id);
struct TicketColumns
{
int id, dir_id, parent_id, type, status, priority, category, expected, progress, item_id;
void SetColumns(PGresult * r);
void SetTicket(PGresult * r, long row, Ticket & ticket);
};
private:
DbTextStream query;
std::string dir_list;
};

View File

@ -46,12 +46,56 @@ return percent;
void find_ticket_value(const TicketConf::TicketItem & conf_item, const Ticket & ticket, bool * has_value, int * value)
{
*has_value = false;
*value = 0;
for(size_t a=0 ; a < ticket.par_tab.size() ; a++)
{
int par = ticket.par_tab[a].param;
int val = ticket.par_tab[a].value;
if( par == conf_item.id )
{
*has_value = true;
*value = val;
}
}
}
void ticket_print_value(Info & i, size_t conf_index, int value)
{
if( conf_index < ticket_info.cur_conf->tab.size() )
{
const TicketConf::TicketItem & conf_item = ticket_info.cur_conf->tab[conf_index];
if( conf_item.type == TicketConf::TicketItem::TypeInteger )
i.out << value;
else
if( conf_item.type == TicketConf::TicketItem::TypeSelect )
{
if( value < (int)conf_item.select.size() )
HtmlEscape(i.out, conf_item.select[value].name);
}
}
}
void ticket_is(Info & i)
{
i.res = ticket_info.is_ticket;
}
void ticket_item_subject(Info & i)
{
HtmlEscape(i.out, ticket_info.item.subject);
}
void ticket_item_content(Info & i)
{
@ -85,511 +129,277 @@ void ticket_can_edit(Info & i)
}
void ticket_type(Info & i)
namespace ns_tickets_tab
{
if( ticket_info.ticket.type < system->mounts.pmount->param[ticket_info.mount_par_ticket_type].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[ticket_info.mount_par_ticket_type].arg[ticket_info.ticket.type]);
}
static size_t tickets_tab_index;
static size_t conf_tab_index;
static bool has_value;
static int value;
void ticket_status(Info & i)
void tickets_tab(Info & i)
{
if( ticket_info.ticket.status < system->mounts.pmount->param[ticket_info.mount_par_ticket_status].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[ticket_info.mount_par_ticket_status].arg[ticket_info.ticket.status]);
}
void ticket_priority(Info & i)
{
if( ticket_info.ticket.priority < system->mounts.pmount->param[ticket_info.mount_par_ticket_priority].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[ticket_info.mount_par_ticket_priority].arg[ticket_info.ticket.priority]);
}
void ticket_category(Info & i)
{
if( ticket_info.ticket.category < system->mounts.pmount->param[ticket_info.mount_par_ticket_category].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[ticket_info.mount_par_ticket_category].arg[ticket_info.ticket.category]);
}
void ticket_expected(Info & i)
{
if( ticket_info.ticket.expected < system->mounts.pmount->param[ticket_info.mount_par_ticket_expected].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[ticket_info.mount_par_ticket_expected].arg[ticket_info.ticket.expected]);
tickets_tab_index = i.iter;
i.res = tickets_tab_index < ticket_info.ticket_tab.size();
}
void ticket_progress(Info & i)
Item * tickets_tab_find_index_dir()
{
i.out << ticket_info.ticket.progress;
}
Item * dir = 0;
if( tickets_tab_index < ticket_info.ticket_tab.size() )
{
long dir_id = ticket_info.ticket_tab[tickets_tab_index].dir_id;
dir = system->dirs.GetDir(dir_id);
}
void ticket_progress_image_number(Info & i)
{
int percent = ticket_info.ticket.progress;
i.out << ticket_calc_progress_image_number(percent);
return dir;
}
// --------------------------------------------------------------------------------
void tickets_tab_url(Info & i)
{
Item * dir = tickets_tab_find_index_dir();
if( dir )
HtmlEscape(i.out, dir->url);
}
void tickets_tab_subject_empty(Info & i)
{
Item * dir = tickets_tab_find_index_dir();
if( dir )
i.res = dir->subject.empty();
}
void tickets_tab_subject(Info & i)
{
Item * dir = tickets_tab_find_index_dir();
if( dir )
HtmlEscape(i.out, dir->subject);
}
void tickets_tab_conf_tab(Info & i)
{
if( tickets_tab_index < ticket_info.ticket_tab.size() )
{
conf_tab_index = i.iter;
i.res = conf_tab_index < ticket_info.cur_conf->tab.size();
if( i.res )
{
const TicketConf::TicketItem & conf_item = ticket_info.cur_conf->tab[conf_tab_index];
const Ticket & ticket = ticket_info.ticket_tab[tickets_tab_index];
find_ticket_value(conf_item, ticket, &has_value, &value);
}
}
}
void tickets_tab_conf_tab_value(Info & i)
{
if( has_value )
ticket_print_value(i, conf_tab_index, value);
}
static size_t ticket_tab_index;
void tickets_tab_conf_tab_is_progress(Info & i)
{
if( has_value &&
conf_tab_index < ticket_info.cur_conf->tab.size() )
{
const TicketConf::TicketItem & conf_item = ticket_info.cur_conf->tab[conf_tab_index];
i.res = IsSubString(ticket_info.progress_prefix, conf_item.name);
}
}
void tickets_tab_conf_tab_progress_image_number(Info & i)
{
if( has_value )
i.out << ticket_calc_progress_image_number(value);
}
} // namespace ns_tickets_tab
namespace ns_ticket_tab
{
static size_t conf_index;
static size_t select_index;
static bool has_value;
static int value;
void ticket_tab(Info & i)
{
ticket_tab_index = i.iter;
conf_index = i.iter;
i.res = conf_index < ticket_info.cur_conf->tab.size();
i.res = ticket_tab_index < ticket_info.ticket_tab.size();
if( i.res )
{
const TicketConf::TicketItem & conf_item = ticket_info.cur_conf->tab[conf_index];
find_ticket_value(conf_item, ticket_info.ticket, &has_value, &value);
}
}
void ticket_tab_url(Info & i)
void ticket_tab_param(Info & i)
{
if( ticket_tab_index < ticket_info.ticket_tab.size() )
if( conf_index < ticket_info.cur_conf->tab.size() )
HtmlEscape(i.out, ticket_info.cur_conf->tab[conf_index].name);
}
void ticket_tab_value(Info & i)
{
if( has_value )
ticket_print_value(i, conf_index, value);
}
void ticket_tab_param_index(Info & i)
{
if( conf_index < ticket_info.cur_conf->tab.size() )
i.out << ticket_info.cur_conf->tab[conf_index].id;
}
void ticket_tab_value_index(Info & i)
{
if( has_value )
i.out << value;
}
void ticket_tab_is_select(Info & i)
{
if( conf_index < ticket_info.cur_conf->tab.size() )
i.res = ticket_info.cur_conf->tab[conf_index].type == TicketConf::TicketItem::TypeSelect;
}
void ticket_tab_is_integer(Info & i)
{
if( conf_index < ticket_info.cur_conf->tab.size() )
i.res = ticket_info.cur_conf->tab[conf_index].type == TicketConf::TicketItem::TypeInteger;
}
void ticket_tab_select_tab(Info & i)
{
if( conf_index < ticket_info.cur_conf->tab.size() )
{
Item * dir = system->dirs.GetDir( ticket_info.ticket_tab[ticket_tab_index].dir_id );
if( dir )
select_index = i.iter;
i.res = select_index < ticket_info.cur_conf->tab[conf_index].select.size();
}
}
void ticket_tab_select_tab_is_default(Info & i)
{
if( has_value )
{
i.res = select_index == value;
}
else
{
if( conf_index < ticket_info.cur_conf->tab.size() &&
select_index < ticket_info.cur_conf->tab[conf_index].select.size() )
{
HtmlEscape(i.out, dir->url);
}
else
{
i.out << "<!-- unknown directory -->";
i.res = select_index == ticket_info.cur_conf->tab[conf_index].select_default;
}
}
}
void ticket_tab_subject(Info & i)
void ticket_tab_select_tab_name(Info & i)
{
if( ticket_tab_index < ticket_info.ticket_tab.size() )
if( conf_index < ticket_info.cur_conf->tab.size() &&
select_index < ticket_info.cur_conf->tab[conf_index].select.size() )
{
Item * dir = system->dirs.GetDir( ticket_info.ticket_tab[ticket_tab_index].dir_id );
if( dir )
{
if( !dir->subject.empty() )
HtmlEscape(i.out, dir->subject);
else
HtmlEscape(i.out, dir->url);
}
else
{
i.out << "<!-- unknown subject -->";
}
HtmlEscape(i.out, ticket_info.cur_conf->tab[conf_index].select[select_index].name);
}
}
void ticket_tab_subject_empty(Info & i)
void ticket_tab_select_tab_id(Info & i)
{
i.res = true;
if( ticket_tab_index < ticket_info.ticket_tab.size() )
if( conf_index < ticket_info.cur_conf->tab.size() &&
select_index < ticket_info.cur_conf->tab[conf_index].select.size() )
{
Item * dir = system->dirs.GetDir( ticket_info.ticket_tab[ticket_tab_index].dir_id );
if( dir )
i.res = dir->subject.empty();
i.out << ticket_info.cur_conf->tab[conf_index].select[select_index].id;
}
}
void ticket_tab_author(Info & i)
{
bool unknown = true;
if( ticket_tab_index < ticket_info.ticket_tab.size() )
{
Item * dir = system->dirs.GetDir( ticket_info.ticket_tab[ticket_tab_index].dir_id );
if( dir )
{
User * puser = system->users.GetUser(dir->user_id);
unknown = false;
if( puser )
HtmlEscape(i.out, puser->name);
else
{
i.out << "~";
if( !dir->guest_name.empty() )
HtmlEscape(i.out, dir->guest_name);
else
i.out << "guest"; // !! dodac do konfiga
}
}
}
} // namespace ns_ticket_tab
if( unknown )
{
i.out << "<!-- unknown user -->";
}
}
void ticket_tab_type(Info & i)
{
if( ticket_tab_index >= ticket_info.ticket_tab.size() )
return;
Ticket & t = ticket_info.ticket_tab[ticket_tab_index];
if( t.type < system->mounts.pmount->param[ticket_info.mount_par_ticket_type].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[ticket_info.mount_par_ticket_type].arg[t.type]);
}
void ticket_tab_status(Info & i)
{
if( ticket_tab_index >= ticket_info.ticket_tab.size() )
return;
Ticket & t = ticket_info.ticket_tab[ticket_tab_index];
if( t.status < system->mounts.pmount->param[ticket_info.mount_par_ticket_status].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[ticket_info.mount_par_ticket_status].arg[t.status]);
}
void ticket_tab_priority(Info & i)
{
if( ticket_tab_index >= ticket_info.ticket_tab.size() )
return;
Ticket & t = ticket_info.ticket_tab[ticket_tab_index];
if( t.priority < system->mounts.pmount->param[ticket_info.mount_par_ticket_priority].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[ticket_info.mount_par_ticket_priority].arg[t.priority]);
}
void ticket_tab_category(Info & i)
{
if( ticket_tab_index >= ticket_info.ticket_tab.size() )
return;
Ticket & t = ticket_info.ticket_tab[ticket_tab_index];
if( t.category < system->mounts.pmount->param[ticket_info.mount_par_ticket_category].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[ticket_info.mount_par_ticket_category].arg[t.category]);
}
void ticket_tab_expected(Info & i)
{
if( ticket_tab_index >= ticket_info.ticket_tab.size() )
return;
Ticket & t = ticket_info.ticket_tab[ticket_tab_index];
if( t.expected < system->mounts.pmount->param[ticket_info.mount_par_ticket_expected].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[ticket_info.mount_par_ticket_expected].arg[t.expected]);
}
void ticket_tab_progress(Info & i)
{
if( ticket_tab_index >= ticket_info.ticket_tab.size() )
return;
i.out << ticket_info.ticket_tab[ticket_tab_index].progress;
}
void ticket_tab_progress_image_number(Info & i)
{
if( ticket_tab_index >= ticket_info.ticket_tab.size() )
return;
int percent = ticket_info.ticket_tab[ticket_tab_index].progress;
i.out << ticket_calc_progress_image_number(percent);
}
// --------------------------------------------------------------------------------
static size_t ticket_type_tab_ind;
void ticket_type_tab(Info & i)
{
ticket_type_tab_ind = i.iter;
i.res = ticket_type_tab_ind < system->mounts.pmount->param[ticket_info.mount_par_ticket_type].arg.size();
}
void ticket_type_tab_defined(Info & i)
{
i.res = system->mounts.pmount->param[ticket_info.mount_par_ticket_type].defined;
}
void ticket_type_tab_isdefault(Info & i)
{
if( ticket_info.is_ticket )
{
i.res = (ticket_type_tab_ind == ticket_info.ticket.type);
}
else
{
Mount::ParamRow & p = system->mounts.pmount->param[ticket_info.mount_par_ticket_type_default];
if( !p.defined || p.arg.empty() )
return; // default false
size_t value = atoi( p.arg[0].c_str() );
i.res = (ticket_type_tab_ind == value);
}
}
void ticket_type_tab_index(Info & i)
{
i.out << ticket_type_tab_ind;
}
void ticket_type_tab_name(Info & i)
{
if( ticket_type_tab_ind < system->mounts.pmount->param[ticket_info.mount_par_ticket_type].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[ticket_info.mount_par_ticket_type].arg[ticket_type_tab_ind]);
}
// --------------------------------------------------------------------------------
static size_t ticket_status_tab_ind;
void ticket_status_tab(Info & i)
{
ticket_status_tab_ind = i.iter;
i.res = ticket_status_tab_ind < system->mounts.pmount->param[ticket_info.mount_par_ticket_status].arg.size();
}
void ticket_status_tab_defined(Info & i)
{
i.res = system->mounts.pmount->param[ticket_info.mount_par_ticket_status].defined;
}
void ticket_status_tab_isdefault(Info & i)
{
if( ticket_info.is_ticket )
{
i.res = (ticket_status_tab_ind == ticket_info.ticket.status);
}
else
{
Mount::ParamRow & p = system->mounts.pmount->param[ticket_info.mount_par_ticket_status_default];
if( !p.defined || p.arg.empty() )
return; // default false
size_t value = atoi( p.arg[0].c_str() );
i.res = (ticket_status_tab_ind == value);
}
}
void ticket_status_tab_index(Info & i)
{
i.out << ticket_status_tab_ind;
}
void ticket_status_tab_name(Info & i)
{
if( ticket_status_tab_ind < system->mounts.pmount->param[ticket_info.mount_par_ticket_status].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[ticket_info.mount_par_ticket_status].arg[ticket_status_tab_ind]);
}
// --------------------------------------------------------------------------------
static size_t ticket_priority_tab_ind;
void ticket_priority_tab(Info & i)
{
ticket_priority_tab_ind = i.iter;
i.res = ticket_priority_tab_ind < system->mounts.pmount->param[ticket_info.mount_par_ticket_priority].arg.size();
}
void ticket_priority_tab_defined(Info & i)
{
i.res = system->mounts.pmount->param[ticket_info.mount_par_ticket_priority].defined;
}
void ticket_priority_tab_isdefault(Info & i)
{
if( ticket_info.is_ticket )
{
i.res = (ticket_priority_tab_ind == ticket_info.ticket.priority);
}
else
{
Mount::ParamRow & p = system->mounts.pmount->param[ticket_info.mount_par_ticket_priority_default];
if( !p.defined || p.arg.empty() )
return; // default false
size_t value = atoi( p.arg[0].c_str() );
i.res = (ticket_priority_tab_ind == value);
}
}
void ticket_priority_tab_index(Info & i)
{
i.out << ticket_priority_tab_ind;
}
void ticket_priority_tab_name(Info & i)
{
if( ticket_priority_tab_ind < system->mounts.pmount->param[ticket_info.mount_par_ticket_priority].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[ticket_info.mount_par_ticket_priority].arg[ticket_priority_tab_ind]);
}
// --------------------------------------------------------------------------------
static size_t ticket_category_tab_ind;
void ticket_category_tab(Info & i)
{
ticket_category_tab_ind = i.iter;
i.res = ticket_category_tab_ind < system->mounts.pmount->param[ticket_info.mount_par_ticket_category].arg.size();
}
void ticket_category_tab_defined(Info & i)
{
i.res = system->mounts.pmount->param[ticket_info.mount_par_ticket_category].defined;
}
void ticket_category_tab_isdefault(Info & i)
{
if( ticket_info.is_ticket )
{
i.res = (ticket_category_tab_ind == ticket_info.ticket.category);
}
else
{
Mount::ParamRow & p = system->mounts.pmount->param[ticket_info.mount_par_ticket_category_default];
if( !p.defined || p.arg.empty() )
return; // default false
size_t value = atoi( p.arg[0].c_str() );
i.res = (ticket_category_tab_ind == value);
}
}
void ticket_category_tab_index(Info & i)
{
i.out << ticket_category_tab_ind;
}
void ticket_category_tab_name(Info & i)
{
if( ticket_category_tab_ind < system->mounts.pmount->param[ticket_info.mount_par_ticket_category].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[ticket_info.mount_par_ticket_category].arg[ticket_category_tab_ind]);
}
// --------------------------------------------------------------------------------
static size_t ticket_expected_tab_ind;
void ticket_expected_tab(Info & i)
{
ticket_expected_tab_ind = i.iter;
i.res = ticket_expected_tab_ind < system->mounts.pmount->param[ticket_info.mount_par_ticket_expected].arg.size();
}
void ticket_expected_tab_defined(Info & i)
{
i.res = system->mounts.pmount->param[ticket_info.mount_par_ticket_expected].defined;
}
void ticket_expected_tab_isdefault(Info & i)
{
if( ticket_info.is_ticket )
{
i.res = (ticket_expected_tab_ind == ticket_info.ticket.expected);
}
else
{
Mount::ParamRow & p = system->mounts.pmount->param[ticket_info.mount_par_ticket_expected_default];
if( !p.defined || p.arg.empty() )
return; // default false
size_t value = atoi( p.arg[0].c_str() );
i.res = (ticket_expected_tab_ind == value);
}
}
void ticket_expected_tab_index(Info & i)
{
i.out << ticket_expected_tab_ind;
}
void ticket_expected_tab_name(Info & i)
{
if( ticket_expected_tab_ind < system->mounts.pmount->param[ticket_info.mount_par_ticket_expected].arg.size() )
HtmlEscape(i.out, system->mounts.pmount->param[ticket_info.mount_par_ticket_expected].arg[ticket_expected_tab_ind]);
}
void AddEzcFunctions(PluginInfo & info)
{
using namespace ns_tickets_tab;
using namespace ns_ticket_tab;
Ezc::Functions * fun = reinterpret_cast<Ezc::Functions*>(info.p1);
fun->Insert("ticket_is", ticket_is);
fun->Insert("ticket_item_subject", ticket_item_subject);
fun->Insert("ticket_item_content", ticket_item_content);
fun->Insert("ticket_item_content_type_is", ticket_item_content_type_is);
fun->Insert("ticket_item_print_content", ticket_item_print_content);
fun->Insert("ticket_can_create", ticket_can_create);
fun->Insert("ticket_can_edit", ticket_can_edit);
fun->Insert("tickets_tab", tickets_tab);
fun->Insert("tickets_tab_url", tickets_tab_url);
fun->Insert("tickets_tab_subject_empty", tickets_tab_subject_empty);
fun->Insert("tickets_tab_subject", tickets_tab_subject);
fun->Insert("tickets_tab_url", tickets_tab_url);
fun->Insert("tickets_tab_conf_tab", tickets_tab_conf_tab);
fun->Insert("tickets_tab_conf_tab_value", tickets_tab_conf_tab_value);
fun->Insert("tickets_tab_conf_tab_is_progress", tickets_tab_conf_tab_is_progress);
fun->Insert("tickets_tab_conf_tab_progress_image_number", tickets_tab_conf_tab_progress_image_number);
fun->Insert("ticket_tab", ticket_tab);
fun->Insert("ticket_tab_param", ticket_tab_param);
fun->Insert("ticket_tab_value", ticket_tab_value);
fun->Insert("ticket_tab_param_index", ticket_tab_param_index);
fun->Insert("ticket_tab_value_index", ticket_tab_value_index);
fun->Insert("ticket_tab_is_select", ticket_tab_is_select);
fun->Insert("ticket_tab_is_integer", ticket_tab_is_integer);
fun->Insert("ticket_tab_select_tab", ticket_tab_select_tab);
fun->Insert("ticket_tab_select_tab_is_default", ticket_tab_select_tab_is_default);
fun->Insert("ticket_tab_select_tab_id", ticket_tab_select_tab_id);
fun->Insert("ticket_tab_select_tab_name", ticket_tab_select_tab_name);
/*
fun->Insert("ticket_type", ticket_type);
fun->Insert("ticket_status", ticket_status);
fun->Insert("ticket_priority", ticket_priority);
@ -640,6 +450,7 @@ void AddEzcFunctions(PluginInfo & info)
fun->Insert("ticket_expected_tab_isdefault", ticket_expected_tab_isdefault);
fun->Insert("ticket_expected_tab_index", ticket_expected_tab_index);
fun->Insert("ticket_expected_tab_name", ticket_expected_tab_name);
*/
}

View File

@ -10,8 +10,8 @@
#ifndef headerfile_winix_plugins_ticket_ticket
#define headerfile_winix_plugins_ticket_ticket
#include <string>
#include <ctime>
#include <vector>
namespace Ticket
@ -19,36 +19,28 @@ namespace Ticket
struct Ticket
{
long id;
struct TicketParam
{
int param;
int value;
TicketParam()
{
param = value = 0;
}
};
long dir_id;
long parent_id;
unsigned int type;
unsigned int status;
unsigned int priority;
unsigned int category;
unsigned int expected;
unsigned int progress; // 0 - 100 (percentage)
// the first item (with the content for the ticket)
long item_id;
// an auxiliary object used when sorting a table with tickets
std::vector<TicketParam> par_tab;
// auxiliary object used during sorting
unsigned long sort_id;
void Clear()
{
id = -1;
dir_id = -1;
parent_id = -1;
type = 0;
status = 0;
priority = 0;
category = 0;
expected = 0;
progress = 0;
item_id = -1;
sort_id = 0;
dir_id = -1;
par_tab.clear();
sort_id = 0;
}
@ -56,7 +48,6 @@ struct Ticket
{
Clear();
}
};

View File

@ -12,6 +12,8 @@
#include "ticketinfo.h"
#include "core/error.h"
#include "core/log.h"
#include "core/misc.h"
namespace Ticket
@ -42,21 +44,31 @@ void TicketInfo::SetSystem(System * psystem)
system = psystem;
}
void TicketInfo::SetRequest(Request * prequest)
{
request = prequest;
}
void TicketInfo::Clear()
{
item.Clear();
is_ticket = false;
ticket.Clear();
ticket_tab.clear();
cur_conf_wrap = &cur_conf_wrap_empty;
cur_conf = &cur_conf_empty;
}
void TicketInfo::ReadTicket(long dir_id)
{
if( tdb->GetTicketByDirId(dir_id, ticket) == WINIX_ERR_OK )
if( tdb->GetTicket(dir_id, ticket) == WINIX_ERR_OK )
{
is_ticket = true;
db->GetItemById(ticket.item_id, item);
//db->GetItemById(ticket.item_id, item);
}
}
@ -200,5 +212,89 @@ void TicketInfo::ReadTicketConf(bool skip_existing_configs)
}
void TicketInfo::FindCurrentConf()
{
if( !system->mounts.pmount )
return;
long dir_id = system->mounts.pmount->dir_id;
ConfTab::iterator i = conf_tab.find(dir_id);
if( i != conf_tab.end() )
{
cur_conf_wrap = &i->second;
cur_conf = &i->second.conf;
}
}
bool TicketInfo::CheckMinMaxValue(const TicketConf::TicketItem & ticket_item, Ticket::TicketParam & par)
{
if( ticket_item.type == TicketConf::TicketItem::TypeInteger )
{
if( par.value < ticket_item.integer_min )
par.value = ticket_item.integer_min;
if( par.value > ticket_item.integer_max )
par.value = ticket_item.integer_max;
}
else
if( ticket_item.type == TicketConf::TicketItem::TypeSelect )
{
for(size_t a=0 ; a<ticket_item.select.size() ; ++a)
{
if( ticket_item.select[a].id == par.value )
return true;
}
log << log1 << "Ticket: incorrect select's value, param: "
<< par.param << ", value: " << par.value << " (ignored)" << logend;
return false;
}
return true;
}
bool TicketInfo::CheckMinMaxValue(Ticket::TicketParam & par)
{
for(size_t i=0 ; i<cur_conf->tab.size() ; ++i)
{
if( par.param == cur_conf->tab[i].id )
return CheckMinMaxValue(cur_conf->tab[i], par);
}
log << log1 << "Ticket: unknown param: " << par.param << " (ignored)" << logend;
return false;
}
void TicketInfo::ReadTicketParams()
{
PostTab::iterator i;
const char parstr[] = "ticketparam"; // !! dodac do konfiga? i szablony tez niech bior¹ z konfiga
size_t parlen = sizeof(parstr) / sizeof(char) - 1;
Ticket::TicketParam param;
ticket.par_tab.clear();
for(i=request->post_tab.begin() ; i!=request->post_tab.end() ; ++i)
{
if( IsSubString(parstr, i->first.c_str()) )
{
param.param = atoi(i->first.c_str() + parlen);
param.value = atoi(i->second.c_str());
if( CheckMinMaxValue(param) )
ticket.par_tab.push_back(param);
}
}
}
} // namespace

View File

@ -47,6 +47,7 @@ public:
void SetTDb(TDb * ptdb);
void SetDb(Db * pdb);
void SetSystem(System * psystem);
void SetRequest(Request * prequest);
void Clear();
void ReadTicket(long dir_id);
@ -61,7 +62,14 @@ public:
typedef std::map<long, TicketConfWrap> ConfTab;
ConfTab conf_tab;
// used by templates
// will not be null
const TicketConfWrap * cur_conf_wrap;
const TicketConf * cur_conf;
// default: "progress"
// can be set in config in option: ticket_form_progress_prefix
std::string progress_prefix;
int mount_type_ticket;
@ -82,17 +90,26 @@ public:
int mount_par_createticket_on;
void ReadTicketConf(bool skip_existing_configs = false);
void FindCurrentConf();
bool CheckMinMaxValue(const TicketConf::TicketItem & ticket_item, Ticket::TicketParam & par);
bool CheckMinMaxValue(Ticket::TicketParam & par);
void ReadTicketParams();
private:
TDb * tdb;
Db * db;
System * system;
Request * request;
TicketParser ticket_parser;
Item item_conf;
std::string path_dir;
std::string path_file;
// for cur_conf_wrap and cur_conf
const TicketConfWrap cur_conf_wrap_empty;
const TicketConf cur_conf_empty;
static bool SortTicketsFun(const Ticket & t1, const Ticket & t2);
bool GetConfContent(const std::string & path);
bool ParseTicketConf(long mount_dir_id, const std::string & path);

View File

@ -669,6 +669,7 @@ padding: 0 1em 0 0;
table.ticket th, table.ticket td {
border: 0;
vertical-align: middle;
}
@ -757,7 +758,10 @@ color: #BABABA;
}
code.bbcode {
display: block;
background-color: #fafafa;
padding: 1em;
font-size: 0.8em;
}

View File

@ -1,33 +1,34 @@
# DO NOT DELETE
adduser.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
adduser.o: ../core/locale.h ../core/confparser.h patterncacher.h
adduser.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
adduser.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
adduser.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
adduser.o: ../db/dbtextstream.h ../core/textstream.h ../db/dbitemquery.h
adduser.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h
adduser.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
adduser.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
adduser.o: ../core/request.h ../core/requesttypes.h ../core/session.h
adduser.o: ../core/error.h ../core/user.h ../core/plugindata.h
adduser.o: ../core/rebus.h ../core/config.h ../core/system.h ../core/dirs.h
adduser.o: ../core/locale.h ../core/confparser.h ../core/user.h
adduser.o: patterncacher.h ../core/item.h ckeditorgetparser.h
adduser.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
adduser.o: ../core/locale.h ../core/config.h ../core/htmlfilter.h ../db/db.h
adduser.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
adduser.o: ../core/textstream.h ../core/error.h ../core/log.h
adduser.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
adduser.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
adduser.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
adduser.o: ../core/requesttypes.h ../core/session.h ../core/error.h
adduser.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
adduser.o: ../core/config.h ../core/system.h ../core/dirs.h
adduser.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
adduser.o: ../core/mount.h ../core/mountparser.h ../core/users.h
adduser.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
adduser.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
adduser.o: ../core/sessioncontainer.h ../core/system.h
dir.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h ../core/locale.h
dir.o: ../core/confparser.h patterncacher.h ../core/item.h
dir.o: ../core/confparser.h ../core/user.h patterncacher.h ../core/item.h
dir.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
dir.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/htmlfilter.h
dir.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
dir.o: ../core/textstream.h ../db/dbitemquery.h ../core/item.h
dir.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h ../core/thread.h
dir.o: ../core/error.h ../core/log.h ../core/dircontainer.h ../core/item.h
dir.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
dir.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h
dir.o: ../core/rebus.h ../core/config.h ../core/system.h ../core/dirs.h
dir.o: ../core/textstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h
dir.o: ../core/item.h ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
dir.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
dir.o: ../core/request.h ../core/requesttypes.h ../core/session.h
dir.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
dir.o: ../core/config.h ../core/system.h ../core/dirs.h
dir.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
dir.o: ../core/mount.h ../core/mountparser.h ../core/users.h
dir.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
@ -48,16 +49,16 @@ dir.o: ../functions/funthread.h ../functions/template.h
dir.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
dir.o: ../functions/uptime.h ../functions/who.h ../core/htmlfilter.h
doc.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h ../core/locale.h
doc.o: ../core/confparser.h patterncacher.h ../core/item.h
doc.o: ../core/confparser.h ../core/user.h patterncacher.h ../core/item.h
doc.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
doc.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/htmlfilter.h
doc.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
doc.o: ../core/textstream.h ../db/dbitemquery.h ../core/item.h
doc.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h ../core/thread.h
doc.o: ../core/error.h ../core/log.h ../core/dircontainer.h ../core/item.h
doc.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
doc.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h
doc.o: ../core/rebus.h ../core/config.h ../core/system.h ../core/dirs.h
doc.o: ../core/textstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h
doc.o: ../core/item.h ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
doc.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
doc.o: ../core/request.h ../core/requesttypes.h ../core/session.h
doc.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
doc.o: ../core/config.h ../core/system.h ../core/dirs.h
doc.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
doc.o: ../core/mount.h ../core/mountparser.h ../core/users.h
doc.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
@ -68,50 +69,50 @@ indexpatterns.o: indexpatterns.h ../../ezc/src/ezc.h localefilter.h
indexpatterns.o: ../core/locale.h ../core/confparser.h ../core/locale.h
indexpatterns.o: ../core/config.h ../core/htmlfilter.h ../core/log.h
item.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
item.o: ../core/locale.h ../core/confparser.h patterncacher.h ../core/item.h
item.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
item.o: indexpatterns.h ../core/locale.h ../core/config.h
item.o: ../core/locale.h ../core/confparser.h ../core/user.h patterncacher.h
item.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
item.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
item.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
item.o: ../db/dbtextstream.h ../core/textstream.h ../db/dbitemquery.h
item.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
item.o: ../core/thread.h ../core/error.h ../core/log.h ../core/dircontainer.h
item.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
item.o: ../core/requesttypes.h ../core/session.h ../core/error.h
item.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
item.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
item.o: ../core/request.h ../core/mounts.h ../core/mount.h
item.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
item.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
item.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
item.o: ../core/system.h ../core/request.h ../core/misc.h
item.o: ../core/bbcodeparser.h
item.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h
item.o: ../core/log.h ../db/dbitemquery.h ../core/item.h
item.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
item.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
item.o: ../core/request.h ../core/requesttypes.h ../core/session.h
item.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
item.o: ../core/config.h ../core/system.h ../core/dirs.h
item.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
item.o: ../core/mount.h ../core/mountparser.h ../core/users.h
item.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
item.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
item.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
item.o: ../core/misc.h ../core/bbcodeparser.h
last.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
last.o: ../core/locale.h ../core/confparser.h patterncacher.h ../core/item.h
last.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
last.o: indexpatterns.h ../core/locale.h ../core/config.h
last.o: ../core/locale.h ../core/confparser.h ../core/user.h patterncacher.h
last.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
last.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
last.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
last.o: ../db/dbtextstream.h ../core/textstream.h ../db/dbitemquery.h
last.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
last.o: ../core/thread.h ../core/error.h ../core/log.h ../core/dircontainer.h
last.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
last.o: ../core/requesttypes.h ../core/session.h ../core/error.h
last.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
last.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
last.o: ../core/request.h ../core/mounts.h ../core/mount.h
last.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
last.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
last.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
last.o: ../core/system.h ../core/lastcontainer.h ../core/request.h
last.o: ../core/misc.h
last.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h
last.o: ../core/log.h ../db/dbitemquery.h ../core/item.h
last.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
last.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
last.o: ../core/request.h ../core/requesttypes.h ../core/session.h
last.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
last.o: ../core/config.h ../core/system.h ../core/dirs.h
last.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
last.o: ../core/mount.h ../core/mountparser.h ../core/users.h
last.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
last.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
last.o: ../core/sessioncontainer.h ../core/system.h ../core/lastcontainer.h
last.o: ../core/request.h ../core/misc.h
localefilter.o: localefilter.h ../core/locale.h ../core/confparser.h
localefilter.o: ../../ezc/src/ezc.h ../core/misc.h ../core/item.h
ls.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h ../core/locale.h
ls.o: ../core/confparser.h patterncacher.h ../core/item.h ckeditorgetparser.h
ls.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
ls.o: ../core/locale.h ../core/config.h ../core/htmlfilter.h ../db/db.h
ls.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h ../core/textstream.h
ls.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h ../core/user.h
ls.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
ls.o: ../core/confparser.h ../core/user.h patterncacher.h ../core/item.h
ls.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
ls.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/htmlfilter.h
ls.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
ls.o: ../core/textstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h
ls.o: ../core/item.h ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
ls.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
ls.o: ../core/request.h ../core/requesttypes.h ../core/session.h
ls.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
@ -121,31 +122,31 @@ ls.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
ls.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
ls.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
ls.o: ../core/system.h ../core/request.h
misc.o: ../core/misc.h ../core/item.h ../core/request.h templates.h
misc.o: ../../ezc/src/ezc.h misc.h localefilter.h ../core/locale.h
misc.o: ../core/confparser.h patterncacher.h ../core/item.h
misc.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
misc.o: indexpatterns.h ../core/locale.h ../core/config.h
misc.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
misc.o: ../core/locale.h ../core/confparser.h ../core/user.h patterncacher.h
misc.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
misc.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
misc.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
misc.o: ../db/dbtextstream.h ../core/textstream.h ../db/dbitemquery.h
misc.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
misc.o: ../core/thread.h ../core/error.h ../core/log.h ../core/dircontainer.h
misc.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
misc.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h
misc.o: ../core/rebus.h ../core/config.h ../core/system.h ../core/dirs.h
misc.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h
misc.o: ../core/log.h ../db/dbitemquery.h ../core/item.h
misc.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
misc.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
misc.o: ../core/request.h ../core/requesttypes.h ../core/session.h
misc.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
misc.o: ../core/config.h ../core/system.h ../core/dirs.h
misc.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
misc.o: ../core/mount.h ../core/mountparser.h ../core/users.h
misc.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
misc.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
misc.o: ../core/sessioncontainer.h ../core/system.h
misc.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
mount.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
mount.o: ../core/locale.h ../core/confparser.h patterncacher.h ../core/item.h
mount.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
mount.o: indexpatterns.h ../core/locale.h ../core/config.h
mount.o: ../core/locale.h ../core/confparser.h ../core/user.h patterncacher.h
mount.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
mount.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
mount.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
mount.o: ../db/dbtextstream.h ../core/textstream.h ../db/dbitemquery.h
mount.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
mount.o: ../core/thread.h ../core/error.h ../core/log.h
mount.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h
mount.o: ../core/log.h ../db/dbitemquery.h ../core/item.h
mount.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
mount.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
mount.o: ../core/request.h ../core/requesttypes.h ../core/session.h
mount.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
@ -158,23 +159,23 @@ mount.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
patterncacher.o: patterncacher.h ../core/item.h ../../ezc/src/ezc.h
patterncacher.o: ../core/log.h
priv.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
priv.o: ../core/locale.h ../core/confparser.h patterncacher.h ../core/item.h
priv.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
priv.o: indexpatterns.h ../core/locale.h ../core/config.h
priv.o: ../core/locale.h ../core/confparser.h ../core/user.h patterncacher.h
priv.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
priv.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
priv.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
priv.o: ../db/dbtextstream.h ../core/textstream.h ../db/dbitemquery.h
priv.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
priv.o: ../core/thread.h ../core/error.h ../core/log.h ../core/dircontainer.h
priv.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
priv.o: ../core/requesttypes.h ../core/session.h ../core/error.h
priv.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
priv.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
priv.o: ../core/request.h ../core/mounts.h ../core/mount.h
priv.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
priv.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
priv.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
priv.o: ../core/system.h ../core/misc.h ../functions/functions.h
priv.o: ../functions/functionbase.h ../core/notify.h
priv.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h
priv.o: ../core/log.h ../db/dbitemquery.h ../core/item.h
priv.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
priv.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
priv.o: ../core/request.h ../core/requesttypes.h ../core/session.h
priv.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
priv.o: ../core/config.h ../core/system.h ../core/dirs.h
priv.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
priv.o: ../core/mount.h ../core/mountparser.h ../core/users.h
priv.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
priv.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
priv.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
priv.o: ../functions/functions.h ../functions/functionbase.h ../core/notify.h
priv.o: ../templatesnotify/templatesnotify.h ../core/mount.h
priv.o: ../templates/misc.h ../functions/functionparser.h
priv.o: ../functions/adduser.h ../functions/cat.h ../functions/chmod.h
@ -189,33 +190,34 @@ priv.o: ../functions/funthread.h ../functions/template.h
priv.o: ../functions/tinymce.h ../functions/uname.h ../functions/upload.h
priv.o: ../functions/uptime.h ../functions/who.h ../core/htmlfilter.h
rebus.o: ../core/request.h templates.h ../../ezc/src/ezc.h misc.h
rebus.o: localefilter.h ../core/locale.h ../core/confparser.h patterncacher.h
rebus.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
rebus.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
rebus.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
rebus.o: ../db/dbtextstream.h ../core/textstream.h ../db/dbitemquery.h
rebus.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
rebus.o: ../core/thread.h ../core/error.h ../core/log.h
rebus.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
rebus.o: ../core/request.h ../core/requesttypes.h ../core/session.h
rebus.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
rebus.o: ../core/config.h ../core/system.h ../core/dirs.h
rebus.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
rebus.o: ../core/mount.h ../core/mountparser.h ../core/users.h
rebus.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
rebus.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
rebus.o: localefilter.h ../core/locale.h ../core/confparser.h ../core/user.h
rebus.o: patterncacher.h ../core/item.h ckeditorgetparser.h
rebus.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
rebus.o: ../core/locale.h ../core/config.h ../core/htmlfilter.h ../db/db.h
rebus.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
rebus.o: ../core/textstream.h ../core/error.h ../core/log.h
rebus.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
rebus.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
rebus.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
rebus.o: ../core/requesttypes.h ../core/session.h ../core/error.h
rebus.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
rebus.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
rebus.o: ../core/request.h ../core/mounts.h ../core/mount.h
rebus.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
rebus.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
rebus.o: ../core/loadavg.h ../core/sessionmanager.h
rebus.o: ../core/sessioncontainer.h ../core/system.h
sys.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h ../core/locale.h
sys.o: ../core/confparser.h patterncacher.h ../core/item.h
sys.o: ../core/confparser.h ../core/user.h patterncacher.h ../core/item.h
sys.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
sys.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/htmlfilter.h
sys.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
sys.o: ../core/textstream.h ../db/dbitemquery.h ../core/item.h
sys.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h ../core/thread.h
sys.o: ../core/error.h ../core/log.h ../core/dircontainer.h ../core/item.h
sys.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
sys.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h
sys.o: ../core/rebus.h ../core/config.h ../core/system.h ../core/dirs.h
sys.o: ../core/textstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h
sys.o: ../core/item.h ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
sys.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
sys.o: ../core/request.h ../core/requesttypes.h ../core/session.h
sys.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
sys.o: ../core/config.h ../core/system.h ../core/dirs.h
sys.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
sys.o: ../core/mount.h ../core/mountparser.h ../core/users.h
sys.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
@ -223,34 +225,36 @@ sys.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
sys.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
sys.o: ../core/version.h
template.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
template.o: ../core/locale.h ../core/confparser.h patterncacher.h
template.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
template.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
template.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
template.o: ../db/dbtextstream.h ../core/textstream.h ../db/dbitemquery.h
template.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h
template.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
template.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
template.o: ../core/request.h ../core/requesttypes.h ../core/session.h
template.o: ../core/error.h ../core/user.h ../core/plugindata.h
template.o: ../core/rebus.h ../core/config.h ../core/system.h ../core/dirs.h
template.o: ../core/locale.h ../core/confparser.h ../core/user.h
template.o: patterncacher.h ../core/item.h ckeditorgetparser.h
template.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
template.o: ../core/locale.h ../core/config.h ../core/htmlfilter.h ../db/db.h
template.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
template.o: ../core/textstream.h ../core/error.h ../core/log.h
template.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
template.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
template.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
template.o: ../core/requesttypes.h ../core/session.h ../core/error.h
template.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
template.o: ../core/config.h ../core/system.h ../core/dirs.h
template.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
template.o: ../core/mount.h ../core/mountparser.h ../core/users.h
template.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
template.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
template.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
templates.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
templates.o: ../core/locale.h ../core/confparser.h patterncacher.h
templates.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
templates.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
templates.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
templates.o: ../db/dbtextstream.h ../core/textstream.h ../db/dbitemquery.h
templates.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h
templates.o: ../core/group.h ../core/thread.h ../core/error.h ../core/log.h
templates.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
templates.o: ../core/request.h ../core/requesttypes.h ../core/session.h
templates.o: ../core/error.h ../core/user.h ../core/plugindata.h
templates.o: ../core/rebus.h ../core/config.h ../core/system.h ../core/dirs.h
templates.o: ../core/locale.h ../core/confparser.h ../core/user.h
templates.o: patterncacher.h ../core/item.h ckeditorgetparser.h
templates.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
templates.o: ../core/locale.h ../core/config.h ../core/htmlfilter.h
templates.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
templates.o: ../core/textstream.h ../core/error.h ../core/log.h
templates.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
templates.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
templates.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
templates.o: ../core/requesttypes.h ../core/session.h ../core/error.h
templates.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
templates.o: ../core/config.h ../core/system.h ../core/dirs.h
templates.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
templates.o: ../core/mount.h ../core/mountparser.h ../core/users.h
templates.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
@ -275,16 +279,17 @@ templates.o: ../functions/tinymce.h ../functions/uname.h
templates.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h
templates.o: ../core/htmlfilter.h ../templates/templates.h
thread.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
thread.o: ../core/locale.h ../core/confparser.h patterncacher.h
thread.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
thread.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
thread.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
thread.o: ../db/dbtextstream.h ../core/textstream.h ../db/dbitemquery.h
thread.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
thread.o: ../core/thread.h ../core/error.h ../core/log.h
thread.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
thread.o: ../core/request.h ../core/requesttypes.h ../core/session.h
thread.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
thread.o: ../core/locale.h ../core/confparser.h ../core/user.h
thread.o: patterncacher.h ../core/item.h ckeditorgetparser.h
thread.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
thread.o: ../core/locale.h ../core/config.h ../core/htmlfilter.h ../db/db.h
thread.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
thread.o: ../core/textstream.h ../core/error.h ../core/log.h
thread.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
thread.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
thread.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
thread.o: ../core/requesttypes.h ../core/session.h ../core/error.h
thread.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
thread.o: ../core/config.h ../core/system.h ../core/dirs.h
thread.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
thread.o: ../core/mount.h ../core/mountparser.h ../core/users.h
@ -307,16 +312,17 @@ thread.o: ../functions/template.h ../functions/tinymce.h ../functions/uname.h
thread.o: ../functions/upload.h ../functions/uptime.h ../functions/who.h
thread.o: ../core/htmlfilter.h
upload.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
upload.o: ../core/locale.h ../core/confparser.h patterncacher.h
upload.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
upload.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
upload.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
upload.o: ../db/dbtextstream.h ../core/textstream.h ../db/dbitemquery.h
upload.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
upload.o: ../core/thread.h ../core/error.h ../core/log.h
upload.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
upload.o: ../core/request.h ../core/requesttypes.h ../core/session.h
upload.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
upload.o: ../core/locale.h ../core/confparser.h ../core/user.h
upload.o: patterncacher.h ../core/item.h ckeditorgetparser.h
upload.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
upload.o: ../core/locale.h ../core/config.h ../core/htmlfilter.h ../db/db.h
upload.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
upload.o: ../core/textstream.h ../core/error.h ../core/log.h
upload.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
upload.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
upload.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
upload.o: ../core/requesttypes.h ../core/session.h ../core/error.h
upload.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
upload.o: ../core/config.h ../core/system.h ../core/dirs.h
upload.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
upload.o: ../core/mount.h ../core/mountparser.h ../core/users.h
@ -324,16 +330,17 @@ upload.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
upload.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
upload.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
uptime.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
uptime.o: ../core/locale.h ../core/confparser.h patterncacher.h
uptime.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
uptime.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
uptime.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
uptime.o: ../db/dbtextstream.h ../core/textstream.h ../db/dbitemquery.h
uptime.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
uptime.o: ../core/thread.h ../core/error.h ../core/log.h
uptime.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
uptime.o: ../core/request.h ../core/requesttypes.h ../core/session.h
uptime.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
uptime.o: ../core/locale.h ../core/confparser.h ../core/user.h
uptime.o: patterncacher.h ../core/item.h ckeditorgetparser.h
uptime.o: ../core/httpsimpleparser.h ../core/log.h indexpatterns.h
uptime.o: ../core/locale.h ../core/config.h ../core/htmlfilter.h ../db/db.h
uptime.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
uptime.o: ../core/textstream.h ../core/error.h ../core/log.h
uptime.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
uptime.o: ../core/group.h ../core/thread.h ../core/dircontainer.h
uptime.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
uptime.o: ../core/requesttypes.h ../core/session.h ../core/error.h
uptime.o: ../core/user.h ../core/plugindata.h ../core/rebus.h
uptime.o: ../core/config.h ../core/system.h ../core/dirs.h
uptime.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
uptime.o: ../core/mount.h ../core/mountparser.h ../core/users.h
@ -341,46 +348,47 @@ uptime.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
uptime.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
uptime.o: ../core/sessioncontainer.h ../core/system.h
user.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
user.o: ../core/locale.h ../core/confparser.h patterncacher.h ../core/item.h
user.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
user.o: indexpatterns.h ../core/locale.h ../core/config.h
user.o: ../core/locale.h ../core/confparser.h ../core/user.h patterncacher.h
user.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
user.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
user.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
user.o: ../db/dbtextstream.h ../core/textstream.h ../db/dbitemquery.h
user.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
user.o: ../core/thread.h ../core/error.h ../core/log.h ../core/dircontainer.h
user.o: ../core/item.h ../core/ugcontainer.h ../core/request.h
user.o: ../core/requesttypes.h ../core/session.h ../core/error.h
user.o: ../core/user.h ../core/plugindata.h ../core/rebus.h ../core/config.h
user.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h
user.o: ../core/request.h ../core/mounts.h ../core/mount.h
user.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
user.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
user.o: ../core/loadavg.h ../core/sessionmanager.h ../core/sessioncontainer.h
user.o: ../core/system.h ../core/request.h ../core/misc.h
user.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h
user.o: ../core/log.h ../db/dbitemquery.h ../core/item.h
user.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
user.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
user.o: ../core/request.h ../core/requesttypes.h ../core/session.h
user.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
user.o: ../core/config.h ../core/system.h ../core/dirs.h
user.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
user.o: ../core/mount.h ../core/mountparser.h ../core/users.h
user.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
user.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
user.o: ../core/sessioncontainer.h ../core/system.h ../core/request.h
user.o: ../core/misc.h
who.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h ../core/locale.h
who.o: ../core/confparser.h patterncacher.h ../core/item.h
who.o: ../core/confparser.h ../core/user.h patterncacher.h ../core/item.h
who.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
who.o: indexpatterns.h ../core/locale.h ../core/config.h ../core/htmlfilter.h
who.o: ../db/db.h ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
who.o: ../core/textstream.h ../db/dbitemquery.h ../core/item.h
who.o: ../db/dbitemcolumns.h ../core/user.h ../core/group.h ../core/thread.h
who.o: ../core/error.h ../core/log.h ../core/dircontainer.h ../core/item.h
who.o: ../core/ugcontainer.h ../core/request.h ../core/requesttypes.h
who.o: ../core/session.h ../core/error.h ../core/user.h ../core/plugindata.h
who.o: ../core/rebus.h ../core/config.h ../core/system.h ../core/dirs.h
who.o: ../core/textstream.h ../core/error.h ../core/log.h ../db/dbitemquery.h
who.o: ../core/item.h ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
who.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
who.o: ../core/request.h ../core/requesttypes.h ../core/session.h
who.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h
who.o: ../core/config.h ../core/system.h ../core/dirs.h
who.o: ../core/dircontainer.h ../core/request.h ../core/mounts.h
who.o: ../core/mount.h ../core/mountparser.h ../core/users.h
who.o: ../core/ugcontainer.h ../core/lastcontainer.h ../core/groups.h
who.o: ../core/group.h ../core/loadavg.h ../core/sessionmanager.h
who.o: ../core/sessioncontainer.h ../core/system.h ../core/misc.h
winix.o: templates.h ../../ezc/src/ezc.h misc.h localefilter.h
winix.o: ../core/locale.h ../core/confparser.h patterncacher.h ../core/item.h
winix.o: ckeditorgetparser.h ../core/httpsimpleparser.h ../core/log.h
winix.o: indexpatterns.h ../core/locale.h ../core/config.h
winix.o: ../core/locale.h ../core/confparser.h ../core/user.h patterncacher.h
winix.o: ../core/item.h ckeditorgetparser.h ../core/httpsimpleparser.h
winix.o: ../core/log.h indexpatterns.h ../core/locale.h ../core/config.h
winix.o: ../core/htmlfilter.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
winix.o: ../db/dbtextstream.h ../core/textstream.h ../db/dbitemquery.h
winix.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
winix.o: ../core/thread.h ../core/error.h ../core/log.h
winix.o: ../db/dbtextstream.h ../core/textstream.h ../core/error.h
winix.o: ../core/log.h ../db/dbitemquery.h ../core/item.h
winix.o: ../db/dbitemcolumns.h ../core/group.h ../core/thread.h
winix.o: ../core/dircontainer.h ../core/item.h ../core/ugcontainer.h
winix.o: ../core/request.h ../core/requesttypes.h ../core/session.h
winix.o: ../core/error.h ../core/user.h ../core/plugindata.h ../core/rebus.h

View File

@ -364,6 +364,21 @@ void dir_last_date_modification(Info & i)
}
void dir_last_date_creation_nice(Info & i)
{
tm * ptm = &request->dir_tab.back()->date_creation;
print_date_nice(i, ptm);
}
void dir_last_date_modification_nice(Info & i)
{
tm * ptm = &request->dir_tab.back()->date_modification;
print_date_nice(i, ptm);
}
void dir_last_dates_equal(Info & i)
{
tm * ptm1 = &request->dir_tab.back()->date_creation;
@ -378,6 +393,19 @@ void dir_last_dates_equal(Info & i)
}
void dir_last_users_different(Info & i)
{
i.res = (request->dir_tab.back()->user_id != request->dir_tab.back()->modification_user_id);
}
void dir_last_modification_user(Info & i)
{
User * puser = system->users.GetUser(request->dir_tab.back()->modification_user_id);
print_user_name(i, puser, request->dir_tab.back()->guest_name);
}
void dir_last_html_template(Info & i)
{
HtmlEscape(i.out, request->dir_tab.back()->html_template);

View File

@ -23,24 +23,6 @@ static BBCODEParser bbcode_parser;
void print_user_name(Info & i, const User * puser, const std::string & guest_name)
{
if( puser )
{
HtmlEscape(i.out, puser->name);
}
else
{
i.out << "~";
if( !guest_name.empty() )
HtmlEscape(i.out, guest_name);
else
i.out << "guest"; // !! dodac do konfiga
}
}
void item_is(Info & i)
{

View File

@ -8,10 +8,10 @@
*/
#include "../core/misc.h"
#include "../core/request.h"
#include "templates.h"
#include "misc.h"
#include "core/misc.h"
#include "core/request.h"
namespace TemplatesFunctions
@ -34,6 +34,24 @@ void print_date_nice(Ezc::Info & i, const tm * ptm)
}
void print_user_name(Ezc::Info & i, const User * puser, const std::string & guest_name)
{
if( puser )
{
HtmlEscape(i.out, puser->name);
}
else
{
i.out << "~";
if( !guest_name.empty() )
HtmlEscape(i.out, guest_name);
else
i.out << "guest"; // !! dodac do konfiga
}
}
int ParseCKeditorFun()
{

View File

@ -15,7 +15,7 @@
#include <string>
#include "localefilter.h"
#include "ezc.h"
#include "core/user.h"
@ -25,6 +25,8 @@ namespace TemplatesFunctions
typedef std::vector<std::vector<Ezc::Pattern> > Patterns;
void print_date_nice(Ezc::Info & i, const tm * ptm);
void print_user_name(Ezc::Info & i, const User * puser, const std::string & guest_name);
int ParseCKeditorFun();

View File

@ -171,7 +171,11 @@ void Templates::CreateFunctions()
ezc_functions.Insert("dir_last_url_is", dir_last_url_is);
ezc_functions.Insert("dir_last_date_creation", dir_last_date_creation);
ezc_functions.Insert("dir_last_date_modification", dir_last_date_modification);
ezc_functions.Insert("dir_last_date_creation_nice", dir_last_date_creation_nice);
ezc_functions.Insert("dir_last_date_modification_nice", dir_last_date_modification_nice);
ezc_functions.Insert("dir_last_dates_equal", dir_last_dates_equal);
ezc_functions.Insert("dir_last_users_different", dir_last_users_different);
ezc_functions.Insert("dir_last_modification_user", dir_last_modification_user);
ezc_functions.Insert("dir_last_html_template", dir_last_html_template);
ezc_functions.Insert("dir_last_has_html_template", dir_last_has_html_template);

View File

@ -100,7 +100,11 @@ namespace TemplatesFunctions
void dir_last_url_is(Info & i);
void dir_last_date_creation(Info & i);
void dir_last_date_modification(Info & i);
void dir_last_date_creation_nice(Info & i);
void dir_last_date_modification_nice(Info & i);
void dir_last_dates_equal(Info & i);
void dir_last_users_different(Info & i);
void dir_last_modification_user(Info & i);
void dir_last_html_template(Info & i);
void dir_last_has_html_template(Info & i);

View File

@ -3,21 +3,21 @@
notify.o: templatesnotify.h ../../ezc/src/ezc.h ../core/mount.h
notify.o: ../core/locale.h ../core/confparser.h ../core/config.h
notify.o: ../core/htmlfilter.h ../templates/misc.h
notify.o: ../templates/localefilter.h ../core/locale.h ../core/notify.h
notify.o: ../templatesnotify/templatesnotify.h ../core/request.h
notify.o: ../core/requesttypes.h ../core/session.h ../core/item.h
notify.o: ../core/error.h ../core/log.h ../core/user.h ../core/plugindata.h
notify.o: ../core/rebus.h ../core/config.h ../core/system.h ../core/dirs.h
notify.o: ../core/dircontainer.h ../db/db.h ../db/dbbase.h ../db/dbconn.h
notify.o: ../db/dbtextstream.h ../core/textstream.h ../db/dbitemquery.h
notify.o: ../core/item.h ../db/dbitemcolumns.h ../core/user.h ../core/group.h
notify.o: ../core/thread.h ../core/error.h ../core/dircontainer.h
notify.o: ../core/ugcontainer.h ../core/mounts.h ../core/mount.h
notify.o: ../core/mountparser.h ../core/users.h ../core/ugcontainer.h
notify.o: ../core/lastcontainer.h ../core/groups.h ../core/group.h
notify.o: ../core/loadavg.h
notify.o: ../templates/localefilter.h ../core/locale.h ../core/user.h
notify.o: ../core/notify.h ../templatesnotify/templatesnotify.h
notify.o: ../core/request.h ../core/requesttypes.h ../core/session.h
notify.o: ../core/item.h ../core/error.h ../core/log.h ../core/user.h
notify.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
notify.o: ../core/system.h ../core/dirs.h ../core/dircontainer.h ../db/db.h
notify.o: ../db/dbbase.h ../db/dbconn.h ../db/dbtextstream.h
notify.o: ../core/textstream.h ../core/error.h ../db/dbitemquery.h
notify.o: ../core/item.h ../db/dbitemcolumns.h ../core/group.h
notify.o: ../core/thread.h ../core/dircontainer.h ../core/ugcontainer.h
notify.o: ../core/mounts.h ../core/mount.h ../core/mountparser.h
notify.o: ../core/users.h ../core/ugcontainer.h ../core/lastcontainer.h
notify.o: ../core/groups.h ../core/group.h ../core/loadavg.h
templatesnotify.o: templatesnotify.h ../../ezc/src/ezc.h ../core/mount.h
templatesnotify.o: ../core/locale.h ../core/confparser.h ../core/config.h
templatesnotify.o: ../core/htmlfilter.h ../templates/misc.h
templatesnotify.o: ../templates/localefilter.h ../core/locale.h
templatesnotify.o: ../core/misc.h ../core/item.h ../core/log.h
templatesnotify.o: ../core/user.h ../core/misc.h ../core/item.h ../core/log.h