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

added: mount points have parameters now

Browse Source 
added: to the database: table 'thread'



git-svn-id: svn://ttmath.org/publicrep/cmslu/trunk@499 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2009-04-20 23:49:28 +00:00
parent e94ccc86f8
commit f46677dfc0
24 changed files with 787 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

200
templates/Makefile.dep
View File

@@ -3,99 +3,103 @@
dir.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h
dir.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h
dir.o: ../core/db.h ../core/dircontainer.h ../core/user.h ../core/group.h
dir.o: ../core/ugcontainer.h ../core/users.h ../core/groups.h
dir.o: ../core/functions.h ../core/function.h ../core/functioncodeparser.h
dir.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
dir.o: ../core/request.h ../core/requesttypes.h ../core/session.h
dir.o: ../core/done.h ../core/getparser.h ../core/httpsimpleparser.h
dir.o: ../core/postparser.h ../core/cookieparser.h ../core/mountparser.h
dir.o: ../core/request.h ../core/item.h ../core/db.h ../core/error.h
dir.o: ../core/user.h ../core/group.h ../core/users.h ../core/groups.h
dir.o: ../core/log.h patterncacher.h ../app/templates.h
dir.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h
dir.o: ../core/groups.h ../core/functions.h ../core/function.h
dir.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h
dir.o: ../core/mount.h ../core/request.h ../core/requesttypes.h
dir.o: ../core/session.h ../core/done.h ../core/getparser.h
dir.o: ../core/httpsimpleparser.h ../core/postparser.h ../core/cookieparser.h
dir.o: ../core/mountparser.h ../core/request.h ../core/item.h ../core/db.h
dir.o: ../core/error.h ../core/user.h ../core/group.h ../core/users.h
dir.o: ../core/groups.h ../core/log.h patterncacher.h ../app/templates.h
doc.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h
doc.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h
doc.o: ../core/db.h ../core/dircontainer.h ../core/user.h ../core/group.h
doc.o: ../core/ugcontainer.h ../core/users.h ../core/groups.h
doc.o: ../core/functions.h ../core/function.h ../core/functioncodeparser.h
doc.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
doc.o: ../core/request.h ../core/requesttypes.h ../core/session.h
doc.o: ../core/done.h ../core/getparser.h ../core/httpsimpleparser.h
doc.o: ../core/postparser.h ../core/cookieparser.h ../core/mountparser.h
doc.o: ../core/request.h ../core/item.h ../core/db.h ../core/error.h
doc.o: ../core/user.h ../core/group.h ../core/users.h ../core/groups.h
doc.o: ../core/log.h patterncacher.h ../app/templates.h
doc.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h
doc.o: ../core/groups.h ../core/functions.h ../core/function.h
doc.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h
doc.o: ../core/mount.h ../core/request.h ../core/requesttypes.h
doc.o: ../core/session.h ../core/done.h ../core/getparser.h
doc.o: ../core/httpsimpleparser.h ../core/postparser.h ../core/cookieparser.h
doc.o: ../core/mountparser.h ../core/request.h ../core/item.h ../core/db.h
doc.o: ../core/error.h ../core/user.h ../core/group.h ../core/users.h
doc.o: ../core/groups.h ../core/log.h patterncacher.h ../app/templates.h
done.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h
done.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h
done.o: ../core/db.h ../core/dircontainer.h ../core/user.h ../core/group.h
done.o: ../core/ugcontainer.h ../core/users.h ../core/groups.h
done.o: ../core/functions.h ../core/function.h ../core/functioncodeparser.h
done.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
done.o: ../core/request.h ../core/requesttypes.h ../core/session.h
done.o: ../core/done.h ../core/getparser.h ../core/httpsimpleparser.h
done.o: ../core/postparser.h ../core/cookieparser.h ../core/mountparser.h
done.o: ../core/request.h ../core/item.h ../core/db.h ../core/error.h
done.o: ../core/user.h ../core/group.h ../core/users.h ../core/groups.h
done.o: ../core/log.h patterncacher.h ../app/templates.h
done.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h
done.o: ../core/groups.h ../core/functions.h ../core/function.h
done.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h
done.o: ../core/mount.h ../core/request.h ../core/requesttypes.h
done.o: ../core/session.h ../core/done.h ../core/getparser.h
done.o: ../core/httpsimpleparser.h ../core/postparser.h
done.o: ../core/cookieparser.h ../core/mountparser.h ../core/request.h
done.o: ../core/item.h ../core/db.h ../core/error.h ../core/user.h
done.o: ../core/group.h ../core/users.h ../core/groups.h ../core/log.h
done.o: patterncacher.h ../app/templates.h
item.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h
item.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h
item.o: ../core/db.h ../core/dircontainer.h ../core/user.h ../core/group.h
item.o: ../core/ugcontainer.h ../core/users.h ../core/groups.h
item.o: ../core/functions.h ../core/function.h ../core/functioncodeparser.h
item.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
item.o: ../core/request.h ../core/requesttypes.h ../core/session.h
item.o: ../core/done.h ../core/getparser.h ../core/httpsimpleparser.h
item.o: ../core/postparser.h ../core/cookieparser.h ../core/mountparser.h
item.o: ../core/request.h ../core/item.h ../core/db.h ../core/error.h
item.o: ../core/user.h ../core/group.h ../core/users.h ../core/groups.h
item.o: ../core/log.h patterncacher.h ../app/templates.h
item.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h
item.o: ../core/groups.h ../core/functions.h ../core/function.h
item.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h
item.o: ../core/mount.h ../core/request.h ../core/requesttypes.h
item.o: ../core/session.h ../core/done.h ../core/getparser.h
item.o: ../core/httpsimpleparser.h ../core/postparser.h
item.o: ../core/cookieparser.h ../core/mountparser.h ../core/request.h
item.o: ../core/item.h ../core/db.h ../core/error.h ../core/user.h
item.o: ../core/group.h ../core/users.h ../core/groups.h ../core/log.h
item.o: patterncacher.h ../app/templates.h
last.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h
last.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h
last.o: ../core/db.h ../core/dircontainer.h ../core/user.h ../core/group.h
last.o: ../core/ugcontainer.h ../core/users.h ../core/groups.h
last.o: ../core/functions.h ../core/function.h ../core/functioncodeparser.h
last.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
last.o: ../core/request.h ../core/requesttypes.h ../core/session.h
last.o: ../core/done.h ../core/getparser.h ../core/httpsimpleparser.h
last.o: ../core/postparser.h ../core/cookieparser.h ../core/mountparser.h
last.o: ../core/request.h ../core/item.h ../core/db.h ../core/error.h
last.o: ../core/user.h ../core/group.h ../core/users.h ../core/groups.h
last.o: ../core/log.h patterncacher.h ../app/templates.h
last.o: ../core/lastcontainer.h ../core/misc.h
last.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h
last.o: ../core/groups.h ../core/functions.h ../core/function.h
last.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h
last.o: ../core/mount.h ../core/request.h ../core/requesttypes.h
last.o: ../core/session.h ../core/done.h ../core/getparser.h
last.o: ../core/httpsimpleparser.h ../core/postparser.h
last.o: ../core/cookieparser.h ../core/mountparser.h ../core/request.h
last.o: ../core/item.h ../core/db.h ../core/error.h ../core/user.h
last.o: ../core/group.h ../core/users.h ../core/groups.h ../core/log.h
last.o: patterncacher.h ../app/templates.h ../core/lastcontainer.h
last.o: ../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 ../core/data.h ../core/misc.h
priv.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h
priv.o: ../core/db.h ../core/dircontainer.h ../core/user.h ../core/group.h
priv.o: ../core/ugcontainer.h ../core/users.h ../core/groups.h
priv.o: ../core/functions.h ../core/function.h ../core/functioncodeparser.h
priv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
priv.o: ../core/request.h ../core/requesttypes.h ../core/session.h
priv.o: ../core/done.h ../core/getparser.h ../core/httpsimpleparser.h
priv.o: ../core/postparser.h ../core/cookieparser.h ../core/mountparser.h
priv.o: ../core/request.h ../core/item.h ../core/db.h ../core/error.h
priv.o: ../core/user.h ../core/group.h ../core/users.h ../core/groups.h
priv.o: ../core/log.h patterncacher.h ../app/templates.h
priv.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h
priv.o: ../core/groups.h ../core/functions.h ../core/function.h
priv.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h
priv.o: ../core/mount.h ../core/request.h ../core/requesttypes.h
priv.o: ../core/session.h ../core/done.h ../core/getparser.h
priv.o: ../core/httpsimpleparser.h ../core/postparser.h
priv.o: ../core/cookieparser.h ../core/mountparser.h ../core/request.h
priv.o: ../core/item.h ../core/db.h ../core/error.h ../core/user.h
priv.o: ../core/group.h ../core/users.h ../core/groups.h ../core/log.h
priv.o: patterncacher.h ../app/templates.h
sys.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h
sys.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h
sys.o: ../core/db.h ../core/dircontainer.h ../core/user.h ../core/group.h
sys.o: ../core/ugcontainer.h ../core/users.h ../core/groups.h
sys.o: ../core/functions.h ../core/function.h ../core/functioncodeparser.h
sys.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
sys.o: ../core/request.h ../core/requesttypes.h ../core/session.h
sys.o: ../core/done.h ../core/getparser.h ../core/httpsimpleparser.h
sys.o: ../core/postparser.h ../core/cookieparser.h ../core/mountparser.h
sys.o: ../core/request.h ../core/item.h ../core/db.h ../core/error.h
sys.o: ../core/user.h ../core/group.h ../core/users.h ../core/groups.h
sys.o: ../core/log.h patterncacher.h ../app/templates.h
sys.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h
sys.o: ../core/groups.h ../core/functions.h ../core/function.h
sys.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h
sys.o: ../core/mount.h ../core/request.h ../core/requesttypes.h
sys.o: ../core/session.h ../core/done.h ../core/getparser.h
sys.o: ../core/httpsimpleparser.h ../core/postparser.h ../core/cookieparser.h
sys.o: ../core/mountparser.h ../core/request.h ../core/item.h ../core/db.h
sys.o: ../core/error.h ../core/user.h ../core/group.h ../core/users.h
sys.o: ../core/groups.h ../core/log.h patterncacher.h ../app/templates.h
templates.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h
templates.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h
templates.o: ../core/db.h ../core/dircontainer.h ../core/user.h
templates.o: ../core/group.h ../core/ugcontainer.h ../core/users.h
templates.o: ../core/groups.h ../core/functions.h ../core/function.h
templates.o: ../core/functioncodeparser.h ../core/lastcontainer.h
templates.o: ../core/mounts.h ../core/mount.h ../core/request.h
templates.o: ../core/requesttypes.h ../core/session.h ../core/done.h
templates.o: ../core/getparser.h ../core/httpsimpleparser.h
templates.o: ../core/group.h ../core/ugcontainer.h ../core/thread.h
templates.o: ../core/users.h ../core/groups.h ../core/functions.h
templates.o: ../core/function.h ../core/functioncodeparser.h
templates.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
templates.o: ../core/request.h ../core/requesttypes.h ../core/session.h
templates.o: ../core/done.h ../core/getparser.h ../core/httpsimpleparser.h
templates.o: ../core/postparser.h ../core/cookieparser.h
templates.o: ../core/mountparser.h ../core/request.h ../core/item.h
templates.o: ../core/db.h ../core/error.h ../core/user.h ../core/group.h
@@ -104,39 +108,41 @@ templates.o: ../app/templates.h
thread.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h
thread.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h
thread.o: ../core/db.h ../core/dircontainer.h ../core/user.h ../core/group.h
thread.o: ../core/ugcontainer.h ../core/users.h ../core/groups.h
thread.o: ../core/functions.h ../core/function.h ../core/functioncodeparser.h
thread.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
thread.o: ../core/request.h ../core/requesttypes.h ../core/session.h
thread.o: ../core/done.h ../core/getparser.h ../core/httpsimpleparser.h
thread.o: ../core/postparser.h ../core/cookieparser.h ../core/mountparser.h
thread.o: ../core/request.h ../core/item.h ../core/db.h ../core/error.h
thread.o: ../core/user.h ../core/group.h ../core/users.h ../core/groups.h
thread.o: ../core/log.h patterncacher.h ../app/templates.h
thread.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h
thread.o: ../core/groups.h ../core/functions.h ../core/function.h
thread.o: ../core/functioncodeparser.h ../core/lastcontainer.h
thread.o: ../core/mounts.h ../core/mount.h ../core/request.h
thread.o: ../core/requesttypes.h ../core/session.h ../core/done.h
thread.o: ../core/getparser.h ../core/httpsimpleparser.h ../core/postparser.h
thread.o: ../core/cookieparser.h ../core/mountparser.h ../core/request.h
thread.o: ../core/item.h ../core/db.h ../core/error.h ../core/user.h
thread.o: ../core/group.h ../core/users.h ../core/groups.h ../core/log.h
thread.o: patterncacher.h ../app/templates.h
user.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h
user.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h
user.o: ../core/db.h ../core/dircontainer.h ../core/user.h ../core/group.h
user.o: ../core/ugcontainer.h ../core/users.h ../core/groups.h
user.o: ../core/functions.h ../core/function.h ../core/functioncodeparser.h
user.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
user.o: ../core/request.h ../core/requesttypes.h ../core/session.h
user.o: ../core/done.h ../core/getparser.h ../core/httpsimpleparser.h
user.o: ../core/postparser.h ../core/cookieparser.h ../core/mountparser.h
user.o: ../core/request.h ../core/item.h ../core/db.h ../core/error.h
user.o: ../core/user.h ../core/group.h ../core/users.h ../core/groups.h
user.o: ../core/log.h patterncacher.h ../app/templates.h
user.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h
user.o: ../core/groups.h ../core/functions.h ../core/function.h
user.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h
user.o: ../core/mount.h ../core/request.h ../core/requesttypes.h
user.o: ../core/session.h ../core/done.h ../core/getparser.h
user.o: ../core/httpsimpleparser.h ../core/postparser.h
user.o: ../core/cookieparser.h ../core/mountparser.h ../core/request.h
user.o: ../core/item.h ../core/db.h ../core/error.h ../core/user.h
user.o: ../core/group.h ../core/users.h ../core/groups.h ../core/log.h
user.o: patterncacher.h ../app/templates.h
who.o: templates.h ../../ezc/src/ezc.h ../core/data.h ../core/misc.h
who.o: ../core/log.h ../core/item.h ../core/error.h ../core/dirs.h
who.o: ../core/db.h ../core/dircontainer.h ../core/user.h ../core/group.h
who.o: ../core/ugcontainer.h ../core/users.h ../core/groups.h
who.o: ../core/functions.h ../core/function.h ../core/functioncodeparser.h
who.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
who.o: ../core/request.h ../core/requesttypes.h ../core/session.h
who.o: ../core/done.h ../core/getparser.h ../core/httpsimpleparser.h
who.o: ../core/postparser.h ../core/cookieparser.h ../core/mountparser.h
who.o: ../core/request.h ../core/item.h ../core/db.h ../core/error.h
who.o: ../core/user.h ../core/group.h ../core/users.h ../core/groups.h
who.o: ../core/log.h patterncacher.h ../app/templates.h
who.o: ../core/ugcontainer.h ../core/thread.h ../core/users.h
who.o: ../core/groups.h ../core/functions.h ../core/function.h
who.o: ../core/functioncodeparser.h ../core/lastcontainer.h ../core/mounts.h
who.o: ../core/mount.h ../core/request.h ../core/requesttypes.h
who.o: ../core/session.h ../core/done.h ../core/getparser.h
who.o: ../core/httpsimpleparser.h ../core/postparser.h ../core/cookieparser.h
who.o: ../core/mountparser.h ../core/request.h ../core/item.h ../core/db.h
who.o: ../core/error.h ../core/user.h ../core/group.h ../core/users.h
who.o: ../core/groups.h ../core/log.h patterncacher.h ../app/templates.h
who.o: ../core/sessioncontainer.h ../core/requestcontroller.h ../core/data.h
who.o: ../content/content.h ../templates/templates.h ../core/misc.h
who.o: ../core/function.h ../core/functionparser.h ../app/content.h

