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

fixed: Config::Text() returned a reference to a local variable (std::string)

Browse Source 
added: 'static' directory with *.css and images
       we have a default layout
moved: locale from data to templates       
       notification templates have its own locale object
added: reload function reloades locale now too
added: 'nice' form of item_info in templates



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@582 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2010-02-15 00:31:14 +00:00
parent c58031cbf4
commit fa8d8f9ea0
38 changed files with 678 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
templates/Makefile.dep
View File

@@ -11,8 +11,7 @@ dir.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
dir.o: ../core/data.h ../core/dirs.h ../core/dircontainer.h ../core/users.h
dir.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h
dir.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
dir.o: ../core/mount.h ../core/locale.h ../core/loadavg.h ../core/db.h
dir.o: ../core/misc.h
dir.o: ../core/mount.h ../core/loadavg.h ../core/db.h ../core/misc.h
doc.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
doc.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
doc.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h ../core/dirs.h
@@ -20,11 +19,11 @@ doc.o: ../core/item.h ../core/dircontainer.h ../core/users.h ../core/user.h
doc.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h
doc.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
doc.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
doc.o: ../core/locale.h ../core/loadavg.h ../core/request.h
doc.o: ../core/requesttypes.h ../core/session.h ../core/done.h
doc.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
doc.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
doc.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
doc.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
doc.o: ../core/session.h ../core/done.h ../core/thread.h ../core/compress.h
doc.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
doc.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
doc.o: ../core/misc.h
done.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
done.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
done.o: ../core/httpsimpleparser.h ../core/log.h ../core/request.h
@@ -41,12 +40,11 @@ item.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h
item.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
item.o: ../core/group.h ../core/functions.h ../core/function.h
item.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
item.o: ../core/error.h ../core/rebus.h ../core/locale.h ../core/loadavg.h
item.o: ../core/request.h ../core/requesttypes.h ../core/session.h
item.o: ../core/done.h ../core/thread.h ../core/compress.h
item.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
item.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
item.o: ../core/misc.h
item.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h
item.o: ../core/requesttypes.h ../core/session.h ../core/done.h
item.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
item.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
item.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
last.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
last.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
last.o: ../core/httpsimpleparser.h ../core/log.h ../core/lastcontainer.h
@@ -54,9 +52,9 @@ last.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
last.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
last.o: ../core/groups.h ../core/group.h ../core/functions.h
last.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
last.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/locale.h
last.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
last.o: ../core/session.h ../core/done.h ../core/thread.h ../core/compress.h
last.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
last.o: ../core/request.h ../core/requesttypes.h ../core/session.h
last.o: ../core/done.h ../core/thread.h ../core/compress.h
last.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
last.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
last.o: ../core/misc.h
@@ -74,9 +72,9 @@ misc.o: ../core/data.h ../core/dirs.h ../core/item.h ../core/dircontainer.h
misc.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
misc.o: ../core/groups.h ../core/group.h ../core/functions.h
misc.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
misc.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/locale.h
misc.o: ../core/loadavg.h ../core/misc.h misc.h localefilter.h
misc.o: ../core/locale.h ../confparser/confparser.h
misc.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
misc.o: ../core/misc.h misc.h localefilter.h ../core/locale.h
misc.o: ../confparser/confparser.h
mount.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
mount.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
mount.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
@@ -84,14 +82,14 @@ mount.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h
mount.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
mount.o: ../core/group.h ../core/functions.h ../core/function.h
mount.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
mount.o: ../core/error.h ../core/rebus.h ../core/locale.h ../core/loadavg.h
mount.o: ../core/error.h ../core/rebus.h ../core/loadavg.h
patterncacher.o: patterncacher.h ../core/item.h ../core/data.h ../core/dirs.h
patterncacher.o: ../core/item.h ../core/dircontainer.h ../core/users.h
patterncacher.o: ../core/user.h ../core/ugcontainer.h ../core/log.h
patterncacher.o: ../core/groups.h ../core/group.h ../core/functions.h
patterncacher.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
patterncacher.o: ../core/mount.h ../core/error.h ../core/rebus.h
patterncacher.o: ../core/locale.h ../core/loadavg.h ../core/log.h
patterncacher.o: ../core/loadavg.h ../core/log.h
priv.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
priv.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
priv.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
@@ -99,12 +97,11 @@ priv.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h
priv.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
priv.o: ../core/group.h ../core/functions.h ../core/function.h
priv.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
priv.o: ../core/error.h ../core/rebus.h ../core/locale.h ../core/loadavg.h
priv.o: ../core/request.h ../core/requesttypes.h ../core/session.h
priv.o: ../core/done.h ../core/thread.h ../core/compress.h
priv.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
priv.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
priv.o: ../core/misc.h
priv.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h
priv.o: ../core/requesttypes.h ../core/session.h ../core/done.h
priv.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
priv.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
priv.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
rebus.o: ../core/request.h ../core/requesttypes.h ../core/session.h
rebus.o: ../core/done.h ../core/item.h ../core/error.h ../core/log.h
rebus.o: ../core/user.h ../core/rebus.h ../core/function.h ../core/thread.h
@@ -114,9 +111,9 @@ rebus.o: ../core/postmultiparser.h ../core/ticket.h ../core/data.h
rebus.o: ../core/dirs.h ../core/dircontainer.h ../core/users.h
rebus.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h
rebus.o: ../core/functions.h ../core/lastcontainer.h ../core/mounts.h
rebus.o: ../core/mount.h ../core/locale.h ../core/loadavg.h templates.h
rebus.o: patterncacher.h ../core/item.h misc.h localefilter.h
rebus.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
rebus.o: ../core/mount.h ../core/loadavg.h templates.h patterncacher.h
rebus.o: ../core/item.h misc.h localefilter.h ../core/locale.h
rebus.o: ../confparser/confparser.h ckeditorgetparser.h
rebus.o: ../core/httpsimpleparser.h ../core/log.h
sys.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
sys.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
@@ -125,11 +122,11 @@ sys.o: ../core/item.h ../core/dircontainer.h ../core/users.h ../core/user.h
sys.o: ../core/ugcontainer.h ../core/log.h ../core/groups.h ../core/group.h
sys.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
sys.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
sys.o: ../core/locale.h ../core/loadavg.h ../core/request.h
sys.o: ../core/requesttypes.h ../core/session.h ../core/done.h
sys.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
sys.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
sys.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
sys.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
sys.o: ../core/session.h ../core/done.h ../core/thread.h ../core/compress.h
sys.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
sys.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
sys.o: ../core/misc.h
templates.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
templates.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
templates.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
@@ -138,12 +135,12 @@ templates.o: ../core/users.h ../core/user.h ../core/ugcontainer.h
templates.o: ../core/log.h ../core/groups.h ../core/group.h
templates.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
templates.o: ../core/mounts.h ../core/mount.h ../core/error.h ../core/rebus.h
templates.o: ../core/locale.h ../core/loadavg.h ../core/request.h
templates.o: ../core/requesttypes.h ../core/session.h ../core/done.h
templates.o: ../core/thread.h ../core/compress.h
templates.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
templates.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
templates.o: ../core/misc.h ../core/plugin.h ../core/request.h ../core/data.h
templates.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
templates.o: ../core/session.h ../core/done.h ../core/thread.h
templates.o: ../core/compress.h ../core/acceptencodingparser.h
templates.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
templates.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
templates.o: ../core/plugin.h ../core/request.h ../core/data.h
templates.o: ../core/pluginmsg.h
thread.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
thread.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
@@ -152,12 +149,12 @@ thread.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h
thread.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
thread.o: ../core/groups.h ../core/group.h ../core/functions.h
thread.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
thread.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/locale.h
thread.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
thread.o: ../core/session.h ../core/done.h ../core/thread.h
thread.o: ../core/compress.h ../core/acceptencodingparser.h
thread.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
thread.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
thread.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
thread.o: ../core/request.h ../core/requesttypes.h ../core/session.h
thread.o: ../core/done.h ../core/thread.h ../core/compress.h
thread.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
thread.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
thread.o: ../core/misc.h
ticket.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
ticket.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
ticket.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
@@ -165,12 +162,12 @@ ticket.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h
ticket.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
ticket.o: ../core/groups.h ../core/group.h ../core/functions.h
ticket.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
ticket.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/locale.h
ticket.o: ../core/loadavg.h ../core/request.h ../core/requesttypes.h
ticket.o: ../core/session.h ../core/done.h ../core/thread.h
ticket.o: ../core/compress.h ../core/acceptencodingparser.h
ticket.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
ticket.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
ticket.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
ticket.o: ../core/request.h ../core/requesttypes.h ../core/session.h
ticket.o: ../core/done.h ../core/thread.h ../core/compress.h
ticket.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
ticket.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
ticket.o: ../core/misc.h
uptime.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
uptime.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
uptime.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
@@ -178,8 +175,7 @@ uptime.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h
uptime.o: ../core/users.h ../core/user.h ../core/ugcontainer.h ../core/log.h
uptime.o: ../core/groups.h ../core/group.h ../core/functions.h
uptime.o: ../core/function.h ../core/lastcontainer.h ../core/mounts.h
uptime.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/locale.h
uptime.o: ../core/loadavg.h
uptime.o: ../core/mount.h ../core/error.h ../core/rebus.h ../core/loadavg.h
user.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
user.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
user.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
@@ -187,12 +183,11 @@ user.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h
user.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
user.o: ../core/group.h ../core/functions.h ../core/function.h
user.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
user.o: ../core/error.h ../core/rebus.h ../core/locale.h ../core/loadavg.h
user.o: ../core/request.h ../core/requesttypes.h ../core/session.h
user.o: ../core/done.h ../core/thread.h ../core/compress.h
user.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
user.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
user.o: ../core/misc.h
user.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h
user.o: ../core/requesttypes.h ../core/session.h ../core/done.h
user.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
user.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
user.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
who.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
who.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
who.o: ../core/httpsimpleparser.h ../core/log.h ../core/sessioncontainer.h
@@ -205,11 +200,10 @@ who.o: ../core/functionparser.h ../core/requesttypes.h ../core/data.h
who.o: ../core/dirs.h ../core/dircontainer.h ../core/users.h
who.o: ../core/ugcontainer.h ../core/groups.h ../core/group.h
who.o: ../core/functions.h ../core/function.h ../core/lastcontainer.h
who.o: ../core/mounts.h ../core/mount.h ../core/locale.h ../core/loadavg.h
who.o: ../core/request.h ../core/thread.h ../core/compress.h
who.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
who.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
who.o: ../core/misc.h
who.o: ../core/mounts.h ../core/mount.h ../core/loadavg.h ../core/request.h
who.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
who.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
who.o: ../core/postmultiparser.h ../core/ticket.h ../core/misc.h
winix.o: templates.h patterncacher.h ../core/item.h misc.h localefilter.h
winix.o: ../core/locale.h ../confparser/confparser.h ckeditorgetparser.h
winix.o: ../core/httpsimpleparser.h ../core/log.h ../core/data.h
@@ -217,8 +211,8 @@ winix.o: ../core/dirs.h ../core/item.h ../core/dircontainer.h ../core/users.h
winix.o: ../core/user.h ../core/ugcontainer.h ../core/log.h ../core/groups.h
winix.o: ../core/group.h ../core/functions.h ../core/function.h
winix.o: ../core/lastcontainer.h ../core/mounts.h ../core/mount.h
winix.o: ../core/error.h ../core/rebus.h ../core/locale.h ../core/loadavg.h
winix.o: ../core/request.h ../core/requesttypes.h ../core/session.h
winix.o: ../core/done.h ../core/thread.h ../core/compress.h
winix.o: ../core/acceptencodingparser.h ../core/acceptbaseparser.h
winix.o: ../core/htmlfilter.h ../core/postmultiparser.h ../core/ticket.h
winix.o: ../core/error.h ../core/rebus.h ../core/loadavg.h ../core/request.h
winix.o: ../core/requesttypes.h ../core/session.h ../core/done.h
winix.o: ../core/thread.h ../core/compress.h ../core/acceptencodingparser.h
winix.o: ../core/acceptbaseparser.h ../core/htmlfilter.h
winix.o: ../core/postmultiparser.h ../core/ticket.h

