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

updated: to the new Ezc API

Browse Source 
git-svn-id: svn://ttmath.org/publicrep/winix/trunk@983 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2014-10-28 19:14:46 +00:00
parent 4fda06b547
commit 1100cf75d7
20 changed files with 933 additions and 957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/menu/Makefile.dep
View File

@@ -32,10 +32,9 @@ cache.o: ../../../winix/notify/notify.h ../../../winix/notify/notifypool.h
cache.o: ../../../winix/templates/patterns.h
cache.o: ../../../winix/templates/locale.h
cache.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h
cache.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h
cache.o: ../../../ezc/src/blocks.h ../../../ezc/src/pattern.h
cache.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
cache.o: ../../../ezc/src/patternparser.h
cache.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
cache.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
cache.o: ../../../ezc/src/funinfo.h ../../../ezc/src/patternparser.h
cache.o: ../../../winix/notify/notifythread.h
cache.o: ../../../winix/core/basethread.h ../../../winix/core/synchro.h
cache.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/config.h
@@ -76,11 +75,11 @@ init.o: ../../../winix/core/ugcontainer.h ../../../winix/notify/notify.h
init.o: ../../../winix/notify/notifypool.h
init.o: ../../../winix/templates/patterns.h ../../../winix/templates/locale.h
init.o: ../../../winix/templates/localefilter.h ../../../ezc/src/ezc.h
init.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h
init.o: ../../../ezc/src/blocks.h cache.h ../../../winix/core/dirs.h
init.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/patternparser.h
init.o: ../../../winix/notify/notifythread.h ../../../winix/core/basethread.h
init.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h cache.h
init.o: ../../../winix/core/dirs.h ../../../ezc/src/pattern.h
init.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
init.o: ../../../ezc/src/patternparser.h ../../../winix/notify/notifythread.h
init.o: ../../../winix/core/basethread.h
init.o: ../../../winix/notify/templatesnotify.h ../../../winix/core/config.h
init.o: ../../../winix/core/users.h ../../../winix/core/ugcontainer.h
init.o: ../../../winix/core/lastcontainer.h ../../../winix/core/mounts.h
@@ -126,9 +125,9 @@ init.o: ../../../winix/templates/changepatterns.h
init.o: ../../../winix/templates/htmltextstream.h
init.o: ../../../winix/core/sessionmanager.h
templates.o: ../../../winix/templates/templates.h ../../../ezc/src/ezc.h
templates.o: ../../../ezc/src/generator.h ../../../ezc/src/vars.h
templates.o: ../../../ezc/src/blocks.h ../../../winix/core/item.h cache.h
templates.o: ../../../winix/core/item.h ../../../pikotools/space/space.h
templates.o: ../../../ezc/src/generator.h ../../../ezc/src/blocks.h
templates.o: ../../../winix/core/item.h cache.h ../../../winix/core/item.h
templates.o: ../../../pikotools/space/space.h
templates.o: ../../../pikotools/textstream/types.h
templates.o: ../../../pikotools/date/date.h ../../../winix/core/dirs.h
templates.o: ../../../winix/core/dircontainer.h ../../../winix/db/db.h

14
plugins/menu/templates.cpp
View File

@@ -240,19 +240,19 @@ void menu_dir_init(Info & i)
bool with_meta = false;
if( i.params.size() >= 2 )
param = string_to_param(i.params[1]);
param = string_to_param(i.params[1].str);
if( i.params.size() >=3 && i.params[2] == L"withmeta" )
if( i.params.size() >=3 && i.params[2].str == L"withmeta" )
with_meta = true;
if( i.params.empty() || i.params[0].empty() )
if( i.params.empty() || i.params[0].str.empty() )
{
menu_dir_init(i, cur->request->dir_tab.back()->id, param, with_meta);
}
else
if( !i.params.empty() )
{
if( i.params[0] == L"current" )
if( i.params[0].str == L"current" )
{
if( stack->fun_data )
{
@@ -263,19 +263,19 @@ void menu_dir_init(Info & i)
}
}
else
if( i.params[0] == L"this" )
if( i.params[0].str == L"this" )
{
menu_dir_init(i, cur->request->dir_tab.back()->id, param, with_meta);
}
else
if( !i.params[0].empty() && i.params[0][0] != '/' )
if( !i.params[0].str.empty() && i.params[0].str[0] != '/' )
{
log << log1 << "Menu: path for a menu should not be relative" << logend;
return;
}
else
{
menu_dir_init(i, i.params[0], param, with_meta);
menu_dir_init(i, i.params[0].str, param, with_meta);
}
}
}