88
templates/item.cpp
View File

@@ -313,6 +313,94 @@ void item_tab_link(Info & i)
}
void item_tab_can_read(Info & i)
{
if( item_index < request.item_table.size() )
{
if( request.HasReadAccess(request.item_table[item_index]) )
i.result = true;
}
}
void item_tab_info(Info & i)
{
Ezc::Generator gen(i.out, pat_item_tab_info, functions);
gen.Generate();
}
void item_tab_user(Info & i)
{
if( item_index < request.item_table.size() )
{
User * puser = data.users.GetUser(request.item_table[item_index].user_id);
if( puser )
HtmlEscape(i.out, puser->name);
else
i.out << "unknown";
}
}
void item_tab_date_creation(Info & i)
{
if( item_index < request.item_table.size() )
{
tm * ptm = &request.item_table[item_index].date_creation;
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
}
}
void item_tab_date_modification(Info & i)
{
if( item_index < request.item_table.size() )
{
tm * ptm = &request.item_table[item_index].date_modification;
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
}
}
void item_tab_dates_equal(Info & i)
{
if( item_index < request.item_table.size() )
{
tm * ptm1 = &request.item_table[item_index].date_creation;
tm * ptm2 = &request.item_table[item_index].date_modification;
i.result = ptm1->tm_year == ptm2->tm_year &&
ptm1->tm_mon == ptm2->tm_mon &&
ptm1->tm_mday == ptm2->tm_mday &&
ptm1->tm_hour == ptm2->tm_hour &&
ptm1->tm_min == ptm2->tm_min &&
ptm1->tm_sec == ptm2->tm_sec;
}
}
void item_tab_run(Info & i)
{
if( item_index < request.item_table.size() )
{
if( !request.HasReadExecAccess(request.item) )
{
i.out << "<!-- run: permission denied -->";
return;
}
Ezc::Pattern * p = pattern_cacher.GetPattern(request.item_table[item_index]);
Ezc::Generator gen(i.out, *p, functions);
gen.Generate();
}
}
} // namespace TemplatesFunctions

