commit d8095a9d24b7feadbc5ff7fd218b478866a6807e parent ce4efd65628bc83ad2d8e4bf2ea40165b5dbd8b5 Author: Jan Dankert <develop@jandankert.de> Date: Sat, 3 Oct 2020 00:50:14 +0200 Fix: Show the rights of node objects. Diffstat:
27 files changed, 64 insertions(+), 49 deletions(-)
diff --git a/modules/cms/ui/themes/default/html/views/element/advanced.php b/modules/cms/ui/themes/default/html/views/element/advanced.php @@ -1,5 +1,5 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> - <?php $if1=(\cms\base\Configuration::config('security','disable_dynamic_code')); if($if1) { ?> + <?php $if1=(O::config('security','disable_dynamic_code')); if($if1) { ?> <?php $if1=(!1); if($if1) { ?> <div class="<?php echo O::escapeHtml('message warn') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('NOTICE_CODE_DISABLED').'') ?> diff --git a/modules/cms/ui/themes/default/html/views/file/pub.php b/modules/cms/ui/themes/default/html/views/file/pub.php @@ -1,5 +1,5 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> - <?php $if1=(\cms\base\Configuration::config('security','nopublish')); if($if1) { ?> + <?php $if1=(O::config('security','nopublish')); if($if1) { ?> <div class="<?php echo O::escapeHtml('message warn') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('help') ?>"><?php echo O::escapeHtml(''.@O::lang('NOPUBLISH_DESC').'') ?> </span> diff --git a/modules/cms/ui/themes/default/html/views/folder/pub.php b/modules/cms/ui/themes/default/html/views/folder/pub.php @@ -1,5 +1,5 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> - <?php $if1=(\cms\base\Configuration::config('security','nopublish')); if($if1) { ?> + <?php $if1=(O::config('security','nopublish')); if($if1) { ?> <div class="<?php echo O::escapeHtml('message warn') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('help') ?>"><?php echo O::escapeHtml(''.@O::lang('NOPUBLISH_DESC').'') ?> </span> diff --git a/modules/cms/ui/themes/default/html/views/group/rights.php b/modules/cms/ui/themes/default/html/views/group/rights.php @@ -85,7 +85,7 @@ </td> <?php foreach((array)$show as $list_key=>$list_value) { ?> <td><?php echo O::escapeHtml('') ?> - <?php { $$list_value= $bits['$list_value']; ?> + <?php { $$list_value= $bits[''.@$list_value.'']; ?> <?php } ?> <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml(''.@$list_value.'') ?>" disabled="<?php echo O::escapeHtml('disabled') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$$list_value){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> </td> diff --git a/modules/cms/ui/themes/default/html/views/image/pub.php b/modules/cms/ui/themes/default/html/views/image/pub.php @@ -1,5 +1,5 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> - <?php $if1=(\cms\base\Configuration::config('security','nopublish')); if($if1) { ?> + <?php $if1=(O::config('security','nopublish')); if($if1) { ?> <div class="<?php echo O::escapeHtml('message warn') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('help') ?>"><?php echo O::escapeHtml(''.@O::lang('NOPUBLISH_DESC').'') ?> </span> diff --git a/modules/cms/ui/themes/default/html/views/login/login.php b/modules/cms/ui/themes/default/html/views/login/login.php @@ -7,8 +7,8 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('action') ?>" value="<?php echo O::escapeHtml('login') ?>" /><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('subaction') ?>" value="<?php echo O::escapeHtml('login') ?>" /><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('id') ?>" value="<?php echo O::escapeHtml(''.@$_id.'') ?>" /><?php echo O::escapeHtml('') ?> - <?php $if1=(\cms\base\Configuration::config('login','logo','enabled')); if($if1) { ?> - <?php $if1=!((\cms\base\Configuration::config('login','logo','url'))==FALSE); if($if1) { ?> + <?php $if1=(O::config('login','logo','enabled')); if($if1) { ?> + <?php $if1=!((O::config('login','logo','url'))==FALSE); if($if1) { ?> <a target="<?php echo O::escapeHtml('_self') ?>" data-url="<?php echo O::escapeHtml(''.O::config('login','logo','url').'') ?>" data-action="<?php echo O::escapeHtml('') ?>" data-method="<?php echo O::escapeHtml('') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra="<?php echo O::escapeHtml('[]') ?>" href="<?php echo O::escapeHtml('/#//') ?>"><?php echo O::escapeHtml('') ?> <img src="<?php echo O::escapeHtml(''.O::config('login','logo','image').'') ?>" /><?php echo O::escapeHtml('') ?> </a> @@ -17,25 +17,25 @@ <img src="<?php echo O::escapeHtml(''.O::config('login','logo','image').'') ?>" /><?php echo O::escapeHtml('') ?> <?php } ?> <?php } ?> - <?php $if1=!((\cms\base\Configuration::config('login','motd'))==FALSE); if($if1) { ?> + <?php $if1=!((O::config('login','motd'))==FALSE); if($if1) { ?> <div class="<?php echo O::escapeHtml('message info') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.O::config('login','motd').'') ?> </span> </div> <?php } ?> - <?php $if1=(\cms\base\Configuration::config('login','nologin')); if($if1) { ?> + <?php $if1=(O::config('login','nologin')); if($if1) { ?> <div class="<?php echo O::escapeHtml('message error') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('LOGIN_NOLOGIN_DESC').'') ?> </span> </div> <?php } ?> - <?php $if1=(\cms\base\Configuration::config('security','readonly')); if($if1) { ?> + <?php $if1=(O::config('security','readonly')); if($if1) { ?> <div class="<?php echo O::escapeHtml('message warn') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('READONLY_DESC').'') ?> </span> </div> <?php } ?> - <?php $if1=(!\cms\base\Configuration::config('login','nologin')); if($if1) { ?> + <?php $if1=(!O::config('login','nologin')); if($if1) { ?> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> <label class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/login/openid.php b/modules/cms/ui/themes/default/html/views/login/openid.php @@ -7,7 +7,7 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('action') ?>" value="<?php echo O::escapeHtml('login') ?>" /><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('subaction') ?>" value="<?php echo O::escapeHtml('login') ?>" /><?php echo O::escapeHtml('') ?> <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('id') ?>" value="<?php echo O::escapeHtml(''.@$_id.'') ?>" /><?php echo O::escapeHtml('') ?> - <?php $if1=(\cms\base\Configuration::config('security','openid','enable')); if($if1) { ?> + <?php $if1=(O::config('security','openid','enable')); if($if1) { ?> <fieldset class="<?php echo O::escapeHtml('or-group toggle-open-close open show') ?>"><?php echo O::escapeHtml('') ?> <legend class="<?php echo O::escapeHtml('on-click-open-close') ?>"><?php echo O::escapeHtml(''.@O::lang('OPENID').'') ?> <img /><?php echo O::escapeHtml('') ?> @@ -21,7 +21,7 @@ <div class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('openid_user').'') ?> </span> - <?php $if1=!((\cms\base\Configuration::config('security','openid','logo_url'))==FALSE); if($if1) { ?> + <?php $if1=!((O::config('security','openid','logo_url'))==FALSE); if($if1) { ?> <img src="<?php echo O::escapeHtml(''.O::config('security','openid','logo_url').'') ?>" /><?php echo O::escapeHtml('') ?> <?php } ?> </div> diff --git a/modules/cms/ui/themes/default/html/views/login/password.php b/modules/cms/ui/themes/default/html/views/login/password.php @@ -1,5 +1,5 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> - <?php $if1=(\cms\base\Configuration::config('login','send_password')); if($if1) { ?> + <?php $if1=(O::config('login','send_password')); if($if1) { ?> <form name="<?php echo O::escapeHtml('') ?>" target="<?php echo O::escapeHtml('_self') ?>" data-target="<?php echo O::escapeHtml('view') ?>" action="<?php echo O::escapeHtml('./') ?>" data-method="<?php echo O::escapeHtml('password') ?>" data-action="<?php echo O::escapeHtml('login') ?>" data-id="<?php echo O::escapeHtml(''.@$_id.'') ?>" method="<?php echo O::escapeHtml('POST') ?>" enctype="<?php echo O::escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo O::escapeHtml('') ?>" data-autosave="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('or-form login') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-form-headline') ?>"><?php echo O::escapeHtml('') ?> </div> diff --git a/modules/cms/ui/themes/default/html/views/login/register.php b/modules/cms/ui/themes/default/html/views/login/register.php @@ -1,5 +1,5 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> - <?php $if1=(\cms\base\Configuration::config('login','register')); if($if1) { ?> + <?php $if1=(O::config('login','register')); if($if1) { ?> <form name="<?php echo O::escapeHtml('') ?>" target="<?php echo O::escapeHtml('_self') ?>" data-target="<?php echo O::escapeHtml('view') ?>" action="<?php echo O::escapeHtml('./') ?>" data-method="<?php echo O::escapeHtml('register') ?>" data-action="<?php echo O::escapeHtml('login') ?>" data-id="<?php echo O::escapeHtml(''.@$_id.'') ?>" method="<?php echo O::escapeHtml('POST') ?>" enctype="<?php echo O::escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo O::escapeHtml('') ?>" data-autosave="<?php echo O::escapeHtml('') ?>" class="<?php echo O::escapeHtml('or-form login') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('or-form-headline') ?>"><?php echo O::escapeHtml('') ?> </div> diff --git a/modules/cms/ui/themes/default/html/views/object/rights.php b/modules/cms/ui/themes/default/html/views/object/rights.php @@ -65,7 +65,9 @@ </td> <?php foreach((array)$show as $list_key=>$t) { ?> <td><?php echo O::escapeHtml('') ?> - <?php $if1=($t); if($if1) { ?> + <?php { $bit= $acl[''.@$t.'']; ?> + <?php } ?> + <?php $if1=($bit); if($if1) { ?> <span><?php echo '✓' ?> </span> <?php } ?> diff --git a/modules/cms/ui/themes/default/html/views/object/rights.tpl.src.xml b/modules/cms/ui/themes/default/html/views/object/rights.tpl.src.xml @@ -49,7 +49,8 @@ </column> <list list="${show}" value="t"> <column> - <if true="${t}"> + <set var="bit" value="${acl}" key="${t}" /> + <if true="${bit}"> <text value="&check;" escape="false" /> </if> </column> diff --git a/modules/cms/ui/themes/default/html/views/page/pub.php b/modules/cms/ui/themes/default/html/views/page/pub.php @@ -1,5 +1,5 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> - <?php $if1=(\cms\base\Configuration::config('security','nopublish')); if($if1) { ?> + <?php $if1=(O::config('security','nopublish')); if($if1) { ?> <div class="<?php echo O::escapeHtml('message warn') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('help') ?>"><?php echo O::escapeHtml(''.@O::lang('NOPUBLISH_DESC').'') ?> </span> diff --git a/modules/cms/ui/themes/default/html/views/pageelement/pub.php b/modules/cms/ui/themes/default/html/views/pageelement/pub.php @@ -1,5 +1,5 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> - <?php $if1=(\cms\base\Configuration::config('security','nopublish')); if($if1) { ?> + <?php $if1=(O::config('security','nopublish')); if($if1) { ?> <div class="<?php echo O::escapeHtml('message warn') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('help') ?>"><?php echo O::escapeHtml(''.@O::lang('NOPUBLISH_DESC').'') ?> </span> diff --git a/modules/cms/ui/themes/default/html/views/project/prop.php b/modules/cms/ui/themes/default/html/views/project/prop.php @@ -54,7 +54,7 @@ <input name="<?php echo O::escapeHtml('target_dir') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('255') ?>" value="<?php echo O::escapeHtml(''.@$target_dir.'') ?>" class="<?php echo O::escapeHtml('filename or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> - <?php $if1=(\cms\base\Configuration::config('publish','project','override_system_command')); if($if1) { ?> + <?php $if1=(O::config('publish','project','override_system_command')); if($if1) { ?> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> <label class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml(''.@O::lang('PROJECT_CMD_AFTER_PUBLISH').'') ?> @@ -95,7 +95,7 @@ </label> </div> </fieldset> - <?php $if1=(\cms\base\Configuration::config('publish','ftp','enable')); if($if1) { ?> + <?php $if1=(O::config('publish','ftp','enable')); if($if1) { ?> <fieldset class="<?php echo O::escapeHtml('or-group toggle-open-close open show') ?>"><?php echo O::escapeHtml('') ?> <legend class="<?php echo O::escapeHtml('on-click-open-close') ?>"><?php echo O::escapeHtml(''.@O::lang('project_FTP').'') ?> <img /><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/search/edit.php b/modules/cms/ui/themes/default/html/views/search/edit.php @@ -28,31 +28,31 @@ <br /><?php echo O::escapeHtml('') ?> </div> <div class="<?php echo O::escapeHtml('input') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('id') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(\cms\base\Configuration::config('search','quicksearch','flag','id')){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('id') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(O::config('search','quicksearch','flag','id')){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <label class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('id').'') ?> </span> </label> <br /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('name') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(\cms\base\Configuration::config('search','quicksearch','flag','name')){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('name') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(O::config('search','quicksearch','flag','name')){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <label class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('name').'') ?> </span> </label> <br /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('filename') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(\cms\base\Configuration::config('search','quicksearch','flag','filename')){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('filename') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(O::config('search','quicksearch','flag','filename')){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <label class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('filename').'') ?> </span> </label> <br /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('description') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(\cms\base\Configuration::config('search','quicksearch','flag','description')){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('description') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(O::config('search','quicksearch','flag','description')){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <label class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('description').'') ?> </span> </label> <br /><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('content') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(\cms\base\Configuration::config('search','quicksearch','flag','content')){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> + <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml('content') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(O::config('search','quicksearch','flag','content')){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> <label class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@O::lang('content').'') ?> </span> diff --git a/modules/cms/ui/themes/default/html/views/template/pub.php b/modules/cms/ui/themes/default/html/views/template/pub.php @@ -1,5 +1,5 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> - <?php $if1=(\cms\base\Configuration::config('security','nopublish')); if($if1) { ?> + <?php $if1=(O::config('security','nopublish')); if($if1) { ?> <div class="<?php echo O::escapeHtml('message warn') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('help') ?>"><?php echo O::escapeHtml(''.@O::lang('NOPUBLISH_DESC').'') ?> </span> diff --git a/modules/cms/ui/themes/default/html/views/text/pub.php b/modules/cms/ui/themes/default/html/views/text/pub.php @@ -1,5 +1,5 @@ <?php defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> - <?php $if1=(\cms\base\Configuration::config('security','nopublish')); if($if1) { ?> + <?php $if1=(O::config('security','nopublish')); if($if1) { ?> <div class="<?php echo O::escapeHtml('message warn') ?>"><?php echo O::escapeHtml('') ?> <span class="<?php echo O::escapeHtml('help') ?>"><?php echo O::escapeHtml(''.@O::lang('NOPUBLISH_DESC').'') ?> </span> diff --git a/modules/cms/ui/themes/default/html/views/user/info.php b/modules/cms/ui/themes/default/html/views/user/info.php @@ -45,7 +45,7 @@ </span> </div> </div> - <?php $if1=(\cms\base\Configuration::config('security','user','show_admin_mail')); if($if1) { ?> + <?php $if1=(O::config('security','user','show_admin_mail')); if($if1) { ?> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> <label class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml(''.@O::lang('user_mail').'') ?> diff --git a/modules/cms/ui/themes/default/html/views/user/prop.php b/modules/cms/ui/themes/default/html/views/user/prop.php @@ -34,7 +34,7 @@ <input name="<?php echo O::escapeHtml('fullname') ?>" type="<?php echo O::escapeHtml('text') ?>" maxlength="<?php echo O::escapeHtml('128') ?>" value="<?php echo O::escapeHtml(''.@$fullname.'') ?>" class="<?php echo O::escapeHtml('or-input') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> - <?php $if1=(\cms\base\Configuration::config('security','user','show_admin_mail')); if($if1) { ?> + <?php $if1=(O::config('security','user','show_admin_mail')); if($if1) { ?> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> <label class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml(''.@O::lang('user_mail').'') ?> diff --git a/modules/cms/ui/themes/default/html/views/user/pw.php b/modules/cms/ui/themes/default/html/views/user/pw.php @@ -23,7 +23,7 @@ <input type="<?php echo O::escapeHtml('hidden') ?>" name="<?php echo O::escapeHtml('password_proposal') ?>" value="<?php echo O::escapeHtml(''.@$password_proposal.'') ?>" /><?php echo O::escapeHtml('') ?> </div> </div> - <?php $if1=(\cms\base\Configuration::config('mail','enabled')); if($if1) { ?> + <?php $if1=(O::config('mail','enabled')); if($if1) { ?> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> </div> @@ -72,7 +72,7 @@ <div class="<?php echo O::escapeHtml('closable') ?>"><?php echo O::escapeHtml('') ?> </div> </fieldset> - <?php $if1=(\cms\base\Configuration::config('mail','enabled')); if($if1) { ?> + <?php $if1=(O::config('mail','enabled')); if($if1) { ?> <?php $if1=(isset($mail)); if($if1) { ?> <div class="<?php echo O::escapeHtml('line') ?>"><?php echo O::escapeHtml('') ?> <div class="<?php echo O::escapeHtml('label') ?>"><?php echo O::escapeHtml('') ?> diff --git a/modules/cms/ui/themes/default/html/views/user/rights.php b/modules/cms/ui/themes/default/html/views/user/rights.php @@ -39,8 +39,6 @@ <td class="<?php echo O::escapeHtml('help') ?>"><?php echo O::escapeHtml('') ?> <span title="<?php echo O::escapeHtml(''.@O::lang('acl_'.@$t.'').'') ?>"><?php echo O::escapeHtml(''.@O::lang('acl_'.@$t.'_abbrev').'') ?> </span> - <span title="<?php echo O::escapeHtml(''.@O::lang('acl_').'') ?>"><?php echo O::escapeHtml(''.@O::lang('acl__abbrev').'') ?> - </span> </td> <?php } ?> </tr> @@ -88,7 +86,7 @@ </td> <?php foreach((array)$show as $list_key=>$list_value) { ?> <td><?php echo O::escapeHtml('') ?> - <?php { $$list_value= $bits['$list_value']; ?> + <?php { $$list_value= $bits[''.@$list_value.'']; ?> <?php } ?> <input type="<?php echo O::escapeHtml('checkbox') ?>" name="<?php echo O::escapeHtml(''.@$list_value.'') ?>" disabled="<?php echo O::escapeHtml('disabled') ?>" value="<?php echo O::escapeHtml('1') ?>" <?php if(@$$list_value){ ?>checked="<?php echo O::escapeHtml('checked') ?>"<?php } ?> /><?php echo O::escapeHtml('') ?> </td> diff --git a/modules/cms/ui/themes/default/html/views/user/rights.tpl.src.xml b/modules/cms/ui/themes/default/html/views/user/rights.tpl.src.xml @@ -23,7 +23,7 @@ <list list="${show}" value="t"> <column class="help"> <text value="${message:acl_${t}_abbrev}" title="${message:acl_${t}}"></text> - <text value="${message:acl_${data:t}_abbrev}" title="${message:acl_${data:t}}"></text> + <!--<text value="${message:acl_${data:t}_abbrev}" title="${message:acl_${data:t}}"></text>--> </column> </list> </row> diff --git a/modules/template_engine/components/html/set/Set.class.php b/modules/template_engine/components/html/set/Set.class.php @@ -4,6 +4,7 @@ namespace template_engine\components; use template_engine\components\html\Component; use template_engine\element\PHPBlockElement; +use template_engine\element\Value; class SetComponent extends Component { @@ -19,7 +20,7 @@ class SetComponent extends Component if ($this->value) { if ($this->key) - $set->inBlock = '$'.$set->varname($this->var).'= '.$set->value($this->value).'['.'\''.$set->value($this->key).'\''.'];'; + $set->inBlock = '$'.$set->varname($this->var).'= '.$set->value($this->value).'['.((new Value($this->key))->render(Value::CONTEXT_PHP)).'];'; else $set->inBlock = '$'.$set->varname($this->var).'= '.$set->value($this->value).';'; } diff --git a/modules/template_engine/element/PHPBlockElement.class.php b/modules/template_engine/element/PHPBlockElement.class.php @@ -4,6 +4,7 @@ namespace template_engine\element; +use template_engine\engine\TemplateEngine; use util\text\variables\VariableResolver; class PHPBlockElement extends HtmlElement @@ -64,7 +65,7 @@ class PHPBlockElement extends HtmlElement $res->addResolver('config', function($name) { $config_parts = explode('/', $name); - return '\cms\base\Configuration::config(' . "'" . implode("'" . ',' . "'", $config_parts) . "'" . ')'; + return TemplateEngine::OUTPUT_ALIAS.'::config(' . "'" . implode("'" . ',' . "'", $config_parts) . "'" . ')'; }); return $res->resolveVariables( $value ); diff --git a/modules/template_engine/element/Value.class.php b/modules/template_engine/element/Value.class.php @@ -62,21 +62,30 @@ class Value switch ($context) { case Value::CONTEXT_PHP: $escape = function ($expr) use ($context) { - return $expr; + return $expr; }; + break; case Value::CONTEXT_HTML: - case Value::CONTEXT_RAW: $escape = function ($expr) use ($context) { - if ($context == self::CONTEXT_HTML) return TemplateEngine::OUTPUT_ALIAS.'::escapeHtml(' . $expr . ')'; - else - return $expr; }; - - $this->value = str_replace('\'','\\\'',$this->value); - return '<'.'?'.'php '.'echo '. $escape('\''.$res->resolveVariables( $this->value ).'\'').' ?'.'>'; + break; + case Value::CONTEXT_RAW: + $escape = function ($expr) use ($context) { + return $expr; + }; + break; } + + if ( $context == self::CONTEXT_PHP ) { + return '\''.$res->resolveVariables( $this->value ).'\''; + + } else { + + $this->value = str_replace('\'','\\\'',$this->value); + return '<'.'?'.'php '.'echo '. $escape('\''.$res->resolveVariables( $this->value ).'\'').' ?'.'>'; + } } public function __xtoString() diff --git a/modules/template_engine/element/ValueExpression.class.php b/modules/template_engine/element/ValueExpression.class.php @@ -9,9 +9,9 @@ class ValueExpression public $name; public $position; - const TYPE_DATA_VAR = '$'; - const TYPE_MESSAGE = '#'; - const TYPE_CONFIG = '%'; + const TYPE_DATA_VAR = 1; + const TYPE_MESSAGE = 2; + const TYPE_CONFIG = 3; /** * ValueExpression constructor. diff --git a/modules/template_engine/engine/TemplateEngine.class.php b/modules/template_engine/engine/TemplateEngine.class.php @@ -231,6 +231,9 @@ class TemplateEngine // save a few bytes in production mode ;) header("X-CMS-Template-File: " . $templateFile); + if ( DEVELOPMENT ) + echo '<!-- '."\n".print_r($outputData,true)."\n".' -->'; + // Extracting all output data into the actual context extract($outputData);