4
templates/dir.cpp
View File

@@ -228,10 +228,10 @@ void dir_last_subject(Info & i)
void dir_last_info(Info & i)
{
if( static_cast<size_t>(data.locale.GetLang()) >= patterns.size() )
if( static_cast<size_t>(locale.GetLang()) >= patterns.size() )
return;
Ezc::Generator gen(i.out, patterns[data.locale.GetLang()][pat_dir_last_info], functions);
Ezc::Generator gen(i.out, patterns[locale.GetLang()][pat_dir_last_info], functions);
gen.Generate();
}

10
templates/doc.cpp
View File

@@ -24,18 +24,20 @@ namespace TemplatesFunctions
void doc_title(Info & i)
{
size_t a = 0;
size_t a;
// from 1 means skipping the root directory
for(a = 1 ; a<request.dir_table.size() ; ++a)
{
i.out << " / ";
HtmlEscape(i.out, request.dir_table[a]->subject);
if( a < request.dir_table.size()-1 )
i.out << data.title_separator;
}
if( request.is_item )
{
i.out << " / ";
i.out << data.title_separator;
HtmlEscape(i.out, request.item.subject);
}
}

47
templates/item.cpp
View File

@@ -8,6 +8,7 @@
*/
#include "templates.h"
#include "misc.h"
#include "../core/data.h"
#include "../core/request.h"
#include "../core/misc.h"
@@ -150,8 +151,8 @@ void item_url(Info & i)
void item_url_is(Info & i)
{
if( !request.is_item || !i.is )
return; // default false
if( !request.is_item || !i.is )
return; // default false
i.result = request.item.url == *i.is;
}
@@ -211,10 +212,10 @@ void item_can_remove(Info & i)
void item_info(Info & i)
{
if( static_cast<size_t>(data.locale.GetLang()) >= patterns.size() )
if( static_cast<size_t>(locale.GetLang()) >= patterns.size() )
return;
Ezc::Generator gen(i.out, patterns[data.locale.GetLang()][pat_item_info], functions);
Ezc::Generator gen(i.out, patterns[locale.GetLang()][pat_item_info], functions);
gen.Generate();
}
@@ -253,6 +254,20 @@ void item_date_modification(Info & i)
}
void item_date_creation_nice(Info & i)
{
tm * ptm = &request.item.date_creation;
TemplatesMisc::print_date_nice(i, ptm);
}
void item_date_modification_nice(Info & i)
{
tm * ptm = &request.item.date_modification;
TemplatesMisc::print_date_nice(i, ptm);
}
void item_dates_equal(Info & i)
{
tm * ptm1 = &request.item.date_creation;
@@ -483,10 +498,10 @@ void item_tab_can_read(Info & i)
void item_tab_info(Info & i)
{
if( static_cast<size_t>(data.locale.GetLang()) >= patterns.size() )
if( static_cast<size_t>(locale.GetLang()) >= patterns.size() )
return;
Ezc::Generator gen(i.out, patterns[data.locale.GetLang()][pat_item_tab_info], functions);
Ezc::Generator gen(i.out, patterns[locale.GetLang()][pat_item_tab_info], functions);
gen.Generate();
}
@@ -534,6 +549,26 @@ void item_tab_date_modification(Info & i)
}
void item_tab_date_creation_nice(Info & i)
{
if( item_index < request.item_table.size() )
{
tm * ptm = &request.item_table[item_index].date_creation;
TemplatesMisc::print_date_nice(i, ptm);
}
}
void item_tab_date_modification_nice(Info & i)
{
if( item_index < request.item_table.size() )
{
tm * ptm = &request.item_table[item_index].date_modification;
TemplatesMisc::print_date_nice(i, ptm);
}
}
void item_tab_dates_equal(Info & i)
{
if( item_index < request.item_table.size() )

53
templates/misc.cpp
View File

@@ -16,14 +16,34 @@
namespace TemplatesMisc
{
void print_date_nice(Ezc::Info & i, tm * ptm)
{
time_t t = mktime(ptm);
time_t now = time(0);
time_t one_day = 60 * 60 * 24;
if( t + one_day > now )
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
else
i.out << DateToStr(ptm->tm_year + 1900, ptm->tm_mon + 1, ptm->tm_mday);
}
// those functions from here are used in the second thread too
void Read(Patterns & patterns, size_t pat, LocaleFilter & locale_filter, const std::string & dir, const char * file, bool delete_white)
void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & locale_filter, const char * file, bool delete_white)
{
size_t i;
size_t len = patterns.size();
Locale::Lang old_lang = data.locale.GetLang();
Locale::Lang old_lang = locale.GetLang();
for(i=0 ; i<len ; ++i)
@@ -31,38 +51,27 @@ void Read(Patterns & patterns, size_t pat, LocaleFilter & locale_filter, const s
if( pat < patterns[i].size() )
{
patterns[i][pat].delete_all_white = delete_white;
patterns[i][pat].Directory(dir);
patterns[i][pat].Directory(data.templates_dir, data.templates_dir_default);
patterns[i][pat].ParseFile(file);
Locale::Lang new_lang = static_cast<Locale::Lang>(i);
data.locale.SetLang(new_lang);
locale.SetLang(new_lang);
locale_filter.Filter(patterns[i][pat], data.locale);
log << "Read pattern: " << dir << "/" << file << " for lang: " << data.locale.LangToStr(new_lang) << logend;
locale_filter.Filter(patterns[i][pat], locale);
}
}
data.locale.SetLang(old_lang);
}
locale.SetLang(old_lang);
void Read(Patterns & patterns, size_t pat, LocaleFilter & locale_filter, const char * file, bool delete_white)
{
std::string temp = data.templates_dir;
temp += '/';
temp += file;
if( IsFile(temp) )
{
Read(patterns, pat, locale_filter, data.templates_dir, file, delete_white);
}
else
{
Read(patterns, pat, locale_filter, data.templates_dir_default, file, delete_white);
}
}

8
templates/misc.h
View File

@@ -21,15 +21,17 @@
namespace TemplatesMisc
{
// table: [language][file]
typedef std::vector<std::vector<Ezc::Pattern> > Patterns;
void print_date_nice(Ezc::Info & i, tm * ptm);
// those functions from here are used in the second thread too
void Read(Patterns & patterns, size_t pat, LocaleFilter & locale_filter, const std::string & dir, const char * file, bool delete_white = false);
void Read(Patterns & patterns, size_t pat, LocaleFilter & locale_filter, const char * file, bool delete_white = false);
void Read(Patterns & patterns, size_t pat, Locale & locale, LocaleFilter & locale_filter, const char * file, bool delete_white = false);
void ClearPatterns(Patterns & patterns, size_t len);

104
templates/templates.cpp
View File

@@ -21,6 +21,7 @@ namespace TemplatesFunctions
TemplatesMisc::Patterns patterns;
Ezc::Functions functions;
PatternCacher pattern_cacher;
Locale locale;
LocaleFilter locale_filter;
CKEditorGetParser ckeditor_getparser;
@@ -74,8 +75,8 @@ Ezc::Pattern * p = 0;
{
if( pat_name_tab[i].fun_code == request.pfunction->code )
{
// !! data.locale.GetLang() bedzie brane indywidualnie dla kazdego uzytkownika
p = &patterns[data.locale.GetLang()][pat_name_tab[i].pat];
// !! locale.GetLang() bedzie brane indywidualnie dla kazdego uzytkownika
p = &patterns[locale.GetLang()][pat_name_tab[i].pat];
break;
}
}
@@ -89,7 +90,7 @@ void content(Info & i)
{
Ezc::Pattern * p = 0;
if( static_cast<size_t>(data.locale.GetLang()) >= patterns.size() )
if( static_cast<size_t>(locale.GetLang()) >= patterns.size() )
{
log << log1 << "Templates: there is no such a language in patterns" << logend;
return;
@@ -112,20 +113,20 @@ Ezc::Pattern * p = 0;
case Error::cant_change_user:
case Error::cant_change_group:
case Error::cant_change_privileges:
// !! data.locale.GetLang() bedzie brane indywidualnie dla kazdego uzytkownika
p = &patterns[data.locale.GetLang()][pat_err_per_denied];
// !! locale.GetLang() bedzie brane indywidualnie dla kazdego uzytkownika
p = &patterns[locale.GetLang()][pat_err_per_denied];
break;
case Error::no_item:
case Error::no_function:
case Error::unknown_param:
// !! data.locale.GetLang() bedzie brane indywidualnie dla kazdego uzytkownika
p = &patterns[data.locale.GetLang()][pat_err_404];
// !! locale.GetLang() bedzie brane indywidualnie dla kazdego uzytkownika
p = &patterns[locale.GetLang()][pat_err_404];
break;
default:
// !! data.locale.GetLang() bedzie brane indywidualnie dla kazdego uzytkownika
p = &patterns[data.locale.GetLang()][pat_err_others];
// !! locale.GetLang() bedzie brane indywidualnie dla kazdego uzytkownika
p = &patterns[locale.GetLang()][pat_err_others];
break;
}
@@ -207,6 +208,8 @@ void Templates::CreateFunctions()
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_date_creation_nice", item_date_creation_nice);
functions.Insert("item_date_modification_nice",item_date_modification_nice);
functions.Insert("item_dates_equal", item_dates_equal);
functions.Insert("item_run", item_run);
functions.Insert("item_guest_name", item_guest_name);
@@ -238,6 +241,8 @@ void Templates::CreateFunctions()
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_date_creation_nice", item_tab_date_creation_nice);
functions.Insert("item_tab_date_modification_nice", item_tab_date_modification_nice);
functions.Insert("item_tab_dates_equal", item_tab_dates_equal);
functions.Insert("item_tab_run", item_tab_run);
@@ -359,6 +364,7 @@ void Templates::CreateFunctions()
functions.Insert("thread_tab_author", thread_tab_author);
functions.Insert("thread_tab_answers", thread_tab_answers);
functions.Insert("thread_tab_last_item_date_modification", thread_tab_last_item_date_modification);
functions.Insert("thread_tab_last_item_date_modification_nice", thread_tab_last_item_date_modification_nice);
functions.Insert("thread_tab_last_item_user", thread_tab_last_item_user);
functions.Insert("thread_can_create", thread_can_create);
@@ -467,45 +473,59 @@ void Templates::CreateFunctions()
void Templates::ReadFile(TemplatesFunctions::Pat pat, const char * file)
{
using namespace TemplatesFunctions;
TemplatesMisc::Read(patterns, static_cast<size_t>(pat), locale, locale_filter, file);
}
void Templates::ReadTemplates()
{
using namespace TemplatesFunctions;
using namespace TemplatesMisc;
Locale::Lang lang = Locale::StrToLang(data.locale_str);
if( lang != Locale::lang_unknown )
locale.SetLang(lang);
else
locale.SetLang(Locale::lang_en);
locale.Read(data.locale_dir, data.locale_dir_default);
ClearPatterns();
Read(patterns, pat_index, locale_filter, "index.html");
Read(patterns, pat_err_404, locale_filter, "err_404.html");
Read(patterns, pat_err_per_denied, locale_filter, "err_per_denied.html");
Read(patterns, pat_fun_cat, locale_filter, "fun_cat.html");
Read(patterns, pat_fun_ls, locale_filter, "fun_ls.html");
Read(patterns, pat_fun_rm, locale_filter, "fun_rm.html");
Read(patterns, pat_fun_emacs, locale_filter, "fun_emacs.html");
Read(patterns, pat_fun_mkdir, locale_filter, "fun_mkdir.html");
Read(patterns, pat_fun_default, locale_filter, "fun_default.html");
Read(patterns, pat_fun_priv, locale_filter, "fun_priv.html");
Read(patterns, pat_err_others, locale_filter, "err_others.html");
Read(patterns, pat_fun_who, locale_filter, "fun_who.html");
Read(patterns, pat_fun_run, locale_filter, "fun_run.html");
Read(patterns, pat_fun_last, locale_filter, "fun_last.html");
Read(patterns, pat_item_info, locale_filter, "item_info.html");
Read(patterns, pat_item_tab_info, locale_filter, "item_tab_info.html");
Read(patterns, pat_fun_thread, locale_filter, "fun_thread.html");
Read(patterns, pat_fun_createthread,locale_filter, "fun_createthread.html");
Read(patterns, pat_dir_last_info, locale_filter, "dir_last_info.html");
Read(patterns, pat_fun_reload, locale_filter, "fun_reload.html");
Read(patterns, pat_fun_upload, locale_filter, "fun_upload.html");
Read(patterns, pat_fun_ticket, locale_filter, "fun_ticket.html");
Read(patterns, pat_fun_createticket,locale_filter, "fun_createticket.html");
Read(patterns, pat_fun_uptime, locale_filter, "fun_uptime.html");
Read(patterns, pat_fun_login, locale_filter, "fun_login.html");
/*Read(patterns, pat_fun_mv, locale_filter, "fun_mv.html");
Read(patterns, pat_fun_uname, locale_filter, "fun_uname.html");
Read(patterns, pat_fun_chmod, locale_filter, "fun_chmod.html");
Read(patterns, pat_fun_chown, locale_filter, "fun_chown.html"); */
Read(patterns, pat_fun_ckeditor, locale_filter, "fun_ckeditor.html");
ReadFile(pat_index, "index.html");
ReadFile(pat_err_404, "err_404.html");
ReadFile(pat_err_per_denied, "err_per_denied.html");
ReadFile(pat_fun_cat, "fun_cat.html");
ReadFile(pat_fun_ls, "fun_ls.html");
ReadFile(pat_fun_rm, "fun_rm.html");
ReadFile(pat_fun_emacs, "fun_emacs.html");
ReadFile(pat_fun_mkdir, "fun_mkdir.html");
ReadFile(pat_fun_default, "fun_default.html");
ReadFile(pat_fun_priv, "fun_priv.html");
ReadFile(pat_err_others, "err_others.html");
ReadFile(pat_fun_who, "fun_who.html");
ReadFile(pat_fun_run, "fun_run.html");
ReadFile(pat_fun_last, "fun_last.html");
ReadFile(pat_item_info, "item_info.html");
ReadFile(pat_item_tab_info, "item_tab_info.html");
ReadFile(pat_fun_thread, "fun_thread.html");
ReadFile(pat_fun_createthread, "fun_createthread.html");
ReadFile(pat_dir_last_info, "dir_last_info.html");
ReadFile(pat_fun_reload, "fun_reload.html");
ReadFile(pat_fun_upload, "fun_upload.html");
ReadFile(pat_fun_ticket, "fun_ticket.html");
ReadFile(pat_fun_createticket, "fun_createticket.html");
ReadFile(pat_fun_uptime, "fun_uptime.html");
ReadFile(pat_fun_login, "fun_login.html");
/*ReadFile(pat_fun_mv, "fun_mv.html");
ReadFile(pat_fun_uname, "fun_uname.html");
ReadFile(pat_fun_chmod, "fun_chmod.html");
ReadFile(pat_fun_chown, "fun_chown.html"); */
ReadFile(pat_fun_ckeditor, "fun_ckeditor.html");
}
@@ -524,10 +544,10 @@ void Templates::Generate()
using namespace TemplatesFunctions;
// !! locale beda w zaleznosci od uzytkownika
if( static_cast<size_t>(data.locale.GetLang()) >= patterns.size() )
if( static_cast<size_t>(locale.GetLang()) >= patterns.size() )
return;
Ezc::Generator generator(request.page, patterns[data.locale.GetLang()][pat_index], functions);
Ezc::Generator generator(request.page, patterns[locale.GetLang()][pat_index], functions);
generator.Generate();
}

10
templates/templates.h
View File

@@ -16,7 +16,7 @@
#include "patterncacher.h"
#include "misc.h"
#include "ckeditorgetparser.h"
#include "../core/locale.h"
namespace TemplatesFunctions
@@ -68,6 +68,7 @@ namespace TemplatesFunctions
extern TemplatesMisc::Patterns patterns;
extern PatternCacher pattern_cacher;
extern Locale locale;
extern Ezc::Functions functions;
extern CKEditorGetParser ckeditor_getparser;
@@ -122,6 +123,8 @@ namespace TemplatesFunctions
void item_user(Info & i);
void item_date_creation(Info & i);
void item_date_modification(Info & i);
void item_date_creation_nice(Info & i);
void item_date_modification_nice(Info & i);
void item_dates_equal(Info & i);
void item_run(Info & i);
void item_guest_name(Info & i);
@@ -153,6 +156,8 @@ namespace TemplatesFunctions
void item_tab_user(Info & i);
void item_tab_date_creation(Info & i);
void item_tab_date_modification(Info & i);
void item_tab_date_creation_nice(Info & i);
void item_tab_date_modification_nice(Info & i);
void item_tab_dates_equal(Info & i);
void item_tab_run(Info & i);
@@ -267,6 +272,7 @@ namespace TemplatesFunctions
void thread_tab_author(Info & i);
void thread_tab_answers(Info & i);
void thread_tab_last_item_date_modification(Info & i);
void thread_tab_last_item_date_modification_nice(Info & i);
void thread_tab_last_item_user(Info & i);
void thread_can_create(Info & i);
@@ -386,6 +392,8 @@ public:
private:
void ReadFile(TemplatesFunctions::Pat pat, const char * file);
std::string temp;
};

9
templates/thread.cpp
View File

@@ -8,6 +8,7 @@
*/
#include "templates.h"
#include "misc.h"
#include "../core/data.h"
#include "../core/request.h"
#include "../core/misc.h"
@@ -135,6 +136,14 @@ void thread_tab_last_item_date_modification(Info & i)
}
void thread_tab_last_item_date_modification_nice(Info & i)
{
if( thread_tab_index < request.thread_tab.size() )
if( request.thread_tab[thread_tab_index].last_item.id != -1 )
TemplatesMisc::print_date_nice(i, &request.thread_tab[thread_tab_index].last_item.date_modification);
}
void thread_tab_last_item_user(Info & i)
{
if( thread_tab_index < request.thread_tab.size() )

9
templates/winix.cpp
View File

@@ -97,7 +97,7 @@ void winix_req_per_sec_now(Info & i)
{
char buf[20];
sprintf(buf, "%.1f", (double)data.load_avg.ReqPerSecNow());
sprintf(buf, "%.2f", (double)data.load_avg.ReqPerSecNow());
i.out << buf;
}
@@ -106,15 +106,16 @@ void winix_req_per_sec_1(Info & i)
{
char buf[20];
sprintf(buf, "%.1f", (double)data.load_avg.ReqPerSec1());
sprintf(buf, "%.2f", (double)data.load_avg.ReqPerSec1());
i.out << buf;
}
void winix_req_per_sec_5(Info & i)
{
char buf[20];
sprintf(buf, "%.1f", (double)data.load_avg.ReqPerSec5());
sprintf(buf, "%.2f", (double)data.load_avg.ReqPerSec5());
i.out << buf;
}
@@ -123,7 +124,7 @@ void winix_req_per_sec_15(Info & i)
{
char buf[20];
sprintf(buf, "%.1f", (double)data.load_avg.ReqPerSec15());
sprintf(buf, "%.2f", (double)data.load_avg.ReqPerSec15());
i.out << buf;
}