commit f981fb9db1bebdc5ea01dc557fb82f05f57c2eff
Author: Jan Dankert
Date: Sat May 16 01:08:40 2020 +0200
Refactoring: Switching the ValueExpressions in the templates to the new VariableResolver for supporting nested variables like ${message:prefix_${key}}.
modules/cms/Dispatcher.class.php | 2 +
modules/cms/base/functions/language.inc.php | 4 +
.../default/html/views/configuration/show.php | 32 +-
.../html/views/configuration/show.tpl.src.xml | 8 +-
.../default/html/views/configuration/src.php | 2 +-
.../themes/default/html/views/element/advanced.php | 304 +++++++--------
.../html/views/element/advanced.tpl.src.xml | 58 +--
.../ui/themes/default/html/views/element/info.php | 44 +--
.../default/html/views/element/info.tpl.src.xml | 12 +-
.../ui/themes/default/html/views/element/name.php | 44 +--
.../default/html/views/element/name.tpl.src.xml | 4 +-
.../ui/themes/default/html/views/element/prop.php | 72 ++--
.../default/html/views/element/prop.tpl.src.xml | 8 +-
.../default/html/views/element/properties.php | 280 +++++++-------
.../html/views/element/properties.tpl.src.xml | 52 +--
.../themes/default/html/views/element/remove.php | 80 ++--
.../default/html/views/element/remove.tpl.src.xml | 16 +-
.../ui/themes/default/html/views/file/advanced.php | 32 +-
.../ui/themes/default/html/views/file/compress.php | 60 +--
.../default/html/views/file/compress.tpl.src.xml | 8 +-
.../cms/ui/themes/default/html/views/file/edit.php | 40 +-
.../ui/themes/default/html/views/file/extract.php | 22 +-
.../default/html/views/file/extract.tpl.src.xml | 16 +-
.../cms/ui/themes/default/html/views/file/info.php | 230 +++++------
.../default/html/views/file/info.tpl.src.xml | 58 +--
.../ui/themes/default/html/views/file/preview.php | 6 +-
.../default/html/views/file/preview.tpl.src.xml | 2 +-
.../cms/ui/themes/default/html/views/file/pub.php | 32 +-
.../themes/default/html/views/file/pub.tpl.src.xml | 6 +-
.../ui/themes/default/html/views/file/remove.php | 30 +-
.../default/html/views/file/remove.tpl.src.xml | 2 +-
.../cms/ui/themes/default/html/views/file/show.php | 2 +-
.../themes/default/html/views/file/structure.php | 4 +-
.../themes/default/html/views/file/uncompress.php | 52 +--
.../default/html/views/file/uncompress.tpl.src.xml | 6 +-
.../ui/themes/default/html/views/file/value.php | 32 +-
.../default/html/views/file/value.tpl.src.xml | 2 +-
.../themes/default/html/views/folder/advanced.php | 138 +++----
.../default/html/views/folder/advanced.tpl.src.xml | 38 +-
.../themes/default/html/views/folder/content.php | 96 ++---
.../default/html/views/folder/content.tpl.src.xml | 28 +-
.../ui/themes/default/html/views/folder/create.php | 44 +--
.../default/html/views/folder/create.tpl.src.xml | 14 +-
.../default/html/views/folder/createfile.php | 94 ++---
.../html/views/folder/createfile.tpl.src.xml | 12 +-
.../default/html/views/folder/createfolder.php | 42 +-
.../html/views/folder/createfolder.tpl.src.xml | 6 +-
.../default/html/views/folder/createimage.php | 94 ++---
.../html/views/folder/createimage.tpl.src.xml | 12 +-
.../default/html/views/folder/createlink.php | 46 +--
.../html/views/folder/createlink.tpl.src.xml | 4 +-
.../default/html/views/folder/createpage.php | 52 +--
.../html/views/folder/createpage.tpl.src.xml | 6 +-
.../default/html/views/folder/createtext.php | 92 ++---
.../html/views/folder/createtext.tpl.src.xml | 12 +-
.../themes/default/html/views/folder/createurl.php | 58 +--
.../html/views/folder/createurl.tpl.src.xml | 6 +-
.../ui/themes/default/html/views/folder/edit.php | 70 ++--
.../default/html/views/folder/edit.tpl.src.xml | 18 +-
.../themes/default/html/views/folder/inherit.php | 48 +--
.../default/html/views/folder/inherit.tpl.src.xml | 4 +-
.../ui/themes/default/html/views/folder/order.php | 76 ++--
.../default/html/views/folder/order.tpl.src.xml | 18 +-
.../ui/themes/default/html/views/folder/pub.php | 88 ++---
.../default/html/views/folder/pub.tpl.src.xml | 24 +-
.../ui/themes/default/html/views/folder/remove.php | 36 +-
.../default/html/views/folder/remove.tpl.src.xml | 4 +-
.../ui/themes/default/html/views/folder/show.php | 66 ++--
.../default/html/views/folder/show.tpl.src.xml | 20 +-
.../themes/default/html/views/folder/structure.php | 4 +-
.../cms/ui/themes/default/html/views/group/add.php | 30 +-
.../ui/themes/default/html/views/group/info.php | 58 +--
.../default/html/views/group/info.tpl.src.xml | 14 +-
.../default/html/views/group/memberships.php | 56 +--
.../html/views/group/memberships.tpl.src.xml | 6 +-
.../ui/themes/default/html/views/group/prop.php | 32 +-
.../default/html/views/group/prop.tpl.src.xml | 2 +-
.../ui/themes/default/html/views/group/remove.php | 50 +--
.../default/html/views/group/remove.tpl.src.xml | 4 +-
.../ui/themes/default/html/views/group/rights.php | 92 ++---
.../default/html/views/group/rights.tpl.src.xml | 30 +-
.../ui/themes/default/html/views/grouplist/add.php | 30 +-
.../themes/default/html/views/grouplist/show.php | 38 +-
.../default/html/views/grouplist/show.tpl.src.xml | 10 +-
.../themes/default/html/views/image/compress.php | 60 +--
.../default/html/views/image/compress.tpl.src.xml | 8 +-
.../ui/themes/default/html/views/image/edit.php | 38 +-
.../ui/themes/default/html/views/image/extract.php | 22 +-
.../ui/themes/default/html/views/image/preview.php | 2 +-
.../cms/ui/themes/default/html/views/image/pub.php | 30 +-
.../default/html/views/image/pub.tpl.src.xml | 6 +-
.../ui/themes/default/html/views/image/remove.php | 42 +-
.../default/html/views/image/remove.tpl.src.xml | 2 +-
.../ui/themes/default/html/views/image/show.php | 18 +-
.../default/html/views/image/show.tpl.src.xml | 4 +-
.../ui/themes/default/html/views/image/size.php | 142 +++----
.../default/html/views/image/size.tpl.src.xml | 26 +-
.../themes/default/html/views/image/structure.php | 4 +-
.../themes/default/html/views/image/uncompress.php | 52 +--
.../html/views/image/uncompress.tpl.src.xml | 6 +-
.../ui/themes/default/html/views/image/value.php | 32 +-
.../default/html/views/image/value.tpl.src.xml | 2 +-
.../default/html/views/include/timestamps.inc.xml | 14 +-
.../default/html/views/include/validity.inc.xml | 2 +-
.../ui/themes/default/html/views/language/add.php | 30 +-
.../default/html/views/language/add.tpl.src.xml | 2 +-
.../ui/themes/default/html/views/language/info.php | 46 +--
.../default/html/views/language/info.tpl.src.xml | 10 +-
.../themes/default/html/views/language/listing.php | 56 +--
.../html/views/language/listing.tpl.src.xml | 54 ++-
.../ui/themes/default/html/views/language/prop.php | 52 +--
.../default/html/views/language/prop.tpl.src.xml | 4 +-
.../themes/default/html/views/language/remove.php | 56 +--
.../default/html/views/language/remove.tpl.src.xml | 8 +-
.../default/html/views/language/structure.php | 4 +-
.../themes/default/html/views/languagelist/add.php | 30 +-
.../html/views/languagelist/add.tpl.src.xml | 2 +-
.../default/html/views/languagelist/show.php | 60 +--
.../html/views/languagelist/show.tpl.src.xml | 16 +-
.../cms/ui/themes/default/html/views/link/edit.php | 32 +-
.../default/html/views/link/edit.tpl.src.xml | 2 +-
.../ui/themes/default/html/views/link/remove.php | 30 +-
.../default/html/views/link/remove.tpl.src.xml | 2 +-
.../themes/default/html/views/link/structure.php | 4 +-
.../ui/themes/default/html/views/login/license.php | 164 ++++----
.../default/html/views/login/license.tpl.src.xml | 54 +--
.../ui/themes/default/html/views/login/login.php | 182 ++++-----
.../default/html/views/login/login.tpl.src.xml | 56 +--
.../ui/themes/default/html/views/login/openid.php | 98 ++---
.../default/html/views/login/openid.tpl.src.xml | 20 +-
.../themes/default/html/views/login/password.php | 58 +--
.../default/html/views/login/password.tpl.src.xml | 8 +-
.../default/html/views/login/passwordcode.php | 88 +++--
.../html/views/login/passwordcode.tpl.src.xml | 26 +-
.../themes/default/html/views/login/register.php | 54 +--
.../default/html/views/login/register.tpl.src.xml | 6 +-
.../default/html/views/login/registercode.php | 78 ++--
.../html/views/login/registercode.tpl.src.xml | 8 +-
.../ui/themes/default/html/views/model/info.php | 30 +-
.../default/html/views/model/info.tpl.src.xml | 6 +-
.../ui/themes/default/html/views/model/listing.php | 50 +--
.../default/html/views/model/listing.tpl.src.xml | 50 ++-
.../ui/themes/default/html/views/model/prop.php | 40 +-
.../default/html/views/model/prop.tpl.src.xml | 2 +-
.../ui/themes/default/html/views/model/remove.php | 56 +--
.../default/html/views/model/remove.tpl.src.xml | 8 +-
.../themes/default/html/views/model/structure.php | 4 +-
.../ui/themes/default/html/views/modellist/add.php | 30 +-
.../default/html/views/modellist/add.tpl.src.xml | 2 +-
.../themes/default/html/views/modellist/show.php | 56 +--
.../default/html/views/modellist/show.tpl.src.xml | 12 +-
.../themes/default/html/views/object/aclform.php | 141 ++++---
.../default/html/views/object/aclform.tpl.src.xml | 24 +-
.../ui/themes/default/html/views/object/copy.php | 48 +--
.../ui/themes/default/html/views/object/info.php | 314 +++++++--------
.../default/html/views/object/info.tpl.src.xml | 78 ++--
.../themes/default/html/views/object/inherit.php | 46 +--
.../default/html/views/object/inherit.tpl.src.xml | 4 +-
.../ui/themes/default/html/views/object/name.php | 44 +--
.../default/html/views/object/name.tpl.src.xml | 4 +-
.../ui/themes/default/html/views/object/prop.php | 50 +--
.../default/html/views/object/prop.tpl.src.xml | 4 +-
.../ui/themes/default/html/views/object/rights.php | 88 ++---
.../default/html/views/object/rights.tpl.src.xml | 45 +--
.../themes/default/html/views/object/settings.php | 90 ++---
.../default/html/views/object/settings.tpl.src.xml | 10 +-
.../default/html/views/page/changetemplate.php | 48 +--
.../html/views/page/changetemplate.tpl.src.xml | 8 +-
.../views/page/changetemplateselectelements.php | 34 +-
.../page/changetemplateselectelements.tpl.src.xml | 6 +-
.../cms/ui/themes/default/html/views/page/edit.php | 52 +--
.../default/html/views/page/edit.tpl.src.xml | 16 +-
.../cms/ui/themes/default/html/views/page/form.php | 114 +++---
.../default/html/views/page/form.tpl.src.xml | 26 +-
.../cms/ui/themes/default/html/views/page/info.php | 252 ++++++------
.../default/html/views/page/info.tpl.src.xml | 44 +--
.../cms/ui/themes/default/html/views/page/name.php | 76 ++--
.../default/html/views/page/name.tpl.src.xml | 8 +-
.../ui/themes/default/html/views/page/preview.php | 46 +--
.../default/html/views/page/preview.tpl.src.xml | 4 +-
.../cms/ui/themes/default/html/views/page/pub.php | 46 +--
.../themes/default/html/views/page/pub.tpl.src.xml | 8 +-
.../ui/themes/default/html/views/page/remove.php | 30 +-
.../default/html/views/page/remove.tpl.src.xml | 2 +-
.../cms/ui/themes/default/html/views/page/show.php | 2 +-
.../cms/ui/themes/default/html/views/page/src.php | 38 +-
.../themes/default/html/views/page/src.tpl.src.xml | 2 +-
.../themes/default/html/views/page/structure.php | 4 +-
.../default/html/views/pageelement/advanced.php | 48 +--
.../html/views/pageelement/advanced.tpl.src.xml | 16 +-
.../themes/default/html/views/pageelement/diff.php | 60 +--
.../html/views/pageelement/diff.tpl.src.xml | 10 +-
.../themes/default/html/views/pageelement/edit.php | 34 +-
.../html/views/pageelement/edit.tpl.src.xml | 10 +-
.../default/html/views/pageelement/export.php | 30 +-
.../default/html/views/pageelement/history.php | 120 +++---
.../html/views/pageelement/history.tpl.src.xml | 48 +--
.../default/html/views/pageelement/import.php | 36 +-
.../themes/default/html/views/pageelement/info.php | 106 +++---
.../html/views/pageelement/info.tpl.src.xml | 34 +-
.../themes/default/html/views/pageelement/link.php | 76 ++--
.../html/views/pageelement/link.tpl.src.xml | 2 +-
.../default/html/views/pageelement/preview.php | 16 +-
.../html/views/pageelement/preview.tpl.src.xml | 4 +-
.../themes/default/html/views/pageelement/prop.php | 156 ++++----
.../html/views/pageelement/prop.tpl.src.xml | 34 +-
.../themes/default/html/views/pageelement/pub.php | 46 +--
.../default/html/views/pageelement/pub.tpl.src.xml | 8 +-
.../default/html/views/pageelement/structure.php | 2 +-
.../default/html/views/pageelement/value.php | 378 +++++++++---------
.../html/views/pageelement/value.tpl.src.xml | 90 ++---
.../default/html/views/profile/confirmmail.php | 42 +-
.../ui/themes/default/html/views/profile/edit.php | 210 +++++-----
.../default/html/views/profile/edit.tpl.src.xml | 24 +-
.../themes/default/html/views/profile/history.php | 42 +-
.../default/html/views/profile/history.tpl.src.xml | 12 +-
.../ui/themes/default/html/views/profile/mail.php | 62 +--
.../default/html/views/profile/mail.tpl.src.xml | 4 +-
.../default/html/views/profile/memberships.php | 32 +-
.../html/views/profile/memberships.tpl.src.xml | 6 +-
.../ui/themes/default/html/views/profile/pw.php | 100 ++---
.../default/html/views/profile/pw.tpl.src.xml | 12 +-
.../ui/themes/default/html/views/project/add.php | 128 +++----
.../default/html/views/project/add.tpl.src.xml | 40 +-
.../ui/themes/default/html/views/project/edit.php | 42 +-
.../default/html/views/project/edit.tpl.src.xml | 14 +-
.../themes/default/html/views/project/export.php | 30 +-
.../default/html/views/project/export.tpl.src.xml | 2 +-
.../themes/default/html/views/project/history.php | 68 ++--
.../default/html/views/project/history.tpl.src.xml | 16 +-
.../ui/themes/default/html/views/project/info.php | 24 +-
.../default/html/views/project/info.tpl.src.xml | 2 +-
.../default/html/views/project/maintenance.php | 50 +--
.../html/views/project/maintenance.tpl.src.xml | 6 +-
.../ui/themes/default/html/views/project/prop.php | 186 ++++-----
.../default/html/views/project/prop.tpl.src.xml | 12 +-
.../themes/default/html/views/project/remove.php | 54 +--
.../default/html/views/project/remove.tpl.src.xml | 8 +-
.../themes/default/html/views/projectlist/add.php | 66 ++--
.../default/html/views/projectlist/add.tpl.src.xml | 8 +-
.../themes/default/html/views/projectlist/edit.php | 38 +-
.../html/views/projectlist/edit.tpl.src.xml | 8 +-
.../default/html/views/projectlist/history.php | 48 +--
.../html/views/projectlist/history.tpl.src.xml | 16 +-
.../ui/themes/default/html/views/search/edit.php | 84 ++--
.../default/html/views/search/edit.tpl.src.xml | 26 +-
.../ui/themes/default/html/views/search/result.php | 34 +-
.../default/html/views/search/result.tpl.src.xml | 8 +-
.../default/html/views/start/applications.php | 32 +-
.../html/views/start/applications.tpl.src.xml | 8 +-
.../default/html/views/start/projectmenu.php | 104 ++---
.../html/views/start/projectmenu.tpl.src.xml | 10 +-
.../html/views/start/userprojecttimeline.php | 56 +--
.../views/start/userprojecttimeline.tpl.src.xml | 12 +-
.../themes/default/html/views/template/addel.php | 66 ++--
.../default/html/views/template/addel.tpl.src.xml | 10 +-
.../ui/themes/default/html/views/template/edit.php | 78 ++--
.../default/html/views/template/edit.tpl.src.xml | 22 +-
.../default/html/views/template/extension.php | 38 +-
.../html/views/template/extension.tpl.src.xml | 2 +-
.../ui/themes/default/html/views/template/info.php | 34 +-
.../default/html/views/template/info.tpl.src.xml | 10 +-
.../themes/default/html/views/template/listing.php | 30 +-
.../html/views/template/listing.tpl.src.xml | 12 +-
.../themes/default/html/views/template/preview.php | 46 +--
.../html/views/template/preview.tpl.src.xml | 6 +-
.../ui/themes/default/html/views/template/prop.php | 68 ++--
.../default/html/views/template/prop.tpl.src.xml | 12 +-
.../ui/themes/default/html/views/template/pub.php | 46 +--
.../default/html/views/template/pub.tpl.src.xml | 8 +-
.../themes/default/html/views/template/remove.php | 56 +--
.../default/html/views/template/remove.tpl.src.xml | 8 +-
.../ui/themes/default/html/views/template/src.php | 36 +-
.../default/html/views/template/src.tpl.src.xml | 2 +-
.../default/html/views/template/srcelement.php | 78 ++--
.../html/views/template/srcelement.tpl.src.xml | 8 +-
.../themes/default/html/views/templatelist/add.php | 86 ++---
.../html/views/templatelist/add.tpl.src.xml | 10 +-
.../default/html/views/templatelist/show.php | 42 +-
.../html/views/templatelist/show.tpl.src.xml | 12 +-
.../ui/themes/default/html/views/text/compress.php | 60 +--
.../default/html/views/text/compress.tpl.src.xml | 8 +-
.../cms/ui/themes/default/html/views/text/edit.php | 38 +-
.../ui/themes/default/html/views/text/extract.php | 22 +-
.../ui/themes/default/html/views/text/preview.php | 2 +-
.../cms/ui/themes/default/html/views/text/pub.php | 32 +-
.../themes/default/html/views/text/pub.tpl.src.xml | 6 +-
.../ui/themes/default/html/views/text/remove.php | 42 +-
.../default/html/views/text/remove.tpl.src.xml | 6 +-
.../cms/ui/themes/default/html/views/text/show.php | 2 +-
.../cms/ui/themes/default/html/views/text/size.php | 142 +++----
.../default/html/views/text/size.tpl.src.xml | 26 +-
.../themes/default/html/views/text/structure.php | 4 +-
.../themes/default/html/views/text/uncompress.php | 52 +--
.../default/html/views/text/uncompress.tpl.src.xml | 6 +-
.../ui/themes/default/html/views/text/value.php | 34 +-
.../default/html/views/text/value.tpl.src.xml | 2 +-
.../ui/themes/default/html/views/title/ping.php | 2 +-
.../ui/themes/default/html/views/title/show.php | 424 ++++++++++-----------
.../default/html/views/title/show.tpl.src.xml | 220 +++++------
.../cms/ui/themes/default/html/views/url/edit.php | 34 +-
.../themes/default/html/views/url/edit.tpl.src.xml | 2 +-
.../ui/themes/default/html/views/url/preview.php | 6 +-
.../default/html/views/url/preview.tpl.src.xml | 2 +-
.../ui/themes/default/html/views/url/remove.php | 30 +-
.../default/html/views/url/remove.tpl.src.xml | 2 +-
.../ui/themes/default/html/views/url/structure.php | 4 +-
.../cms/ui/themes/default/html/views/user/add.php | 30 +-
.../ui/themes/default/html/views/user/history.php | 42 +-
.../default/html/views/user/history.tpl.src.xml | 12 +-
.../cms/ui/themes/default/html/views/user/info.php | 226 +++++------
.../default/html/views/user/info.tpl.src.xml | 56 +--
.../ui/themes/default/html/views/user/listing.php | 52 +--
.../default/html/views/user/listing.tpl.src.xml | 44 ++-
.../themes/default/html/views/user/memberships.php | 50 +--
.../html/views/user/memberships.tpl.src.xml | 8 +-
.../cms/ui/themes/default/html/views/user/prop.php | 208 +++++-----
.../default/html/views/user/prop.tpl.src.xml | 14 +-
.../cms/ui/themes/default/html/views/user/pw.php | 112 +++---
.../themes/default/html/views/user/pw.tpl.src.xml | 12 +-
.../ui/themes/default/html/views/user/remove.php | 62 +--
.../default/html/views/user/remove.tpl.src.xml | 6 +-
.../ui/themes/default/html/views/user/rights.php | 88 ++---
.../default/html/views/user/rights.tpl.src.xml | 33 +-
.../themes/default/html/views/usergroup/show.php | 36 +-
.../default/html/views/usergroup/show.tpl.src.xml | 6 +-
.../ui/themes/default/html/views/userlist/add.php | 30 +-
.../ui/themes/default/html/views/userlist/show.php | 64 ++--
.../default/html/views/userlist/show.tpl.src.xml | 20 +-
.../components/html/checkbox/Checkbox.class.php | 11 +-
.../components/html/form/Form.class.php | 8 +-
.../components/html/if/If.class.php | 2 +-
.../components/html/list/List.class.php | 2 +-
.../components/html/radio/Radio.class.php | 3 +-
.../components/html/selectbox/Selectbox.class.php | 4 +-
.../components/html/text/Text.class.php | 6 +-
.../element/PHPBlockElement.class.php | 130 +------
modules/template_engine/element/Value.class.php | 87 +++--
.../element/ValueExpression.class.php | 44 +--
.../util/text/variables/VariableResolver.class.php | 17 +-
340 files changed, 7203 insertions(+), 7108 deletions(-)