tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

changed: updated to the new ezc api, this with O(1) when looking for a specific ezc function

Browse Source 
changed: sessions are deleted at the end of a request (and only a few sessions)
         other sessions will be deleted after a next request


git-svn-id: svn://ttmath.org/publicrep/winix/trunk@684 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2010-11-25 22:42:24 +00:00
parent 933c8841ff
commit 08e53919e2
25 changed files with 753 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
templatesnotify/Makefile.dep
View File

@@ -2,32 +2,33 @@
notify.o: templatesnotify.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
notify.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
notify.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
notify.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h ../core/mount.h
notify.o: ../core/config.h ../core/confparser.h ../core/htmlfilter.h
notify.o: ../core/textstream.h ../core/misc.h ../templates/misc.h
notify.o: ../templates/localefilter.h ../templates/locale.h
notify.o: ../core/confparser.h ../templates/htmltextstream.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/error.h ../core/log.h ../core/textstream.h ../core/user.h
notify.o: ../core/plugindata.h ../core/rebus.h ../core/config.h
notify.o: ../templates/htmltextstream.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/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
notify.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
notify.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
notify.o: ../core/mount.h ../core/config.h ../core/confparser.h
notify.o: ../core/htmlfilter.h ../core/textstream.h ../core/misc.h
notify.o: ../templates/misc.h ../templates/localefilter.h
notify.o: ../templates/locale.h ../core/confparser.h
notify.o: ../templates/htmltextstream.h ../core/user.h ../core/log.h
notify.o: ../core/textstream.h ../core/notify.h
notify.o: ../templatesnotify/templatesnotify.h ../core/request.h
notify.o: ../core/requesttypes.h ../core/session.h ../core/error.h
notify.o: ../core/log.h ../core/user.h ../core/plugindata.h ../core/rebus.h
notify.o: ../core/config.h ../templates/htmltextstream.h ../core/system.h
notify.o: ../core/dirs.h ../core/dircontainer.h ../db/db.h ../db/dbbase.h
notify.o: ../db/dbconn.h ../db/dbtextstream.h ../core/error.h
notify.o: ../db/dbitemquery.h ../core/item.h ../db/dbitemcolumns.h
notify.o: ../core/group.h ../core/thread.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
templatesnotify.o: templatesnotify.h ../../ezc/src/ezc.h ../../ezc/src/utf8.h
templatesnotify.o: ../../ezc/src/generator.h ../../ezc/src/pattern.h
templatesnotify.o: ../../ezc/src/item.h ../../ezc/src/stringconv.h
templatesnotify.o: ../../ezc/src/functions.h ../../ezc/src/funinfo.h
templatesnotify.o: ../../ezc/src/item.h ../../ezc/src/funinfo.h
templatesnotify.o: ../../ezc/src/functions.h ../../ezc/src/stringconv.h
templatesnotify.o: ../core/mount.h ../core/config.h ../core/confparser.h
templatesnotify.o: ../core/htmlfilter.h ../core/textstream.h ../core/misc.h
templatesnotify.o: ../templates/misc.h ../templates/localefilter.h
templatesnotify.o: ../templates/locale.h ../core/confparser.h
templatesnotify.o: ../templates/htmltextstream.h ../core/user.h
templatesnotify.o: ../core/misc.h ../core/log.h ../core/textstream.h
templatesnotify.o: ../templates/locale.h
templatesnotify.o: ../templates/htmltextstream.h ../core/user.h ../core/log.h
templatesnotify.o: ../core/textstream.h ../core/misc.h ../templates/locale.h

10
templatesnotify/templatesnotify.cpp
View File

@@ -106,7 +106,11 @@ using namespace TemplatesNotifyFunctions;
ClearPatterns();
locale.UTF8(config->utf8);
locale.Read(config->locale_dir, config->locale_dir_default);
TemplatesFunctions::Read(patterns, pat_email_notify, locale, locale_filter, L"notify_email.txt", true);
// !! nazwe pliku do konfiga
TemplatesFunctions::Read(patterns, pat_email_notify, locale, locale_filter, ezc_functions,
L"notify_email.txt", config->utf8,
config->templates_dir, config->templates_dir_default, true);
notify_msg = 0;
}
@@ -128,11 +132,11 @@ using namespace TemplatesNotifyFunctions;
return;
}
Ezc::Generator<TextStream<std::wstring> > generator(notify_str, patterns[lang][pat_email_notify], ezc_functions);
Ezc::Generator<TextStream<std::wstring> > generator;
generator.RecognizeSpecialChars(true);
generator.TrimWhite(true);
generator.SkipNewLine(true);
generator.Generate();
generator.Generate(notify_str, patterns[lang][pat_email_notify]);
}