84
templates/templates.cpp
View File

@@ -32,7 +32,7 @@ Ezc::Pattern pat_err_404;
Ezc::Pattern pat_err_per_denied;
Ezc::Pattern pat_err_others;
Ezc::Pattern pat_item_info;
Ezc::Pattern pat_item_tab_info;
Ezc::Functions functions;
@@ -208,44 +208,51 @@ void Templates::CreateFunctions()
/*
item
*/
functions.Insert("item_is", item_is);
functions.Insert("item_id", item_id);
functions.Insert("item_subject", item_subject);
functions.Insert("item_subject_noescape", item_subject_noescape);
functions.Insert("item_content", item_content);
functions.Insert("item_content_noescape", item_content_noescape);
functions.Insert("item_privileges", item_privileges);
functions.Insert("item_dir", item_dir);
functions.Insert("item_url", item_url);
functions.Insert("item_link", item_link);
functions.Insert("item_can_read", item_can_read);
functions.Insert("item_info", item_info);
functions.Insert("item_user", item_user);
functions.Insert("item_date_creation", item_date_creation);
functions.Insert("item_date_modification", item_date_modification);
functions.Insert("item_dates_equal", item_dates_equal);
functions.Insert("item_run", item_run);
functions.Insert("item_is", item_is);
functions.Insert("item_id", item_id);
functions.Insert("item_subject", item_subject);
functions.Insert("item_subject_noescape", item_subject_noescape);
functions.Insert("item_content", item_content);
functions.Insert("item_content_noescape", item_content_noescape);
functions.Insert("item_privileges", item_privileges);
functions.Insert("item_dir", item_dir);
functions.Insert("item_url", item_url);
functions.Insert("item_link", item_link);
functions.Insert("item_can_read", item_can_read);
functions.Insert("item_info", item_info);
functions.Insert("item_user", item_user);
functions.Insert("item_date_creation", item_date_creation);
functions.Insert("item_date_modification", item_date_modification);
functions.Insert("item_dates_equal", item_dates_equal);
functions.Insert("item_run", item_run);
functions.Insert("item_old_id", item_old_id);
functions.Insert("item_old_subject", item_old_subject);
functions.Insert("item_old_subject_noescape", item_old_subject_noescape);
functions.Insert("item_old_content", item_old_content);
functions.Insert("item_old_content_noescape", item_old_content_noescape);
functions.Insert("item_old_privileges", item_old_privileges);
functions.Insert("item_old_dir", item_old_dir);
functions.Insert("item_old_url", item_old_url);
functions.Insert("item_old_link", item_old_link);
functions.Insert("item_old_id", item_old_id);
functions.Insert("item_old_subject", item_old_subject);
functions.Insert("item_old_subject_noescape", item_old_subject_noescape);
functions.Insert("item_old_content", item_old_content);
functions.Insert("item_old_content_noescape", item_old_content_noescape);
functions.Insert("item_old_privileges", item_old_privileges);
functions.Insert("item_old_dir", item_old_dir);
functions.Insert("item_old_url", item_old_url);
functions.Insert("item_old_link", item_old_link);
functions.Insert("item_tab", item_tab);
functions.Insert("item_tab_id", item_tab_id);
functions.Insert("item_tab_subject", item_tab_subject);
functions.Insert("item_tab_subject_noescape", item_tab_subject_noescape);
functions.Insert("item_tab_content", item_tab_content);
functions.Insert("item_tab_content_noescape", item_tab_content_noescape);
functions.Insert("item_tab_privileges", item_tab_privileges);
functions.Insert("item_tab_dir", item_tab_dir);
functions.Insert("item_tab_url", item_tab_url);
functions.Insert("item_tab_link", item_tab_link);
functions.Insert("item_tab", item_tab);
functions.Insert("item_tab_id", item_tab_id);
functions.Insert("item_tab_subject", item_tab_subject);
functions.Insert("item_tab_subject_noescape", item_tab_subject_noescape);
functions.Insert("item_tab_content", item_tab_content);
functions.Insert("item_tab_content_noescape", item_tab_content_noescape);
functions.Insert("item_tab_privileges", item_tab_privileges);
functions.Insert("item_tab_dir", item_tab_dir);
functions.Insert("item_tab_url", item_tab_url);
functions.Insert("item_tab_link", item_tab_link);
functions.Insert("item_tab_can_read", item_tab_can_read);
functions.Insert("item_tab_info", item_tab_info);
functions.Insert("item_tab_user", item_tab_user);
functions.Insert("item_tab_date_creation", item_tab_date_creation);
functions.Insert("item_tab_date_modification", item_tab_date_modification);
functions.Insert("item_tab_dates_equal", item_tab_dates_equal);
functions.Insert("item_tab_run", item_tab_run);
/*
@@ -401,6 +408,9 @@ void Templates::Read()
pat_item_info.Directory(data.templates);
pat_item_info.ParseFile("item_info.html");
pat_item_tab_info.Directory(data.templates);
pat_item_tab_info.ParseFile("item_tab_info.html");
pat_fun_thread.Directory(data.templates);
pat_fun_thread.ParseFile("fun_thread.html");

8
templates/templates.h
View File

@@ -41,6 +41,7 @@ namespace TemplatesFunctions
extern PatternCacher pattern_cacher;
extern Ezc::Functions functions;
extern Ezc::Pattern pat_item_info;
extern Ezc::Pattern pat_item_tab_info;
/*
sys
@@ -104,6 +105,13 @@ namespace TemplatesFunctions
void item_tab_dir(Info & i);
void item_tab_url(Info & i);
void item_tab_link(Info & i);
void item_tab_can_read(Info & i);
void item_tab_info(Info & i);
void item_tab_user(Info & i);
void item_tab_date_creation(Info & i);
void item_tab_date_modification(Info & i);
void item_tab_dates_equal(Info & i);
void item_tab_run(Info & i);
/*

6
templates/thread.cpp
View File

@@ -16,11 +16,7 @@ namespace TemplatesFunctions
void thread_subject(Info & i)
{
// !! jesli bedzie podzial na strony (np page:2) to bedzie trzeba w inny sposob ustalac tytul dla calego watku
if( !request.item_table.empty() )
HtmlEscape(i.out, request.item_table[0].subject);
HtmlEscape(i.out, request.thread.subject);
}