added: Patterns class (in templates)

ezc patterns are managed by this class
added: some work in groupitem plugin (not finished yet)
changed: ConfParser can read a string from memory now
         (need some testing yet)



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@757 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2011-08-25 23:53:49 +00:00
parent ee6500ac65
commit 5b8a9c0108
46 changed files with 2896 additions and 1715 deletions

View File

@@ -19,22 +19,22 @@ createticket.o: ../../templates/locale.h ../../core/confparser.h
createticket.o: ../../core/request.h ../../core/config.h ../../core/system.h
createticket.o: ../../core/dirs.h ../../core/dircontainer.h
createticket.o: ../../notify/notify.h ../../notify/notifypool.h
createticket.o: ../../templates/misc.h ../../templates/localefilter.h
createticket.o: ../../templates/locale.h ../../../ezc/src/ezc.h
createticket.o: ../../templates/patterns.h ../../templates/locale.h
createticket.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
createticket.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
createticket.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
createticket.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
createticket.o: ../../templates/htmltextstream.h ../../notify/notifythread.h
createticket.o: ../../core/basethread.h ../../core/synchro.h
createticket.o: ../../notify/templatesnotify.h ../../core/users.h
createticket.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
createticket.o: ../../core/mounts.h ../../core/mountparser.h
createticket.o: ../../core/crypt.h ../../core/run.h ../../core/users.h
createticket.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h
createticket.o: ../../core/thumb.h ../../core/basethread.h
createticket.o: ../../core/threadmanager.h ../../core/synchro.h ticketinfo.h
createticket.o: ticketparser.h ticketconf.h ../../functions/functions.h
createticket.o: ../../functions/functionbase.h
createticket.o: ../../notify/notifythread.h ../../core/basethread.h
createticket.o: ../../core/synchro.h ../../notify/templatesnotify.h
createticket.o: ../../core/users.h ../../core/ugcontainer.h
createticket.o: ../../core/lastcontainer.h ../../templates/misc.h
createticket.o: ../../templates/htmltextstream.h ../../core/mounts.h
createticket.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
createticket.o: ../../core/users.h ../../core/groups.h ../../core/group.h
createticket.o: ../../core/loadavg.h ../../core/thumb.h
createticket.o: ../../core/basethread.h ../../core/threadmanager.h
createticket.o: ../../core/synchro.h ticketinfo.h ticketparser.h ticketconf.h
createticket.o: ../../functions/functions.h ../../functions/functionbase.h
createticket.o: ../../functions/functionparser.h ../../core/cur.h
createticket.o: ../../functions/adduser.h ../../functions/cat.h
createticket.o: ../../functions/chmod.h ../../functions/privchanger.h
@@ -71,16 +71,17 @@ editticket.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
editticket.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
editticket.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
editticket.o: ../../core/confparser.h ../../notify/notify.h
editticket.o: ../../notify/notifypool.h ../../templates/misc.h
editticket.o: ../../templates/localefilter.h ../../templates/locale.h
editticket.o: ../../notify/notifypool.h ../../templates/patterns.h
editticket.o: ../../templates/locale.h ../../templates/localefilter.h
editticket.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h
editticket.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
editticket.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
editticket.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h
editticket.o: ../../notify/notifythread.h ../../core/basethread.h
editticket.o: ../../core/synchro.h ../../notify/templatesnotify.h
editticket.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
editticket.o: ../../core/lastcontainer.h ../../core/mounts.h
editticket.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
editticket.o: ../../core/basethread.h ../../core/synchro.h
editticket.o: ../../notify/templatesnotify.h ../../core/config.h
editticket.o: ../../core/users.h ../../core/ugcontainer.h
editticket.o: ../../core/lastcontainer.h ../../templates/misc.h
editticket.o: ../../templates/htmltextstream.h ../../core/mounts.h
editticket.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
editticket.o: ../../core/users.h ../../core/groups.h ../../core/group.h
editticket.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h
@@ -123,16 +124,17 @@ funticket.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
funticket.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
funticket.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
funticket.o: ../../core/confparser.h ../../notify/notify.h
funticket.o: ../../notify/notifypool.h ../../templates/misc.h
funticket.o: ../../templates/localefilter.h ../../templates/locale.h
funticket.o: ../../notify/notifypool.h ../../templates/patterns.h
funticket.o: ../../templates/locale.h ../../templates/localefilter.h
funticket.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h
funticket.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
funticket.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
funticket.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h
funticket.o: ../../notify/notifythread.h ../../core/basethread.h
funticket.o: ../../core/synchro.h ../../notify/templatesnotify.h
funticket.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
funticket.o: ../../core/lastcontainer.h ../../core/mounts.h
funticket.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
funticket.o: ../../core/basethread.h ../../core/synchro.h
funticket.o: ../../notify/templatesnotify.h ../../core/config.h
funticket.o: ../../core/users.h ../../core/ugcontainer.h
funticket.o: ../../core/lastcontainer.h ../../templates/misc.h
funticket.o: ../../templates/htmltextstream.h ../../core/mounts.h
funticket.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
funticket.o: ../../core/users.h ../../core/groups.h ../../core/group.h
funticket.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h
@@ -160,7 +162,8 @@ funticket.o: ../../functions/functionbase.h ../../core/synchro.h
funticket.o: ../../core/plugin.h pluginmsg.h ../../core/system.h
funticket.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
funticket.o: ../../templates/templates.h ../../templates/patterncacher.h
funticket.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h
funticket.o: ../../templates/indexpatterns.h ../../templates/patterns.h
funticket.o: ../../templates/changepatterns.h ../../core/sessionmanager.h
funticket.o: ../../plugins/thread/pluginmsg.h
init.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
init.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
@@ -177,22 +180,23 @@ init.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
init.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
init.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
init.o: ../../core/confparser.h ../../notify/notify.h
init.o: ../../notify/notifypool.h ../../templates/misc.h
init.o: ../../templates/localefilter.h ../../templates/locale.h
init.o: ../../notify/notifypool.h ../../templates/patterns.h
init.o: ../../templates/locale.h ../../templates/localefilter.h
init.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h
init.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
init.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h
init.o: ../../notify/notifythread.h ../../core/basethread.h
init.o: ../../core/synchro.h ../../notify/templatesnotify.h
init.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
init.o: ../../core/lastcontainer.h ../../core/mounts.h
init.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
init.o: ../../core/users.h ../../core/groups.h ../../core/group.h
init.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h
init.o: ../../core/threadmanager.h ../../functions/functions.h
init.o: ../../functions/functionbase.h ../../functions/functionparser.h
init.o: ../../core/cur.h ../../functions/adduser.h ../../functions/cat.h
init.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
init.o: ../../core/basethread.h ../../core/synchro.h
init.o: ../../notify/templatesnotify.h ../../core/config.h ../../core/users.h
init.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
init.o: ../../templates/misc.h ../../templates/htmltextstream.h
init.o: ../../core/mounts.h ../../core/mountparser.h ../../core/crypt.h
init.o: ../../core/run.h ../../core/users.h ../../core/groups.h
init.o: ../../core/group.h ../../core/loadavg.h ../../core/thumb.h
init.o: ../../core/basethread.h ../../core/threadmanager.h
init.o: ../../functions/functions.h ../../functions/functionbase.h
init.o: ../../functions/functionparser.h ../../core/cur.h
init.o: ../../functions/adduser.h ../../functions/cat.h
init.o: ../../functions/chmod.h ../../functions/privchanger.h
init.o: ../../core/request.h ../../functions/chown.h
init.o: ../../functions/ckeditor.h ../../functions/cp.h
@@ -213,6 +217,7 @@ init.o: createticket.h showtickets.h ../../core/log.h ../../core/plugin.h
init.o: pluginmsg.h ../../core/system.h ../../core/sessionmanager.h
init.o: ../../core/sessioncontainer.h ../../templates/templates.h
init.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h
init.o: ../../templates/patterns.h ../../templates/changepatterns.h
init.o: ../../core/sessionmanager.h sessiondata.h ../../core/plugindata.h
init.o: ../../functions/rm.h ../../plugins/thread/showthreads.h
init.o: ../../plugins/thread/threadinfo.h ../../plugins/thread/thread.h
@@ -236,22 +241,22 @@ showtickets.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
showtickets.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
showtickets.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
showtickets.o: ../../core/confparser.h ../../notify/notify.h
showtickets.o: ../../notify/notifypool.h ../../templates/misc.h
showtickets.o: ../../templates/localefilter.h ../../templates/locale.h
showtickets.o: ../../notify/notifypool.h ../../templates/patterns.h
showtickets.o: ../../templates/locale.h ../../templates/localefilter.h
showtickets.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h
showtickets.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
showtickets.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
showtickets.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h
showtickets.o: ../../notify/notifythread.h ../../core/basethread.h
showtickets.o: ../../core/synchro.h ../../notify/templatesnotify.h
showtickets.o: ../../core/config.h ../../core/users.h
showtickets.o: ../../core/ugcontainer.h ../../core/lastcontainer.h
showtickets.o: ../../core/mounts.h ../../core/mountparser.h
showtickets.o: ../../core/crypt.h ../../core/run.h ../../core/users.h
showtickets.o: ../../core/groups.h ../../core/group.h ../../core/loadavg.h
showtickets.o: ../../core/thumb.h ../../core/basethread.h
showtickets.o: ../../core/threadmanager.h ../../functions/functions.h
showtickets.o: ../../functions/functionbase.h
showtickets.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
showtickets.o: ../../core/basethread.h ../../core/synchro.h
showtickets.o: ../../notify/templatesnotify.h ../../core/config.h
showtickets.o: ../../core/users.h ../../core/ugcontainer.h
showtickets.o: ../../core/lastcontainer.h ../../templates/misc.h
showtickets.o: ../../templates/htmltextstream.h ../../core/mounts.h
showtickets.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
showtickets.o: ../../core/users.h ../../core/groups.h ../../core/group.h
showtickets.o: ../../core/loadavg.h ../../core/thumb.h
showtickets.o: ../../core/basethread.h ../../core/threadmanager.h
showtickets.o: ../../functions/functions.h ../../functions/functionbase.h
showtickets.o: ../../functions/functionparser.h ../../core/cur.h
showtickets.o: ../../functions/adduser.h ../../functions/cat.h
showtickets.o: ../../functions/chmod.h ../../functions/privchanger.h
@@ -276,7 +281,8 @@ showtickets.o: pluginmsg.h ../../plugins/thread/pluginmsg.h
showtickets.o: ../../core/plugin.h ../../core/system.h
showtickets.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
showtickets.o: ../../templates/templates.h ../../templates/patterncacher.h
showtickets.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h
showtickets.o: ../../templates/indexpatterns.h ../../templates/patterns.h
showtickets.o: ../../templates/changepatterns.h ../../core/sessionmanager.h
tdb.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
tdb.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
tdb.o: ../../core/item.h ../../core/requesttypes.h ../../core/error.h
@@ -300,12 +306,13 @@ templates.o: ../../core/misc.h ../../core/session.h ../../core/user.h
templates.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h
templates.o: ../../templates/locale.h ../../core/confparser.h
templates.o: ../../notify/notify.h ../../notify/notifypool.h
templates.o: ../../templates/misc.h ../../templates/localefilter.h
templates.o: ../../templates/locale.h ../../templates/htmltextstream.h
templates.o: ../../notify/notifythread.h ../../core/basethread.h
templates.o: ../../core/synchro.h ../../notify/templatesnotify.h
templates.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
templates.o: ../../core/lastcontainer.h ../../core/mounts.h
templates.o: ../../templates/patterns.h ../../templates/locale.h
templates.o: ../../templates/localefilter.h ../../notify/notifythread.h
templates.o: ../../core/basethread.h ../../core/synchro.h
templates.o: ../../notify/templatesnotify.h ../../core/config.h
templates.o: ../../core/users.h ../../core/ugcontainer.h
templates.o: ../../core/lastcontainer.h ../../templates/misc.h
templates.o: ../../templates/htmltextstream.h ../../core/mounts.h
templates.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
templates.o: ../../core/users.h ../../core/groups.h ../../core/group.h
templates.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h
@@ -335,7 +342,8 @@ templates.o: ../../core/synchro.h createticket.h ../../core/misc.h
templates.o: ../../core/plugin.h pluginmsg.h ../../core/system.h
templates.o: ../../core/sessionmanager.h ../../core/sessioncontainer.h
templates.o: ../../templates/templates.h ../../templates/patterncacher.h
templates.o: ../../templates/indexpatterns.h ../../core/sessionmanager.h
templates.o: ../../templates/indexpatterns.h ../../templates/patterns.h
templates.o: ../../templates/changepatterns.h ../../core/sessionmanager.h
templates.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h
templates.o: ../../plugins/thread/pluginmsg.h
ticketconf.o: ticketconf.h
@@ -354,16 +362,17 @@ ticketinfo.o: ../../core/textstream.h ../../core/misc.h ../../core/session.h
ticketinfo.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h
ticketinfo.o: ../../core/mount.h ../../templates/locale.h
ticketinfo.o: ../../core/confparser.h ../../notify/notify.h
ticketinfo.o: ../../notify/notifypool.h ../../templates/misc.h
ticketinfo.o: ../../templates/localefilter.h ../../templates/locale.h
ticketinfo.o: ../../notify/notifypool.h ../../templates/patterns.h
ticketinfo.o: ../../templates/locale.h ../../templates/localefilter.h
ticketinfo.o: ../../../ezc/src/ezc.h ../../../ezc/src/utf8.h
ticketinfo.o: ../../../ezc/src/generator.h ../../../ezc/src/pattern.h
ticketinfo.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
ticketinfo.o: ../../../ezc/src/stringconv.h ../../templates/htmltextstream.h
ticketinfo.o: ../../notify/notifythread.h ../../core/basethread.h
ticketinfo.o: ../../core/synchro.h ../../notify/templatesnotify.h
ticketinfo.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
ticketinfo.o: ../../core/lastcontainer.h ../../core/mounts.h
ticketinfo.o: ../../../ezc/src/stringconv.h ../../notify/notifythread.h
ticketinfo.o: ../../core/basethread.h ../../core/synchro.h
ticketinfo.o: ../../notify/templatesnotify.h ../../core/config.h
ticketinfo.o: ../../core/users.h ../../core/ugcontainer.h
ticketinfo.o: ../../core/lastcontainer.h ../../templates/misc.h
ticketinfo.o: ../../templates/htmltextstream.h ../../core/mounts.h
ticketinfo.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
ticketinfo.o: ../../core/users.h ../../core/groups.h ../../core/group.h
ticketinfo.o: ../../core/loadavg.h ../../core/thumb.h ../../core/basethread.h

View File

@@ -142,6 +142,9 @@ bool TicketParser::ReadItemType()
if( type == L"string" )
item.type = TicketConf::TicketItem::TypeString;
else
if( type == L"multistring" ) // !! nie skonczone jeszcze?
item.type = TicketConf::TicketItem::TypeMultistring;
else
if( type == L"images" )
item.type = TicketConf::TicketItem::TypeImages;
else