commit f981fb9db1bebdc5ea01dc557fb82f05f57c2eff parent cd0191350e01210f7abd4d945f979c824fd555f6 Author: Jan Dankert <develop@jandankert.de> Date: Sat, 16 May 2020 01:08:40 +0200 Refactoring: Switching the ValueExpressions in the templates to the new VariableResolver for supporting nested variables like ${message:prefix_${key}}. Diffstat:
340 files changed, 7211 insertions(+), 7116 deletions(-)
diff --git a/modules/cms/Dispatcher.class.php b/modules/cms/Dispatcher.class.php @@ -115,6 +115,8 @@ class Dispatcher $result['session'] = array('name' => session_name(), 'id' => session_id(), 'token' => token()); $result['version'] = OR_VERSION; $result['api'] = '2'; + $result['output']['_token'] = token(); + $result['output']['_id' ] = $this->request->id; // Yes, closing the session flushes the session data and unlocks other waiting requests. diff --git a/modules/cms/base/functions/language.inc.php b/modules/cms/base/functions/language.inc.php @@ -89,6 +89,10 @@ function encodeHtml($text) { return translateutf8tohtml($text); } +function escapeHtml($text) +{ + return translateutf8tohtml( htmlentities( $text ) ); +} diff --git a/modules/cms/ui/themes/default/html/views/configuration/show.php b/modules/cms/ui/themes/default/html/views/configuration/show.php @@ -1,29 +1,29 @@ <?php if (defined('OR_TITLE')) { ?> - <div class="or-table-wrapper"> - <div class="or-table-filter"> - <input type="search" name="filter" placeholder="<?php echo encodeHtml(htmlentities(@lang('SEARCH_FILTER'))) ?>" /> + <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> </div> - <div class="or-table-area"> - <table width="100%"> - <tr class="headline"> - <td class="help"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> + <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> + <tr class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml('') ?> + <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_NAME').'') ?> </span> </td> - <td class="help"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_VALUE'))) ?> + <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_VALUE').'') ?> </span> </td> </tr> - <?php foreach($config as $list_key=>$list_value) { extract($list_value); ?> - <tr class="data"> - <td> - <span><?php echo encodeHtml(htmlentities(@$key)) ?> + <?php foreach((array)$config as $list_key=>$list_value) { extract($list_value); ?> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$key.'') ?> </span> </td> - <td class="<?php echo encodeHtml(htmlentities(@$class)) ?>"> - <span class="<?php echo encodeHtml(htmlentities(@$class)) ?>"><?php echo encodeHtml(htmlentities(@$value)) ?> + <td class="<?php echo escapeHtml(''.@$class.'') ?>"><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml(''.@$class.'') ?>"><?php echo escapeHtml(''.@$value.'') ?> </span> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/configuration/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/configuration/show.tpl.src.xml @@ -3,16 +3,16 @@ <table> <row class="headline"> <column class="help"> - <text key="GLOBAL_NAME"></text> + <text value="${message:GLOBAL_NAME}"></text> </column> <column class="help"> - <text key="GLOBAL_VALUE"></text> + <text value="${message:GLOBAL_VALUE}"></text> </column> </row> - <list list="config" extract="true"> + <list list="${config}" extract="true"> <row class="data"> <column> - <text var="key"></text> + <text value="${key}"></text> </column> <column class="${class}"> <text class="${class}" var="value"></text> diff --git a/modules/cms/ui/themes/default/html/views/configuration/src.php b/modules/cms/ui/themes/default/html/views/configuration/src.php @@ -1,4 +1,4 @@ <?php if (defined('OR_TITLE')) { ?> - <textarea name="source" data-extension="" data-mimetype="" data-mode="yaml" class="editor code-editor"><?php echo encodeHtml(htmlentities(@$source)) ?> + <textarea name="<?php echo escapeHtml('source') ?>" data-extension="<?php echo escapeHtml('') ?>" data-mimetype="<?php echo escapeHtml('') ?>" data-mode="<?php echo escapeHtml('yaml') ?>" class="<?php echo escapeHtml('editor code-editor') ?>"><?php echo escapeHtml(''.@$source.'') ?> </textarea> <?php } ?> \ No newline at end of file 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,134 +1,134 @@ <?php if (defined('OR_TITLE')) { ?> <?php $if1=(config('security','disable_dynamic_code')); if($if1) { ?> - <?php $if1=(!true); if($if1) { ?> - <div class="message warn"> - <span><?php echo encodeHtml(htmlentities(@lang('NOTICE_CODE_DISABLED'))) ?> + <?php $if1=(!1); if($if1) { ?> + <div class="<?php echo escapeHtml('message warn') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('NOTICE_CODE_DISABLED').'') ?> </span> </div> <?php } ?> <?php } ?> - <form name="" target="_self" data-target="view" action="./" data-method="advanced" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form element"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="element" /> - <input type="hidden" name="subaction" value="advanced" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <fieldset class="or-group toggle-open-close open show"> - <div class="closable"> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('advanced') ?>" data-action="<?php echo escapeHtml('element') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form element') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('element') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('advanced') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> <?php $if1=(isset($subtype)); if($if1) { ?> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('ELEMENT_SUBTYPE'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('ELEMENT_SUBTYPE').'') ?> </span> </div> - <div class="input"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> <?php $if1=(isset($subtypes)); if($if1) { ?> - <select name="subtype" size="1"> - <option value=""><?php echo encodeHtml(htmlentities(@lang('LIST_ENTRY_EMPTY'))) ?> + <select name="<?php echo escapeHtml('subtype') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> + <option value="<?php echo escapeHtml('') ?>"><?php echo escapeHtml(''.@lang('LIST_ENTRY_EMPTY').'') ?> </option> <?php foreach($subtypes as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$subtype){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$subtype){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> <?php } ?> <?php $if1=!(isset($subtypes)); if($if1) { ?> - <div class="inputholder"> - <input name="subtype" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$subtype)) ?>" /> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('subtype') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$subtype.'') ?>" /><?php echo escapeHtml('') ?> </div> <?php } ?> </div> </div> <?php } ?> <?php $if1=(isset($with_icon)); if($if1) { ?> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <input type="checkbox" name="with_icon" value="1" <?php if(@$with_icon){ ?>checked="1"<?php } ?> /> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_WITH_ICON'))) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('with_icon') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$with_icon){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_WITH_ICON').'') ?> </span> </label> </div> </div> <?php } ?> <?php $if1=(isset($inherit)); if($if1) { ?> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <input type="checkbox" name="inherit" value="1" <?php if(@$inherit){ ?>checked="1"<?php } ?> /> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_INHERIT'))) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('inherit') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$inherit){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_INHERIT').'') ?> </span> </label> </div> </div> <?php } ?> <?php $if1=(isset($all_languages)); if($if1) { ?> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <input type="checkbox" name="all_languages" value="1" <?php if(@$all_languages){ ?>checked="1"<?php } ?> /> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_ALL_LANGUAGES'))) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('all_languages') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$all_languages){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_ALL_LANGUAGES').'') ?> </span> </label> </div> </div> <?php } ?> <?php $if1=(isset($writable)); if($if1) { ?> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <input type="checkbox" name="writable" value="1" <?php if(@$writable){ ?>checked="1"<?php } ?> /> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_writable'))) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('writable') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$writable){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_writable').'') ?> </span> </label> </div> </div> <?php } ?> <?php $if1=(isset($width)); if($if1) { ?> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('width'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('width').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="width" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$width)) ?>" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('width') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$width.'') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> <?php } ?> <?php $if1=(isset($height)); if($if1) { ?> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('height'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('height').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="height" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$height)) ?>" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('height') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$height.'') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> <?php } ?> <?php $if1=(isset($dateformat)); if($if1) { ?> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DATEFORMAT'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_DATEFORMAT').'') ?> </span> </div> - <div class="input"> - <select name="dateformat" size="1"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('dateformat') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> <?php foreach($dateformats as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$dateformat){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$dateformat){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> @@ -136,140 +136,140 @@ </div> <?php } ?> <?php $if1=(isset($format)); if($if1) { ?> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_FORMAT'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_FORMAT').'') ?> </span> </div> - <div class="input"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> <?php foreach( $formatlist as $_key=>$_value) { ?> - <label> - <input type="radio" name="format" value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$format){ ?>checked="checked"<?php } ?> /> - <span><?php echo encodeHtml(htmlentities(@$_value)) ?> + <label><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('radio') ?>" name="<?php echo escapeHtml('format') ?>" value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$format){ ?>checked="<?php echo escapeHtml('checked') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$_value.'') ?> </span> </label> - <br /> + <br /><?php echo escapeHtml('') ?> <?php } ?> </div> </div> <?php } ?> <?php $if1=(isset($decimals)); if($if1) { ?> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DECIMALS'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_DECIMALS').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="decimals" type="text" maxlength="2" value="<?php echo encodeHtml(htmlentities(@$decimals)) ?>" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('decimals') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('2') ?>" value="<?php echo escapeHtml(''.@$decimals.'') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> <?php } ?> <?php $if1=(isset($dec_point)); if($if1) { ?> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DEC_POINT'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_DEC_POINT').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="dec_point" type="text" maxlength="5" value="<?php echo encodeHtml(htmlentities(@$dec_point)) ?>" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('dec_point') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('5') ?>" value="<?php echo escapeHtml(''.@$dec_point.'') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> <?php } ?> <?php $if1=(isset($thousand_sep)); if($if1) { ?> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_thousand_sep'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_thousand_sep').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="thousand_sep" type="text" maxlength="1" value="<?php echo encodeHtml(htmlentities(@$thousand_sep)) ?>" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('thousand_sep') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('1') ?>" value="<?php echo escapeHtml(''.@$thousand_sep.'') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> <?php } ?> <?php $if1=(isset($default_text)); if($if1) { ?> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_default_text'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_default_text').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="default_text" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$default_text)) ?>" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('default_text') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('255') ?>" value="<?php echo escapeHtml(''.@$default_text.'') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> <?php } ?> <?php $if1=(isset($default_longtext)); if($if1) { ?> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_default_longtext'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_default_longtext').'') ?> </span> </div> - <div class="input"> - <textarea name="default_longtext" class="inputarea"><?php echo encodeHtml(htmlentities(@$default_longtext)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('default_longtext') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$default_longtext.'') ?> </textarea> </div> </div> <?php } ?> <?php $if1=(isset($parameters)); if($if1) { ?> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DYNAMIC_PARAMETERS'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_DYNAMIC_PARAMETERS').'') ?> </span> </div> - <div class="input"> - <textarea name="parameters" class="inputarea"><?php echo encodeHtml(htmlentities(@$parameters)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('parameters') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$parameters.'') ?> </textarea> </div> </div> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <?php foreach($dynamic_class_parameters as $paramName=>$defaultValue) { ?> - <span><?php echo encodeHtml(htmlentities(@$paramName)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <?php foreach((array)$dynamic_class_parameters as $paramName=>$defaultValue) { ?> + <span><?php echo escapeHtml(''.@$paramName.'') ?> </span> - <span> ( + <span><?php echo escapeHtml(' (') ?> </span> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DEFAULT'))) ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_DEFAULT').'') ?> </span> - <span>) = + <span><?php echo escapeHtml(') = ') ?> </span> - <span><?php echo encodeHtml(htmlentities(@$defaultValue)) ?> + <span><?php echo escapeHtml(''.@$defaultValue.'') ?> </span> - <br /> + <br /><?php echo escapeHtml('') ?> <?php } ?> </div> </div> <?php } ?> <?php $if1=(isset($select_items)); if($if1) { ?> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_select_items'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_select_items').'') ?> </span> </div> - <div class="input"> - <textarea name="select_items" class="inputarea"><?php echo encodeHtml(htmlentities(@$select_items)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('select_items') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$select_items.'') ?> </textarea> </div> </div> <?php } ?> <?php $if1=(isset($linkelement)); if($if1) { ?> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('EL_LINK'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_LINK').'') ?> </span> </div> - <div class="input"> - <select name="linkelement" size="1"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('linkelement') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> <?php foreach($linkelements as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$linkelement){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$linkelement){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> @@ -277,15 +277,15 @@ </div> <?php } ?> <?php $if1=(isset($name)); if($if1) { ?> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('ELEMENT_NAME'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('ELEMENT_NAME').'') ?> </span> </div> - <div class="input"> - <select name="name" size="1"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('name') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> <?php foreach($names as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$name){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$name){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> @@ -293,15 +293,15 @@ </div> <?php } ?> <?php $if1=(isset($folderobjectid)); if($if1) { ?> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DEFAULT_FOLDEROBJECT'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_DEFAULT_FOLDEROBJECT').'') ?> </span> </div> - <div class="input"> - <select name="folderobjectid" size="1"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('folderobjectid') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> <?php foreach($folders as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$folderobjectid){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$folderobjectid){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> @@ -309,17 +309,17 @@ </div> <?php } ?> <?php $if1=(isset($default_objectid)); if($if1) { ?> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DEFAULT_OBJECT'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_DEFAULT_OBJECT').'') ?> </span> </div> - <div class="input"> - <select name="default_objectid" size="1"> - <option value=""><?php echo encodeHtml(htmlentities(@lang('LIST_ENTRY_EMPTY'))) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('default_objectid') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> + <option value="<?php echo escapeHtml('') ?>"><?php echo escapeHtml(''.@lang('LIST_ENTRY_EMPTY').'') ?> </option> <?php foreach($objects as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$default_objectid){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$default_objectid){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> @@ -327,13 +327,13 @@ </div> <?php } ?> <?php $if1=(isset($code)); if($if1) { ?> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_code'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_code').'') ?> </span> </div> - <div class="input"> - <textarea name="code" class="inputarea"><?php echo encodeHtml(htmlentities(@$code)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('code') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$code.'') ?> </textarea> </div> </div> @@ -341,9 +341,9 @@ </div> </fieldset> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/element/advanced.tpl.src.xml b/modules/cms/ui/themes/default/html/views/element/advanced.tpl.src.xml @@ -1,9 +1,9 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <if true="%{security/disable_dynamic_code}"> + <if true="${config:security/disable_dynamic_code}"> <if value="${type}" equals="code" false="true"> <part class="message warn"> - <text key="NOTICE_CODE_DISABLED"/> + <text value="${message:NOTICE_CODE_DISABLED}"/> </part> </if> </if> @@ -12,7 +12,7 @@ <if present="subtype"> <part class="line"> <part class="label"> - <text text="ELEMENT_SUBTYPE"></text> + <text value="${message:ELEMENT_SUBTYPE}"></text> </part> <part class="input"> <if present="subtypes"> @@ -31,7 +31,7 @@ <part class="input"> <checkbox name="with_icon"></checkbox> <label for="with_icon"> - <text text="EL_PROP_WITH_ICON"></text> + <text value="${message:EL_PROP_WITH_ICON}"></text> </label> </part> </part> @@ -43,7 +43,7 @@ <part class="input"> <checkbox name="inherit"></checkbox> <label for="inherit"> - <text text="EL_PROP_INHERIT"></text> + <text value="${message:EL_PROP_INHERIT}"></text> </label> </part> </part> @@ -55,7 +55,7 @@ <part class="input"> <checkbox name="all_languages"></checkbox> <label for="all_languages"> - <text text="EL_PROP_ALL_LANGUAGES"></text> + <text value="${message:EL_PROP_ALL_LANGUAGES}"></text> </label> </part> </part> @@ -67,7 +67,7 @@ <part class="input"> <checkbox name="writable"></checkbox> <label for="writable"> - <text text="EL_PROP_writable"></text> + <text value="${message:EL_PROP_writable}"></text> </label> </part> </part> @@ -75,7 +75,7 @@ <if present="width"> <part class="line"> <part class="label"> - <text text="width"></text> + <text value="${message:width}"></text> </part> <part class="input"> <input size="10" name="width"></input> @@ -86,7 +86,7 @@ <if present="height"> <part class="line"> <part class="label"> - <text text="height"></text> + <text value="${message:height}"></text> </part> <part class="input"> <input size="10" name="height"></input> @@ -96,7 +96,7 @@ <if present="dateformat"> <part class="line"> <part class="label"> - <text text="EL_PROP_DATEFORMAT"></text> + <text value="${message:EL_PROP_DATEFORMAT}"></text> </part> <part class="input"> <selectbox name="dateformat" list="dateformats"></selectbox> @@ -106,7 +106,7 @@ <if present="format"> <part class="line"> <part class="label"> - <text text="EL_PROP_FORMAT"></text> + <text value="${message:EL_PROP_FORMAT}"></text> </part> <part class="input"> <radiobox name="format" list="formatlist"></radiobox> @@ -116,7 +116,7 @@ <if present="decimals"> <part class="line"> <part class="label"> - <text text="EL_PROP_DECIMALS"></text> + <text value="${message:EL_PROP_DECIMALS}"></text> </part> <part class="input"> <input size="10" maxlength="2" name="decimals"></input> @@ -126,7 +126,7 @@ <if present="dec_point"> <part class="line"> <part class="label"> - <text text="EL_PROP_DEC_POINT"></text> + <text value="${message:EL_PROP_DEC_POINT}"></text> </part> <part class="input"> <input size="10" maxlength="5" name="dec_point"></input> @@ -136,7 +136,7 @@ <if present="thousand_sep"> <part class="line"> <part class="label"> - <text text="EL_PROP_thousand_sep"></text> + <text value="${message:EL_PROP_thousand_sep}"></text> </part> <part class="input"> <input size="10" maxlength="1" name="thousand_sep"></input> @@ -146,7 +146,7 @@ <if present="default_text"> <part class="line"> <part class="label"> - <text text="EL_PROP_default_text"></text> + <text value="${message:EL_PROP_default_text}"></text> </part> <part class="input"> <input size="40" maxlength="255" name="default_text"></input> @@ -156,7 +156,7 @@ <if present="default_longtext"> <part class="line"> <part class="label"> - <text text="EL_PROP_default_longtext"></text> + <text value="${message:EL_PROP_default_longtext}"></text> </part> <part class="input"> <inputarea rows="10" name="default_longtext"></inputarea> @@ -166,7 +166,7 @@ <if present="parameters"> <part class="line"> <part class="label"> - <text text="EL_PROP_DYNAMIC_PARAMETERS"></text> + <text value="${message:EL_PROP_DYNAMIC_PARAMETERS}"></text> </part> <part class="input"> <inputarea rows="15" name="parameters"></inputarea> @@ -176,12 +176,12 @@ <part class="label"> </part> <part class="input"> - <list list="dynamic_class_parameters" key="paramName" value="defaultValue"> - <text var="paramName"></text> - <text raw="_("></text> - <text text="GLOBAL_DEFAULT"></text> - <text raw=")_=_"></text> - <text var="defaultValue"></text> + <list list="${dynamic_class_parameters}" key="paramName" value="defaultValue"> + <text value="${paramName}"></text> + <text value=" ("></text> + <text value="${message:GLOBAL_DEFAULT}"></text> + <text value=") = "></text> + <text value="${defaultValue}"></text> <newline></newline> </list> </part> @@ -190,7 +190,7 @@ <if present="select_items"> <part class="line"> <part class="label"> - <text text="EL_PROP_select_items"></text> + <text value="${message:EL_PROP_select_items}"></text> </part> <part class="input"> <inputarea rows="15" cols="40" name="select_items"></inputarea> @@ -200,7 +200,7 @@ <if present="linkelement"> <part class="line"> <part class="label"> - <text text="EL_LINK"></text> + <text value="${message:EL_LINK}"></text> </part> <part class="input"> <selectbox name="linkelement" list="linkelements"></selectbox> @@ -210,7 +210,7 @@ <if present="name"> <part class="line"> <part class="label"> - <text text="ELEMENT_NAME"></text> + <text value="${message:ELEMENT_NAME}"></text> </part> <part class="input"> <selectbox name="name" list="names"></selectbox> @@ -220,7 +220,7 @@ <if present="folderobjectid"> <part class="line"> <part class="label"> - <text text="EL_PROP_DEFAULT_FOLDEROBJECT"></text> + <text value="${message:EL_PROP_DEFAULT_FOLDEROBJECT}"></text> </part> <part class="input"> <selectbox name="folderobjectid" list="folders"></selectbox> @@ -230,7 +230,7 @@ <if present="default_objectid"> <part class="line"> <part class="label"> - <text text="EL_PROP_DEFAULT_OBJECT"></text> + <text value="${message:EL_PROP_DEFAULT_OBJECT}"></text> </part> <part class="input"> <selectbox name="default_objectid" list="objects" @@ -241,7 +241,7 @@ <if present="code"> <part class="line"> <part class="label"> - <text text="EL_PROP_code"></text> + <text value="${message:EL_PROP_code}"></text> </part> <part class="input"> <inputarea name="code" rows="35"></inputarea> diff --git a/modules/cms/ui/themes/default/html/views/element/info.php b/modules/cms/ui/themes/default/html/views/element/info.php @@ -1,42 +1,42 @@ <?php if (defined('OR_TITLE')) { ?> - <div class="or-table-wrapper"> - <div class="or-table-filter"> - <input type="search" name="filter" placeholder="<?php echo encodeHtml(htmlentities(@lang('SEARCH_FILTER'))) ?>" /> + <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> </div> - <div class="or-table-area"> - <table width="100%"> - <tr class="data"> - <td colspan="1"> - <span><?php echo encodeHtml(htmlentities(@lang('type'))) ?> + <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> + <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('type').'') ?> </span> </td> - <td> - <i class="image-icon image-icon--action-el_<?php echo encodeHtml(htmlentities(@$type)) ?>"> + <td><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--action-el_'.@$type.'') ?>"><?php echo escapeHtml('') ?> </i> - <span><?php echo encodeHtml(htmlentities(@lang(''.@$type.''))) ?> + <span><?php echo escapeHtml(''.@lang(''.@$type.'').'') ?> </span> </td> </tr> - <tr class="data"> - <td colspan="1"> - <span><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('name').'') ?> </span> </td> - <td class="clickable"> - <a target="_self" data-type="edit" data-action="element" data-method="prop" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/element/<?php echo encodeHtml(htmlentities(@$id)) ?>"> - <span><?php echo encodeHtml(htmlentities(@$name)) ?> + <td class="<?php echo escapeHtml('clickable') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('edit') ?>" data-action="<?php echo escapeHtml('element') ?>" data-method="<?php echo escapeHtml('prop') ?>" data-id="<?php echo escapeHtml(''.@$id.'') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/element/'.@$id.'') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$name.'') ?> </span> </a> </td> </tr> - <tr class="data"> - <td colspan="1"> - <span><?php echo encodeHtml(htmlentities(@lang('id'))) ?> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('id').'') ?> </span> </td> - <td> - <span><?php echo encodeHtml(htmlentities(@$id)) ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$id.'') ?> </span> </td> </tr> diff --git a/modules/cms/ui/themes/default/html/views/element/info.tpl.src.xml b/modules/cms/ui/themes/default/html/views/element/info.tpl.src.xml @@ -3,29 +3,29 @@ <table> <row class="data"> <column colspan="1"> - <text key="type" /> + <text value="${message:type}" /> </column> <column> <image elementtype="${type}" /> - <text key="${type}" prefix="el_" /> + <text value="${message:${type}}" prefix="el_" /> </column> </row> <row class="data"> <column colspan="1"> - <text key="name" /> + <text value="${message:name}" /> </column> <column class="clickable"> <link class="" type="edit" action="element" subaction="prop" id="${id}"> - <text var="name" /> + <text value="${name}" /> </link> </column> </row> <row class="data"> <column colspan="1"> - <text key="id" /> + <text value="${message:id}" /> </column> <column> - <text var="id" /> + <text value="${id}" /> </column> </row> </table> diff --git a/modules/cms/ui/themes/default/html/views/element/name.php b/modules/cms/ui/themes/default/html/views/element/name.php @@ -1,43 +1,43 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="name" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form element"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="element" /> - <input type="hidden" name="subaction" value="name" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('name') ?>" data-action="<?php echo escapeHtml('element') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form element') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('element') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('name') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('ELEMENT_NAME'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('ELEMENT_NAME').'') ?> </span> </td> - <td> - <div class="inputholder"> - <input name="name" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" /> + <td><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('name') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$name.'') ?>" /><?php echo escapeHtml('') ?> </div> </td> </tr> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DESCRIPTION'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_DESCRIPTION').'') ?> </span> </td> - <td> - <textarea name="description" class="inputarea"><?php echo encodeHtml(htmlentities(@$description)) ?> + <td><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('description') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$description.'') ?> </textarea> </td> </tr> - <tr> - <td colspan="2" class="act"> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> </td> </tr> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> diff --git a/modules/cms/ui/themes/default/html/views/element/name.tpl.src.xml b/modules/cms/ui/themes/default/html/views/element/name.tpl.src.xml @@ -5,7 +5,7 @@ <window name="GLOBAL_NAME"> <row> <column> - <text text="ELEMENT_NAME"></text> + <text value="${message:ELEMENT_NAME}"></text> </column> <column> <input name="name"></input> @@ -13,7 +13,7 @@ </row> <row> <column> - <text text="GLOBAL_DESCRIPTION"></text> + <text value="${message:GLOBAL_DESCRIPTION}"></text> </column> <column> <inputarea name="description" rows="5" cols="50"></inputarea> diff --git a/modules/cms/ui/themes/default/html/views/element/prop.php b/modules/cms/ui/themes/default/html/views/element/prop.php @@ -1,58 +1,58 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form element"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="element" /> - <input type="hidden" name="subaction" value="prop" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <fieldset class="or-group toggle-open-close open show"> - <div class="closable"> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('LABEL'))) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('prop') ?>" data-action="<?php echo escapeHtml('element') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form element') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('element') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('prop') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('LABEL').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="label" required="required" autofocus="autofocus" type="text" maxlength="100" value="<?php echo encodeHtml(htmlentities(@$label)) ?>" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('label') ?>" required="<?php echo escapeHtml('required') ?>" autofocus="<?php echo escapeHtml('autofocus') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('100') ?>" value="<?php echo escapeHtml(''.@$label.'') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('NAME'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('NAME').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="name" required="required" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('name') ?>" required="<?php echo escapeHtml('required') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('50') ?>" value="<?php echo escapeHtml(''.@$name.'') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DESCRIPTION'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_DESCRIPTION').'') ?> </span> </div> - <div class="input"> - <textarea name="description" maxlength="255" class="inputarea"><?php echo encodeHtml(htmlentities(@$description)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('description') ?>" maxlength="<?php echo escapeHtml('255') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$description.'') ?> </textarea> </div> </div> </div> </fieldset> - <fieldset class="or-group toggle-open-close open show"> - <div class="closable"> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('ELEMENT_TYPE'))) ?> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('ELEMENT_TYPE').'') ?> </span> </div> - <div class="input"> - <select name="typeid" size="1"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('typeid') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> <?php foreach($types as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$typeid){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$typeid){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> @@ -61,9 +61,9 @@ </div> </fieldset> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/element/prop.tpl.src.xml b/modules/cms/ui/themes/default/html/views/element/prop.tpl.src.xml @@ -8,7 +8,7 @@ <part class="line"> <part class="label"> - <text key="LABEL"></text> + <text value="${message:LABEL}"></text> </part> <part class="input"> <input name="label" focus="true" required="true" maxlength="100"/> @@ -17,7 +17,7 @@ <part class="line"> <part class="label"> - <text key="NAME"></text> + <text value="${message:NAME}"></text> </part> <part class="input"> <input name="name" required="true" maxlength="50"/> @@ -26,7 +26,7 @@ <part class="line"> <part class="label"> - <text text="GLOBAL_DESCRIPTION"></text> + <text value="${message:GLOBAL_DESCRIPTION}"></text> </part> <part class="input"> <inputarea name="description" rows="5" maxlength="255"></inputarea> @@ -37,7 +37,7 @@ <group open="true"> <part class="line"> <part class="label"> - <text text="ELEMENT_TYPE"></text> + <text value="${message:ELEMENT_TYPE}"></text> </part> <part class="input"> <selectbox name="typeid" list="types" lang="true"></selectbox> diff --git a/modules/cms/ui/themes/default/html/views/element/properties.php b/modules/cms/ui/themes/default/html/views/element/properties.php @@ -1,107 +1,107 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="properties" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form element"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="element" /> - <input type="hidden" name="subaction" value="properties" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('properties') ?>" data-action="<?php echo escapeHtml('element') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form element') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('element') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('properties') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> <?php $if1=(isset($subtype)); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('ELEMENT_SUBTYPE'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('ELEMENT_SUBTYPE').'') ?> </span> </td> - <td> + <td><?php echo escapeHtml('') ?> <?php $if1=(isset($subtypes)); if($if1) { ?> - <select name="subtype" size="1"> - <option value=""><?php echo encodeHtml(htmlentities(@lang('LIST_ENTRY_EMPTY'))) ?> + <select name="<?php echo escapeHtml('subtype') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> + <option value="<?php echo escapeHtml('') ?>"><?php echo escapeHtml(''.@lang('LIST_ENTRY_EMPTY').'') ?> </option> <?php foreach($subtypes as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$subtype){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$subtype){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> <?php } ?> <?php $if1=!(isset($subtypes)); if($if1) { ?> - <div class="inputholder"> - <input name="subtype" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$subtype)) ?>" /> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('subtype') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$subtype.'') ?>" /><?php echo escapeHtml('') ?> </div> <?php } ?> </td> </tr> <?php } ?> <?php $if1=(isset($with_icon)); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_WITH_ICON'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_WITH_ICON').'') ?> </span> </td> - <td> - <input type="checkbox" name="with_icon" value="1" <?php if(@$with_icon){ ?>checked="1"<?php } ?> /> + <td><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('with_icon') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$with_icon){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> </td> </tr> <?php } ?> <?php $if1=(isset($all_languages)); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_ALL_LANGUAGES'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_ALL_LANGUAGES').'') ?> </span> </td> - <td> - <input type="checkbox" name="all_languages" value="1" <?php if(@$all_languages){ ?>checked="1"<?php } ?> /> + <td><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('all_languages') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$all_languages){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> </td> </tr> <?php } ?> <?php $if1=(isset($writable)); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_writable'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_writable').'') ?> </span> </td> - <td> - <input type="checkbox" name="writable" value="1" <?php if(@$writable){ ?>checked="1"<?php } ?> /> + <td><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('writable') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$writable){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> </td> </tr> <?php } ?> <?php $if1=(isset($width)); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('width'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('width').'') ?> </span> </td> - <td> - <div class="inputholder"> - <input name="width" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$width)) ?>" /> + <td><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('width') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$width.'') ?>" /><?php echo escapeHtml('') ?> </div> </td> </tr> <?php } ?> <?php $if1=(isset($height)); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('height'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('height').'') ?> </span> </td> - <td> - <div class="inputholder"> - <input name="height" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$height)) ?>" /> + <td><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('height') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$height.'') ?>" /><?php echo escapeHtml('') ?> </div> </td> </tr> <?php } ?> <?php $if1=(isset($dateformat)); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DATEFORMAT'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_DATEFORMAT').'') ?> </span> </td> - <td> - <select name="dateformat" size="1"> + <td><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('dateformat') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> <?php foreach($dateformats as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$dateformat){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$dateformat){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> @@ -109,140 +109,140 @@ </tr> <?php } ?> <?php $if1=(isset($format)); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_FORMAT'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_FORMAT').'') ?> </span> </td> - <td> + <td><?php echo escapeHtml('') ?> <?php foreach( $formatlist as $_key=>$_value) { ?> - <label> - <input type="radio" name="format" value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$format){ ?>checked="checked"<?php } ?> /> - <span><?php echo encodeHtml(htmlentities(@$_value)) ?> + <label><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('radio') ?>" name="<?php echo escapeHtml('format') ?>" value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$format){ ?>checked="<?php echo escapeHtml('checked') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$_value.'') ?> </span> </label> - <br /> + <br /><?php echo escapeHtml('') ?> <?php } ?> </td> </tr> <?php } ?> <?php $if1=(isset($decimals)); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DECIMALS'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_DECIMALS').'') ?> </span> </td> - <td> - <div class="inputholder"> - <input name="decimals" type="text" maxlength="2" value="<?php echo encodeHtml(htmlentities(@$decimals)) ?>" /> + <td><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('decimals') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('2') ?>" value="<?php echo escapeHtml(''.@$decimals.'') ?>" /><?php echo escapeHtml('') ?> </div> </td> </tr> <?php } ?> <?php $if1=(isset($dec_point)); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DEC_POINT'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_DEC_POINT').'') ?> </span> </td> - <td> - <div class="inputholder"> - <input name="dec_point" type="text" maxlength="5" value="<?php echo encodeHtml(htmlentities(@$dec_point)) ?>" /> + <td><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('dec_point') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('5') ?>" value="<?php echo escapeHtml(''.@$dec_point.'') ?>" /><?php echo escapeHtml('') ?> </div> </td> </tr> <?php } ?> <?php $if1=(isset($thousand_sep)); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_thousand_sep'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_thousand_sep').'') ?> </span> </td> - <td> - <div class="inputholder"> - <input name="thousand_sep" type="text" maxlength="1" value="<?php echo encodeHtml(htmlentities(@$thousand_sep)) ?>" /> + <td><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('thousand_sep') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('1') ?>" value="<?php echo escapeHtml(''.@$thousand_sep.'') ?>" /><?php echo escapeHtml('') ?> </div> </td> </tr> <?php } ?> <?php $if1=(isset($default_text)); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_default_text'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_default_text').'') ?> </span> </td> - <td> - <div class="inputholder"> - <input name="default_text" type="text" maxlength="255" value="<?php echo encodeHtml(htmlentities(@$default_text)) ?>" /> + <td><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('default_text') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('255') ?>" value="<?php echo escapeHtml(''.@$default_text.'') ?>" /><?php echo escapeHtml('') ?> </div> </td> </tr> <?php } ?> <?php $if1=(isset($default_longtext)); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_default_longtext'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_default_longtext').'') ?> </span> </td> - <td> - <textarea name="default_longtext" class="inputarea"><?php echo encodeHtml(htmlentities(@$default_longtext)) ?> + <td><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('default_longtext') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$default_longtext.'') ?> </textarea> </td> </tr> <?php } ?> <?php $if1=(isset($parameters)); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DYNAMIC_PARAMETERS'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_DYNAMIC_PARAMETERS').'') ?> </span> </td> - <td> - <textarea name="parameters" class="inputarea"><?php echo encodeHtml(htmlentities(@$parameters)) ?> + <td><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('parameters') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$parameters.'') ?> </textarea> </td> </tr> - <tr> - <td> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> </td> - <td> - <?php foreach($dynamic_class_parameters as $paramName=>$defaultValue) { ?> - <span><?php echo encodeHtml(htmlentities(@$paramName)) ?> + <td><?php echo escapeHtml('') ?> + <?php foreach((array)$dynamic_class_parameters as $paramName=>$defaultValue) { ?> + <span><?php echo escapeHtml(''.@$paramName.'') ?> </span> - <span> ( + <span><?php echo escapeHtml(' (') ?> </span> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DEFAULT'))) ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_DEFAULT').'') ?> </span> - <span>) = + <span><?php echo escapeHtml(') = ') ?> </span> - <span><?php echo encodeHtml(htmlentities(@$defaultValue)) ?> + <span><?php echo escapeHtml(''.@$defaultValue.'') ?> </span> - <br /> + <br /><?php echo escapeHtml('') ?> <?php } ?> </td> </tr> <?php } ?> <?php $if1=(isset($select_items)); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_select_items'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_select_items').'') ?> </span> </td> - <td> - <textarea name="select_items" class="inputarea"><?php echo encodeHtml(htmlentities(@$select_items)) ?> + <td><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('select_items') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$select_items.'') ?> </textarea> </td> </tr> <?php } ?> <?php $if1=(isset($linkelement)); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('EL_LINK'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_LINK').'') ?> </span> </td> - <td> - <select name="linkelement" size="1"> + <td><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('linkelement') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> <?php foreach($linkelements as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$linkelement){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$linkelement){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> @@ -250,15 +250,15 @@ </tr> <?php } ?> <?php $if1=(isset($name)); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('ELEMENT_NAME'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('ELEMENT_NAME').'') ?> </span> </td> - <td> - <select name="name" size="1"> + <td><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('name') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> <?php foreach($names as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$name){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$name){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> @@ -266,15 +266,15 @@ </tr> <?php } ?> <?php $if1=(isset($folderobjectid)); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DEFAULT_FOLDEROBJECT'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_DEFAULT_FOLDEROBJECT').'') ?> </span> </td> - <td> - <select name="folderobjectid" size="1"> + <td><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('folderobjectid') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> <?php foreach($folders as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$folderobjectid){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$folderobjectid){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> @@ -282,17 +282,17 @@ </tr> <?php } ?> <?php $if1=(isset($default_objectid)); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_DEFAULT_OBJECT'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_DEFAULT_OBJECT').'') ?> </span> </td> - <td> - <select name="default_objectid" size="1"> - <option value=""><?php echo encodeHtml(htmlentities(@lang('LIST_ENTRY_EMPTY'))) ?> + <td><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('default_objectid') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> + <option value="<?php echo escapeHtml('') ?>"><?php echo escapeHtml(''.@lang('LIST_ENTRY_EMPTY').'') ?> </option> <?php foreach($objects as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$default_objectid){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$default_objectid){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> @@ -300,26 +300,26 @@ </tr> <?php } ?> <?php $if1=(isset($code)); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('EL_PROP_code'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('EL_PROP_code').'') ?> </span> </td> - <td> - <textarea name="code" class="inputarea"><?php echo encodeHtml(htmlentities(@$code)) ?> + <td><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('code') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml(''.@$code.'') ?> </textarea> </td> </tr> <?php } ?> - <tr> - <td colspan="2" class="act"> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> </td> </tr> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> diff --git a/modules/cms/ui/themes/default/html/views/element/properties.tpl.src.xml b/modules/cms/ui/themes/default/html/views/element/properties.tpl.src.xml @@ -6,7 +6,7 @@ <if present="subtype"> <row> <column> - <text text="ELEMENT_SUBTYPE"></text> + <text value="${message:ELEMENT_SUBTYPE}"></text> </column> <column> <if present="subtypes"> @@ -21,7 +21,7 @@ <if present="with_icon"> <row> <column> - <text text="EL_PROP_WITH_ICON"></text> + <text value="${message:EL_PROP_WITH_ICON}"></text> </column> <column> <checkbox name="with_icon"></checkbox> @@ -31,7 +31,7 @@ <if present="all_languages"> <row> <column> - <text text="EL_PROP_ALL_LANGUAGES"></text> + <text value="${message:EL_PROP_ALL_LANGUAGES}"></text> </column> <column> <checkbox name="all_languages"></checkbox> @@ -41,7 +41,7 @@ <if present="writable"> <row> <column> - <text text="EL_PROP_writable"></text> + <text value="${message:EL_PROP_writable}"></text> </column> <column> <checkbox name="writable"></checkbox> @@ -51,7 +51,7 @@ <if present="width"> <row> <column> - <text text="width"></text> + <text value="${message:width}"></text> </column> <column> <input size="10" name="width"></input> @@ -61,7 +61,7 @@ <if present="height"> <row> <column> - <text text="height"></text> + <text value="${message:height}"></text> </column> <column> <input size="10" name="height"></input> @@ -71,7 +71,7 @@ <if present="dateformat"> <row> <column> - <text text="EL_PROP_DATEFORMAT"></text> + <text value="${message:EL_PROP_DATEFORMAT}"></text> </column> <column> <selectbox name="dateformat" list="dateformats"></selectbox> @@ -81,7 +81,7 @@ <if present="format"> <row> <column> - <text text="EL_PROP_FORMAT"></text> + <text value="${message:EL_PROP_FORMAT}"></text> </column> <column> <radiobox name="format" list="formatlist"></radiobox> @@ -91,7 +91,7 @@ <if present="decimals"> <row> <column> - <text text="EL_PROP_DECIMALS"></text> + <text value="${message:EL_PROP_DECIMALS}"></text> </column> <column> <input size="10" maxlength="2" name="decimals"></input> @@ -101,7 +101,7 @@ <if present="dec_point"> <row> <column> - <text text="EL_PROP_DEC_POINT"></text> + <text value="${message:EL_PROP_DEC_POINT}"></text> </column> <column> <input size="10" maxlength="5" name="dec_point"></input> @@ -111,7 +111,7 @@ <if present="thousand_sep"> <row> <column> - <text text="EL_PROP_thousand_sep"></text> + <text value="${message:EL_PROP_thousand_sep}"></text> </column> <column> <input size="10" maxlength="1" name="thousand_sep"></input> @@ -121,7 +121,7 @@ <if present="default_text"> <row> <column> - <text text="EL_PROP_default_text"></text> + <text value="${message:EL_PROP_default_text}"></text> </column> <column> <input size="40" maxlength="255" name="default_text"></input> @@ -131,7 +131,7 @@ <if present="default_longtext"> <row> <column> - <text text="EL_PROP_default_longtext"></text> + <text value="${message:EL_PROP_default_longtext}"></text> </column> <column> <inputarea rows="10" cols="40" name="default_longtext"></inputarea> @@ -141,7 +141,7 @@ <if present="parameters"> <row> <column> - <text text="EL_PROP_DYNAMIC_PARAMETERS"></text> + <text value="${message:EL_PROP_DYNAMIC_PARAMETERS}"></text> </column> <column> <inputarea rows="15" cols="40" name="parameters"></inputarea> @@ -150,12 +150,12 @@ <row> <column></column> <column> - <list list="dynamic_class_parameters" key="paramName" value="defaultValue"> - <text var="paramName"></text> - <text raw="_("></text> - <text text="GLOBAL_DEFAULT"></text> - <text raw=")_=_"></text> - <text var="defaultValue"></text> + <list list="${dynamic_class_parameters}" key="paramName" value="defaultValue"> + <text value="${paramName}"></text> + <text value=" ("></text> + <text value="${message:GLOBAL_DEFAULT}"></text> + <text value=") = "></text> + <text value="${defaultValue}"></text> <newline></newline> </list> </column> @@ -164,7 +164,7 @@ <if present="select_items"> <row> <column> - <text text="EL_PROP_select_items"></text> + <text value="${message:EL_PROP_select_items}"></text> </column> <column> <inputarea rows="15" cols="40" name="select_items"></inputarea> @@ -174,7 +174,7 @@ <if present="linkelement"> <row> <column> - <text text="EL_LINK"></text> + <text value="${message:EL_LINK}"></text> </column> <column> <selectbox name="linkelement" list="linkelements"></selectbox> @@ -184,7 +184,7 @@ <if present="name"> <row> <column> - <text text="ELEMENT_NAME"></text> + <text value="${message:ELEMENT_NAME}"></text> </column> <column> <selectbox name="name" list="names"></selectbox> @@ -194,7 +194,7 @@ <if present="folderobjectid"> <row> <column> - <text text="EL_PROP_DEFAULT_FOLDEROBJECT"></text> + <text value="${message:EL_PROP_DEFAULT_FOLDEROBJECT}"></text> </column> <column> <selectbox name="folderobjectid" list="folders"></selectbox> @@ -204,7 +204,7 @@ <if present="default_objectid"> <row> <column> - <text text="EL_PROP_DEFAULT_OBJECT"></text> + <text value="${message:EL_PROP_DEFAULT_OBJECT}"></text> </column> <column> <selectbox name="default_objectid" list="objects" @@ -215,7 +215,7 @@ <if present="code"> <row> <column> - <text text="EL_PROP_code"></text> + <text value="${message:EL_PROP_code}"></text> </column> <column> <inputarea name="code" rows="35" cols="60"></inputarea> diff --git a/modules/cms/ui/themes/default/html/views/element/remove.php b/modules/cms/ui/themes/default/html/views/element/remove.php @@ -1,63 +1,63 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="element" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form element"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="element" /> - <input type="hidden" name="subaction" value="remove" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <fieldset class="or-group toggle-open-close open show"> - <div class="closable"> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('ELEMENT_NAME'))) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('remove') ?>" data-action="<?php echo escapeHtml('element') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form element') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('element') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('remove') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('ELEMENT_NAME').'') ?> </span> </div> - <div class="input"> - <span class="name"><?php echo encodeHtml(htmlentities(@$name)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('name') ?>"><?php echo escapeHtml(''.@$name.'') ?> </span> </div> </div> </div> </fieldset> - <fieldset class="or-group toggle-open-close open show"> - <legend class="on-click-open-close"><?php echo encodeHtml(htmlentities(@lang('options'))) ?> - <img /> - <div class="arrow arrow-right on-closed"> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('options').'') ?> + <img /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> </div> - <div class="arrow arrow-down on-open"> + <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> </div> </legend> - <div class="closable"> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <input type="checkbox" name="confirm" value="1" <?php if(@$confirm){ ?>checked="1"<?php } ?> required="required" /> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('CONFIRM_DELETE'))) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('confirm') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$confirm){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> required="<?php echo escapeHtml('required') ?>" /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('CONFIRM_DELETE').'') ?> </span> </label> </div> </div> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <span> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(' ') ?> </span> - <input type="radio" name="type" disabled="" value="value" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" /> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('ELEMENT_DELETE_VALUES'))) ?> + <input type="<?php echo escapeHtml('radio') ?>" name="<?php echo escapeHtml('type') ?>" value="<?php echo escapeHtml('value') ?>" checked="<?php echo escapeHtml(''.@$type.'') ?>" /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('ELEMENT_DELETE_VALUES').'') ?> </span> </label> - <br /> - <span> + <br /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(' ') ?> </span> - <input type="radio" name="type" disabled="" value="all" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" /> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('DELETE'))) ?> + <input type="<?php echo escapeHtml('radio') ?>" name="<?php echo escapeHtml('type') ?>" value="<?php echo escapeHtml('all') ?>" checked="<?php echo escapeHtml(''.@$type.'') ?>" /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('DELETE').'') ?> </span> </label> </div> @@ -65,9 +65,9 @@ </div> </fieldset> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/element/remove.tpl.src.xml b/modules/cms/ui/themes/default/html/views/element/remove.tpl.src.xml @@ -5,14 +5,14 @@ <group> <part class="line"> <part class="label"> - <text key="ELEMENT_NAME"></text> + <text value="${message:ELEMENT_NAME}"></text> </part> <part class="input"> - <text var="name" class="name"></text> + <text value="${name}" class="name"></text> </part> </part> </group> - <group title="#{options}"> + <group title="${message:options}"> <part class="line"> <part class="label"> @@ -20,7 +20,7 @@ <part class="input"> <checkbox name="confirm" required="true"></checkbox> <label for="confirm"> - <text text="CONFIRM_DELETE"></text> + <text value="${message:CONFIRM_DELETE}"></text> </label> </part> </part> @@ -29,16 +29,16 @@ <part class="label"> </part> <part class="input"> - <text raw="_____"></text> + <text value=" "></text> <radio name="type" value="value"></radio> <label for="type_value"> - <text text="ELEMENT_DELETE_VALUES"></text> + <text value="${message:ELEMENT_DELETE_VALUES}"></text> </label> <newline></newline> - <text raw="_____"></text> + <text value=" "></text> <radio name="type" value="all"></radio> <label for="type_all"> - <text text="DELETE"></text> + <text value="${message:DELETE}"></text> </label> </part> </part> diff --git a/modules/cms/ui/themes/default/html/views/file/advanced.php b/modules/cms/ui/themes/default/html/views/file/advanced.php @@ -1,30 +1,30 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="advanced" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="file" /> - <input type="hidden" name="subaction" value="advanced" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <label class="or-form-row or-form-input"> - <span class="or-form-label">file_extension + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('advanced') ?>" data-action="<?php echo escapeHtml('file') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form file') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('file') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('advanced') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('or-form-row or-form-input') ?>"><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('or-form-label') ?>"><?php echo escapeHtml('file_extension') ?> </span> - <input name="extension" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$extension)) ?>" class="extension" /> + <input name="<?php echo escapeHtml('extension') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$extension.'') ?>" class="<?php echo escapeHtml('extension') ?>" /><?php echo escapeHtml('') ?> </label> - <label class="or-form-row or-form-input"> - <span class="or-form-label">type + <label class="<?php echo escapeHtml('or-form-row or-form-input') ?>"><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('or-form-label') ?>"><?php echo escapeHtml('type') ?> </span> - <select name="type" size="1"> + <select name="<?php echo escapeHtml('type') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> <?php foreach($types as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$type){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$type){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> </label> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/file/compress.php b/modules/cms/ui/themes/default/html/views/file/compress.php @@ -1,45 +1,45 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="compress" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="file" /> - <input type="hidden" name="subaction" value="compress" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <fieldset class="or-group toggle-open-close open show"> - <legend class="on-click-open-close"><?php echo encodeHtml(htmlentities(@lang('OPTIONS'))) ?> - <img /> - <div class="arrow arrow-right on-closed"> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('compress') ?>" data-action="<?php echo escapeHtml('file') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form file') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('file') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('compress') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('OPTIONS').'') ?> + <img /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> </div> - <div class="arrow arrow-down on-open"> + <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> </div> </legend> - <div class="closable"> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('type'))) ?> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('type').'') ?> </span> </div> - <div class="input"> - <?php { $gz= 'gz'; ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <?php { $gz= gz; ?> <?php } ?> - <select name="format" size="1"> + <select name="<?php echo escapeHtml('format') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> <?php foreach($formats as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key=='gz'){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==gz){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> - <?php { $replace= '1'; ?> + <?php { $replace= 1; ?> <?php } ?> - <input type="radio" name="replace" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" /> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('replace'))) ?> + <input type="<?php echo escapeHtml('radio') ?>" name="<?php echo escapeHtml('replace') ?>" value="<?php echo escapeHtml('1') ?>" checked="<?php echo escapeHtml(''.@$replace.'') ?>" /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('replace').'') ?> </span> </label> - <br /> - <input type="radio" name="replace" disabled="" value="0" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" /> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + <br /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('radio') ?>" name="<?php echo escapeHtml('replace') ?>" value="<?php echo escapeHtml('') ?>" checked="<?php echo escapeHtml(''.@$replace.'') ?>" /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('new').'') ?> </span> </label> </div> @@ -47,9 +47,9 @@ </div> </fieldset> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/file/compress.tpl.src.xml b/modules/cms/ui/themes/default/html/views/file/compress.tpl.src.xml @@ -1,10 +1,10 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <form> - <group title="#{OPTIONS}"> + <group title="${message:OPTIONS}"> <part class="line"> <part class="label"> - <text text="type"></text> + <text value="${message:type}"></text> </part> <part class="input"> <set var="gz" value="gz"></set> @@ -12,12 +12,12 @@ <set var="replace" value="1"></set> <radio name="replace" value="1"></radio> <label for="replace_1"> - <text key="replace"></text> + <text value="${message:replace}"></text> </label> <newline></newline> <radio name="replace" value="0"></radio> <label for="replace_0"> - <text key="new"></text> + <text value="${message:new}"></text> </label> </part> </part> diff --git a/modules/cms/ui/themes/default/html/views/file/edit.php b/modules/cms/ui/themes/default/html/views/file/edit.php @@ -1,32 +1,32 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> - <input type="hidden" name="languageid" value="<?php echo encodeHtml(htmlentities(@$languageid)) ?>" /> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="file" /> - <input type="hidden" name="subaction" value="edit" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <div class="line"> - <div class="label"> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('edit') ?>" data-action="<?php echo escapeHtml('file') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form file') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('languageid') ?>" value="<?php echo escapeHtml(''.@$languageid.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('file') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('edit') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <br /> - <input id="req0_file" name="file" size="40" class="upload" /> - <br /> - <br /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <br /><?php echo escapeHtml('') ?> + <input id="<?php echo escapeHtml('req0_file') ?>" name="<?php echo escapeHtml('file') ?>" size="<?php echo escapeHtml('40') ?>" class="<?php echo escapeHtml('upload') ?>" /><?php echo escapeHtml('') ?> + <br /><?php echo escapeHtml('') ?> + <br /><?php echo escapeHtml('') ?> </div> </div> - <div class="line or-dropzone-upload"> - <div class="label"> + <div class="<?php echo escapeHtml('line or-dropzone-upload') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> </div> </div> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/file/extract.php b/modules/cms/ui/themes/default/html/views/file/extract.php @@ -1,22 +1,22 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="extract" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="file" /> - <input type="hidden" name="subaction" value="extract" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('extract') ?>" data-action="<?php echo escapeHtml('file') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form file') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('file') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('extract') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> - <tr> - <td colspan="2" class="act"> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> </td> </tr> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/file/extract.tpl.src.xml b/modules/cms/ui/themes/default/html/views/file/extract.tpl.src.xml @@ -1,3 +1,15 @@ <output xmlns="http://www.openrat.de/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"><dummy><form><window name="asdf" title="asdfdfs"><row><column colspan="2" class="act"><button type="ok"></button></column></row></window></form></dummy></output>- \ No newline at end of file + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + <dummy> + <form> + <window name="asdf" title="asdfdfs"> + <row> + <column colspan="2" class="act"> + <button type="ok"></button> + </column> + </row> + </window> + </form> + </dummy> +</output>+ \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/file/info.php b/modules/cms/ui/themes/default/html/views/file/info.php @@ -1,153 +1,153 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="file" /> - <input type="hidden" name="subaction" value="info" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <fieldset class="or-group toggle-open-close open show"> - <div class="closable"> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_name'))) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('info') ?>" data-action="<?php echo escapeHtml('file') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form file') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('file') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('info') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_name').'') ?> </span> </div> - <div class="input"> - <span class="name"><?php echo encodeHtml(htmlentities(@$name)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('name') ?>"><?php echo escapeHtml(''.@$name.'') ?> </span> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_filename'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_filename').'') ?> </span> </div> - <div class="input"> - <span class="filename"><?php echo encodeHtml(htmlentities(@$filename)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('filename') ?>"><?php echo escapeHtml(''.@$filename.'') ?> </span> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('file_extension'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('file_extension').'') ?> </span> </div> - <div class="input"> - <span class="extension"><?php echo encodeHtml(htmlentities(@$extension)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('extension') ?>"><?php echo escapeHtml(''.@$extension.'') ?> </span> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_description'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_description').'') ?> </span> </div> - <div class="input"> - <span><?php echo encodeHtml(htmlentities(@$description)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$description.'') ?> </span> </div> </div> </div> </fieldset> - <fieldset class="or-group toggle-open-close open show"> - <legend class="on-click-open-close"><?php echo encodeHtml(htmlentities(@lang('additional_info'))) ?> - <img /> - <div class="arrow arrow-right on-closed"> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('additional_info').'') ?> + <img /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> </div> - <div class="arrow arrow-down on-open"> + <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> </div> </legend> - <div class="closable"> - <div class="line"> - <div class="label"> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_full_filename'))) ?> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_full_filename').'') ?> </span> </label> </div> - <div class="input"> - <span><?php echo encodeHtml(htmlentities(@$full_filename)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$full_filename.'') ?> </span> </div> </div> - <div class="line"> - <div class="label"> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('FILE_SIZE'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('FILE_SIZE').'') ?> </span> </label> </div> - <div class="input"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> </div> - <span><?php echo encodeHtml(htmlentities(@$size)) ?> + <span><?php echo escapeHtml(''.@$size.'') ?> </span> </div> - <div class="line"> - <div class="label"> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('FILE_mimetype'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('FILE_mimetype').'') ?> </span> </label> </div> - <div class="input"> - <span><?php echo encodeHtml(htmlentities(@$mimetype)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$mimetype.'') ?> </span> - <br /> - <a target="_self" data-action="file" data-method="size" data-id="" data-extra="[]" href="/#/file/" class="action"> - <span><?php echo encodeHtml(htmlentities(@lang('menu_file_size'))) ?> + <br /><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-action="<?php echo escapeHtml('file') ?>" data-method="<?php echo escapeHtml('size') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/file/') ?>" class="<?php echo escapeHtml('action') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('menu_file_size').'') ?> </span> </a> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('#{id'))) ?>} + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang(''.@lang('id').'').'') ?> </span> </div> - <div class="input"> - <span><?php echo encodeHtml(htmlentities(@$objectid)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$objectid.'') ?> </span> </div> </div> <?php $if1=(isset($cache_filename)); if($if1) { ?> - <div class="line"> - <div class="label"> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('CACHE_FILENAME'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('CACHE_FILENAME').'') ?> </span> </label> </div> - <div class="input"> - <span><?php echo encodeHtml(htmlentities(@$cache_filename)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$cache_filename.'') ?> </span> - <br /> - <img src="./modules/cms/ui/themes/default/images/icon/el_date.png" /> + <br /><?php echo escapeHtml('') ?> + <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon/el_date.png') ?>" /><?php echo escapeHtml('') ?> <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($cache_filemtime); ?> <?php } ?> </div> </div> <?php } ?> - <div class="line"> - <div class="label"> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('FILE_PAGES'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('FILE_PAGES').'') ?> </span> </label> </div> - <div class="input"> - <div class="or-table-wrapper"> - <div class="or-table-filter"> - <input type="search" name="filter" placeholder="<?php echo encodeHtml(htmlentities(@lang('SEARCH_FILTER'))) ?>" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> </div> - <div class="or-table-area"> - <table width="100%"> - <?php foreach($pages as $list_key=>$list_value) { extract($list_value); ?> - <tr> - <td> - <a target="_self" data-url="<?php echo encodeHtml(htmlentities(@$url)) ?>" data-action="" data-method="" data-id="" data-extra="[]" href="/#//"> - <img src="./modules/cms/ui/themes/default/images/icon_page.png" /> - <span><?php echo encodeHtml(htmlentities(@$name)) ?> + <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> + <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> + <?php foreach((array)$pages as $list_key=>$list_value) { extract($list_value); ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-url="<?php echo escapeHtml(''.@$url.'') ?>" data-action="<?php echo escapeHtml('') ?>" data-method="<?php echo escapeHtml('') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#//') ?>"><?php echo escapeHtml('') ?> + <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon_page.png') ?>" /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$name.'') ?> </span> </a> </td> @@ -157,70 +157,70 @@ </div> </div> <?php $if1=(($pages)==FALSE); if($if1) { ?> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_NOT_FOUND').'') ?> </span> <?php } ?> </div> </div> </div> </fieldset> - <fieldset class="or-group toggle-open-close open show"> - <legend class="on-click-open-close"><?php echo encodeHtml(htmlentities(@lang('prop_userinfo'))) ?> - <img /> - <div class="arrow arrow-right on-closed"> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('prop_userinfo').'') ?> + <img /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> </div> - <div class="arrow arrow-down on-open"> + <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> </div> </legend> - <div class="closable"> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_created'))) ?> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_created').'') ?> </span> </div> - <div class="input"> - <i class="image-icon image-icon--action-el_date"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--action-el_date') ?>"><?php echo escapeHtml('') ?> </i> <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($create_date); ?> <?php } ?> - <br /> - <i class="image-icon image-icon--action-user"> + <br /><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--action-user') ?>"><?php echo escapeHtml('') ?> </i> <?php include_once( 'modules/template_engine/components/html/user/component-user.php'); { component_user($create_user); ?> <?php } ?> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_lastchange'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_lastchange').'') ?> </span> </div> - <div class="input"> - <i class="image-icon image-icon--action-el_date"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--action-el_date') ?>"><?php echo escapeHtml('') ?> </i> <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($lastchange_date); ?> <?php } ?> - <br /> - <i class="image-icon image-icon--action-user"> + <br /><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--action-user') ?>"><?php echo escapeHtml('') ?> </i> <?php include_once( 'modules/template_engine/components/html/user/component-user.php'); { component_user($lastchange_user); ?> <?php } ?> </div> </div> - <div class="line"> - <div class="label"> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_published'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_published').'') ?> </span> </label> </div> - <div class="input"> - <i class="image-icon image-icon--action-el_date"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--action-el_date') ?>"><?php echo escapeHtml('') ?> </i> <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($published_date); ?> <?php } ?> - <br /> - <i class="image-icon image-icon--action-user"> + <br /><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--action-user') ?>"><?php echo escapeHtml('') ?> </i> <?php include_once( 'modules/template_engine/components/html/user/component-user.php'); { component_user($published_user); ?> <?php } ?> @@ -229,8 +229,8 @@ </div> </fieldset> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/file/info.tpl.src.xml b/modules/cms/ui/themes/default/html/views/file/info.tpl.src.xml @@ -4,90 +4,90 @@ <group> <part class="line"> <part class="label"> - <text text="global_name"></text> + <text value="${message:global_name}"></text> </part> <part class="input"> - <text var="name" class="name" /> + <text value="${name}" class="name" /> </part> </part> <part class="line"> <part class="label"> - <text text="global_filename"></text> + <text value="${message:global_filename}"></text> </part> <part class="input"> - <text var="filename" class="filename" /> + <text value="${filename}" class="filename" /> </part> </part> <part class="line"> <part class="label"> - <text text="file_extension"></text> + <text value="${message:file_extension}"></text> </part> <part class="input"> - <text var="extension" class="extension" /> + <text value="${extension}" class="extension" /> </part> </part> <part class="line"> <part class="label"> - <text text="global_description"></text> + <text value="${message:global_description}"></text> </part> <part class="input"> - <text var="description" /> + <text value="${description}" /> </part> </part> </group> - <group title="#{additional_info}"> + <group title="${message:additional_info}"> <part class="line"> <part class="label"> <label for="full_filename"> - <text text="global_full_filename"></text> + <text value="${message:global_full_filename}"></text> </label> </part> <part class="input"> - <text var="full_filename"></text> + <text value="${full_filename}"></text> </part> </part> <part class="line"> <part class="label"> <label for="size"> - <text text="FILE_SIZE"></text> + <text value="${message:FILE_SIZE}"></text> </label> </part> <part class="input"> </part> - <text var="size"></text> + <text value="${size}"></text> </part> <part class="line"> <part class="label"> <label for="mimetype"> - <text text="FILE_mimetype"></text> + <text value="${message:FILE_mimetype}"></text> </label> </part> <part class="input"> - <text var="mimetype"></text> + <text value="${mimetype}"></text> <newline></newline> <link class="action" action="file" subaction="size"> - <text key="menu_file_size"></text> + <text value="${message:menu_file_size}"></text> </link> </part> </part> <part class="line"> <part class="label"> - <text text="#{id}"></text> + <text value="${message:${message:id}}"></text> </part> <part class="input"> - <text var="objectid"></text> + <text value="${objectid}"></text> </part> </part> <if present="cache_filename"> <part class="line"> <part class="label"> <label for="cache_filename"> - <text text="CACHE_FILENAME"></text> + <text value="${message:CACHE_FILENAME}"></text> </label> </part> <part class="input"> - <text var="cache_filename"></text> + <text value="${cache_filename}"></text> <newline></newline> <image icon="el_date"></image> <date date="${cache_filemtime}"></date> @@ -97,32 +97,32 @@ <part class="line"> <part class="label"> <label for="pages"> - <text text="FILE_PAGES"></text> + <text value="${message:FILE_PAGES}"></text> </label> </part> <part class="input"> <table> - <list list="pages" extract="true"> + <list list="${pages}" extract="true"> <row> <column> <link url="${url}" target="cms_main"> <image type="page"></image> - <text var="name"></text> + <text value="${name}"></text> </link> </column> </row> </list> </table> - <if empty="pages"> - <text text="GLOBAL_NOT_FOUND"></text> + <if empty="${pages}"> + <text value="${message:GLOBAL_NOT_FOUND}"></text> </if> </part> </part> </group> - <group title="#{prop_userinfo}"> + <group title="${message:prop_userinfo}"> <part class="line"> <part class="label"> - <text text="global_created"></text> + <text value="${message:global_created}"></text> </part> <part class="input"> <image elementtype="date"></image> @@ -134,7 +134,7 @@ </part> <part class="line"> <part class="label"> - <text text="global_lastchange"></text> + <text value="${message:global_lastchange}"></text> </part> <part class="input"> <image elementtype="date"></image> @@ -147,7 +147,7 @@ <part class="line"> <part class="label"> <label for="published_date"> - <text text="global_published"></text> + <text value="${message:global_published}"></text> </label> </part> <part class="input"> diff --git a/modules/cms/ui/themes/default/html/views/file/preview.php b/modules/cms/ui/themes/default/html/views/file/preview.php @@ -1,8 +1,8 @@ <?php if (defined('OR_TITLE')) { ?> - <div class="clickable"> - <a target="_self" data-url="<?php echo encodeHtml(htmlentities(@$preview_url)) ?>" data-type="popup" data-action="" data-method="" data-id="" data-extra="[]" href="/#//" class="action"> - <span><?php echo encodeHtml(htmlentities(@lang('LINK_OPEN_IN_NEW_WINDOW'))) ?> + <div class="<?php echo escapeHtml('clickable') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-url="<?php echo escapeHtml(''.@$preview_url.'') ?>" data-type="<?php echo escapeHtml('popup') ?>" data-action="<?php echo escapeHtml('') ?>" data-method="<?php echo escapeHtml('') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#//') ?>" class="<?php echo escapeHtml('action') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('LINK_OPEN_IN_NEW_WINDOW').'') ?> </span> </a> </div> diff --git a/modules/cms/ui/themes/default/html/views/file/preview.tpl.src.xml b/modules/cms/ui/themes/default/html/views/file/preview.tpl.src.xml @@ -3,7 +3,7 @@ <part class="clickable"> <link type="popup" url="${preview_url}" class="action"> - <text key="LINK_OPEN_IN_NEW_WINDOW" /> + <text value="${message:LINK_OPEN_IN_NEW_WINDOW}" /> </link> </part> </output> \ No newline at end of file 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,31 +1,31 @@ <?php if (defined('OR_TITLE')) { ?> <?php $if1=(config('security','nopublish')); if($if1) { ?> - <div class="message warn"> - <span class="help"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOPUBLISH_DESC'))) ?> + <div class="<?php echo escapeHtml('message warn') ?>"><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml(''.@lang('GLOBAL_NOPUBLISH_DESC').'') ?> </span> </div> <?php } ?> - <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="1" data-autosave="" class="or-form file"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="file" /> - <input type="hidden" name="subaction" value="pub" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <tr> - <td> - <br /> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('pub') ?>" data-action="<?php echo escapeHtml('file') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('1') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form file') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('file') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('pub') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <br /><?php echo escapeHtml('') ?> </td> </tr> - <tr> - <td class="act"> + <tr><?php echo escapeHtml('') ?> + <td class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> </td> </tr> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('publish'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('publish').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/file/pub.tpl.src.xml b/modules/cms/ui/themes/default/html/views/file/pub.tpl.src.xml @@ -4,13 +4,13 @@ <!-- Falls das Veroeffentlichen deaktiviert ist, eine Warnmeldung anzeigen. --> - <if true="%{security/nopublish}"> + <if true="${config:security/nopublish}"> <part class="message warn"> - <text key="GLOBAL_NOPUBLISH_DESC" class="help"></text> + <text value="${message:GLOBAL_NOPUBLISH_DESC}" class="help"></text> </part> </if> - <form cancel="true" label="#{publish}" async="true"> + <form cancel="true" label="${message:publish}" async="true"> <row> <column> <newline></newline> diff --git a/modules/cms/ui/themes/default/html/views/file/remove.php b/modules/cms/ui/themes/default/html/views/file/remove.php @@ -1,26 +1,26 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="file" /> - <input type="hidden" name="subaction" value="remove" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <label class="or-form-row"> - <span class="or-form-input"> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('remove') ?>" data-action="<?php echo escapeHtml('file') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form file') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('file') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('remove') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('or-form-row') ?>"><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('or-form-input') ?>"><?php echo escapeHtml('') ?> </span> - <span class="or-form-label">message:GLOBAL_NAME + <span class="<?php echo escapeHtml('or-form-label') ?>"><?php echo escapeHtml(''.@lang('GLOBAL_NAME').'') ?> </span> </label> - <label class="or-form-row or-form-checkbox"> - <span class="or-form-label">GLOBAL_DELETE + <label class="<?php echo escapeHtml('or-form-row or-form-checkbox') ?>"><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('or-form-label') ?>"><?php echo escapeHtml(''.@lang('GLOBAL_DELETE').'') ?> </span> - <input type="checkbox" name="delete" value="1" <?php if(@$delete){ ?>checked="1"<?php } ?> /> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('delete') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> </label> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/file/remove.tpl.src.xml b/modules/cms/ui/themes/default/html/views/file/remove.tpl.src.xml @@ -4,6 +4,6 @@ <form> <text label="GLOBAL_NAME" var="name"></text> - <checkbox label="GLOBAL_DELETE" name="delete"></checkbox> + <checkbox label="${message:GLOBAL_DELETE}" name="delete"></checkbox> </form> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/file/show.php b/modules/cms/ui/themes/default/html/views/file/show.php @@ -1,3 +1,3 @@ <?php if (defined('OR_TITLE')) { ?> - <?php echo @$value ?> + <?php echo ''.@$value.'' ?> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/file/structure.php b/modules/cms/ui/themes/default/html/views/file/structure.php @@ -1,6 +1,6 @@ <?php if (defined('OR_TITLE')) { ?> - <div class="structure tree"> - + <div class="<?php echo escapeHtml('structure tree') ?>"><?php echo escapeHtml('') ?> + <?php echo escapeHtml('') ?> </div> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/file/uncompress.php b/modules/cms/ui/themes/default/html/views/file/uncompress.php @@ -1,45 +1,45 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="uncompress" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="file" /> - <input type="hidden" name="subaction" value="uncompress" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <fieldset class="or-group toggle-open-close open show"> - <legend class="on-click-open-close"><?php echo encodeHtml(htmlentities(@lang('options'))) ?> - <img /> - <div class="arrow arrow-right on-closed"> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('uncompress') ?>" data-action="<?php echo escapeHtml('file') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form file') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('file') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('uncompress') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('options').'') ?> + <img /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> </div> - <div class="arrow arrow-down on-open"> + <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> </div> </legend> - <div class="closable"> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> </div> </fieldset> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <?php { $replace= '1'; ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <?php { $replace= 1; ?> <?php } ?> - <input type="radio" name="replace" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" /> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('replace'))) ?> + <input type="<?php echo escapeHtml('radio') ?>" name="<?php echo escapeHtml('replace') ?>" value="<?php echo escapeHtml('1') ?>" checked="<?php echo escapeHtml(''.@$replace.'') ?>" /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('replace').'') ?> </span> </label> - <br /> - <input type="radio" name="replace" disabled="" value="0" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" /> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + <br /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('radio') ?>" name="<?php echo escapeHtml('replace') ?>" value="<?php echo escapeHtml('') ?>" checked="<?php echo escapeHtml(''.@$replace.'') ?>" /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('new').'') ?> </span> </label> </div> </div> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/file/uncompress.tpl.src.xml b/modules/cms/ui/themes/default/html/views/file/uncompress.tpl.src.xml @@ -1,7 +1,7 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <form> - <group title="#{options}"></group> + <group title="${message:options}"></group> <part class="line"> <part class="label"> </part> @@ -9,12 +9,12 @@ <set var="replace" value="1"></set> <radio name="replace" value="1"></radio> <label for="replace_1"> - <text key="replace"></text> + <text value="${message:replace}"></text> </label> <newline></newline> <radio name="replace" value="0"></radio> <label for="replace_0"> - <text key="new"></text> + <text value="${message:new}"></text> </label> </part> </part> diff --git a/modules/cms/ui/themes/default/html/views/file/value.php b/modules/cms/ui/themes/default/html/views/file/value.php @@ -1,31 +1,31 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="value" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form file"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="file" /> - <input type="hidden" name="subaction" value="value" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('value') ?>" data-action="<?php echo escapeHtml('file') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form file') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('file') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('value') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_VALUE'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_VALUE').'') ?> </span> </td> - <td> - <textarea name="value" data-extension="" data-mimetype="" data-mode="htmlmixed" class="editor code-editor"><?php echo encodeHtml(htmlentities(@$value)) ?> + <td><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('value') ?>" data-extension="<?php echo escapeHtml('') ?>" data-mimetype="<?php echo escapeHtml('') ?>" data-mode="<?php echo escapeHtml('htmlmixed') ?>" class="<?php echo escapeHtml('editor code-editor') ?>"><?php echo escapeHtml(''.@$value.'') ?> </textarea> </td> </tr> - <tr> - <td colspan="2" class="act"> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> </td> </tr> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> diff --git a/modules/cms/ui/themes/default/html/views/file/value.tpl.src.xml b/modules/cms/ui/themes/default/html/views/file/value.tpl.src.xml @@ -5,7 +5,7 @@ <window> <row> <column> - <text text="GLOBAL_VALUE"></text> + <text value="${message:GLOBAL_VALUE}"></text> </column> <column> <editor name="value" type="code"></editor> diff --git a/modules/cms/ui/themes/default/html/views/folder/advanced.php b/modules/cms/ui/themes/default/html/views/folder/advanced.php @@ -1,49 +1,49 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="folder" /> - <input type="hidden" name="subaction" value="edit" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <div class="or-table-wrapper"> - <div class="or-table-filter"> - <input type="search" name="filter" placeholder="<?php echo encodeHtml(htmlentities(@lang('SEARCH_FILTER'))) ?>" /> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('edit') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form folder') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('folder') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('edit') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> </div> - <div class="or-table-area"> - <table width="100%"> - <tr class="headline"> - <td class="help"> - <input type="checkbox" name="checkall" value="1" <?php if(@$checkall){ ?>checked="1"<?php } ?> /> + <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> + <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> + <tr class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml('') ?> + <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('checkall') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$checkall){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> </td> - <td class="help"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_TYPE'))) ?> + <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_TYPE').'') ?> </span> - <span> / + <span><?php echo escapeHtml(' / ') ?> </span> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_NAME').'') ?> </span> </td> </tr> - <?php foreach($object as $list_key=>$list_value) { extract($list_value); ?> - <tr class="data"> - <td width="1%"> + <?php foreach((array)$object as $list_key=>$list_value) { extract($list_value); ?> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td width="<?php echo escapeHtml('1%') ?>"><?php echo escapeHtml('') ?> <?php $if1=($writable); if($if1) { ?> - <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$id)) ?>" value="1" <?php if(@$${id}){ ?>checked="1"<?php } ?> /> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml(''.@$id.'') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$$id){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> <?php } ?> - <?php $if1=(!'writable'); if($if1) { ?> - <span> + <?php $if1=(!writable); if($if1) { ?> + <span><?php echo escapeHtml(' ') ?> </span> <?php } ?> </td> - <td class="clickable"> - <label class="label"> - <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="<?php echo encodeHtml(htmlentities(@$type)) ?>" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$objectid)) ?>" data-extra="[]" href="/#/<?php echo encodeHtml(htmlentities(@$type)) ?>/<?php echo encodeHtml(htmlentities(@$objectid)) ?>"> - <i class="image-icon image-icon--action-<?php echo encodeHtml(htmlentities(@$icon)) ?>"> + <td class="<?php echo escapeHtml('clickable') ?>"><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" date-name="<?php echo escapeHtml(''.@$name.'') ?>" name="<?php echo escapeHtml(''.@$name.'') ?>" data-type="<?php echo escapeHtml('open') ?>" data-action="<?php echo escapeHtml(''.@$type.'') ?>" data-method="<?php echo escapeHtml('') ?>" data-id="<?php echo escapeHtml(''.@$objectid.'') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/'.@$type.'/'.@$objectid.'') ?>"><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--action-'.@$icon.'') ?>"><?php echo escapeHtml('') ?> </i> - <span><?php echo encodeHtml(htmlentities(@$name)) ?> + <span><?php echo escapeHtml(''.@$name.'') ?> </span> - <span> + <span><?php echo escapeHtml(' ') ?> </span> </a> </label> @@ -51,23 +51,23 @@ </tr> <?php } ?> <?php $if1=(($object)==FALSE); if($if1) { ?> - <tr> - <td colspan="2"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_NOT_FOUND').'') ?> </span> </td> </tr> <?php } ?> - <tr class="data"> - <td> - <span> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(' ') ?> </span> </td> - <td colspan="2" class="clickable"> - <a target="_self" data-type="dialog" data-action="folder" data-method="create" data-id="" data-extra="{'dialogAction':'folder','dialogMethod':'create'}" href="/#/folder/"> - <i class="image-icon image-icon--method-add"> + <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('clickable') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('dialog') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-method="<?php echo escapeHtml('create') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('{\'dialogAction\':\'folder\',\'dialogMethod\':\'create\'}') ?>" href="<?php echo escapeHtml('/#/folder/') ?>"><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--method-add') ?>"><?php echo escapeHtml('') ?> </i> - <span><?php echo encodeHtml(htmlentities(@lang('menu_folder_create'))) ?> + <span><?php echo escapeHtml(''.@lang('menu_folder_create').'') ?> </span> </a> </td> @@ -75,60 +75,60 @@ </table> </div> </div> - <fieldset class="or-group toggle-open-close open show"> - <legend class="on-click-open-close"><?php echo encodeHtml(htmlentities(@lang('options'))) ?> - <img /> - <div class="arrow arrow-right on-closed"> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('options').'') ?> + <img /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> </div> - <div class="arrow arrow-down on-open"> + <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> </div> </legend> - <div class="closable"> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> <?php { $type= $defaulttype; ?> <?php } ?> - <?php foreach($actionlist as $list_key=>$actiontype) { ?> - <div class="line"> - <div class="label"> + <?php foreach((array)$actionlist as $list_key=>$actiontype) { ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <input type="radio" name="type" disabled="" value="<?php echo encodeHtml(htmlentities(@$actiontype)) ?>" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" /> - <label class="label"> - <span> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('radio') ?>" name="<?php echo escapeHtml('type') ?>" value="<?php echo escapeHtml(''.@$actiontype.'') ?>" checked="<?php echo escapeHtml(''.@$type.'') ?>" /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(' ') ?> </span> - <span><?php echo encodeHtml(htmlentities(@lang(''.@$actiontype.''))) ?> + <span><?php echo escapeHtml(''.@lang(''.@$actiontype.'').'') ?> </span> </label> </div> </div> <?php } ?> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <span> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(' ') ?> </span> - <input type="checkbox" name="confirm" value="1" <?php if(@$confirm){ ?>checked="1"<?php } ?> required="required" /> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('CONFIRM_DELETE'))) ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('confirm') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$confirm){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> required="<?php echo escapeHtml('required') ?>" /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('CONFIRM_DELETE').'') ?> </span> </label> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('FOLDER_SELECT_TARGET_FOLDER'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('FOLDER_SELECT_TARGET_FOLDER').'') ?> </span> </div> - <div class="input"> - + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <?php echo escapeHtml('') ?> </div> </div> </div> </fieldset> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/advanced.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/advanced.tpl.src.xml @@ -5,68 +5,68 @@ <row class="headline"> <column class="help"> <!-- - <text key="SELECT"></text> + <text value="${message:SELECT}"></text> --> <checkbox name="checkall" /> </column> <column class="help"> - <text key="GLOBAL_TYPE"></text> - <text raw="_/_"></text> - <text key="GLOBAL_NAME"></text> + <text value="${message:GLOBAL_TYPE}"></text> + <text value=" / "></text> + <text value="${message:GLOBAL_NAME}"></text> </column> </row> - <list list="object" extract="true"> + <list list="${object}" extract="true"> <row class="data"> <column width="1%"> <if true="${writable}"> <checkbox name="${id}"></checkbox> </if> <if false="writable"> - <text raw="_"></text> + <text value=" "></text> </if> </column> <column class="clickable"> <label for="${id}"> <link type="open" name="${name}" action="${type}" id="${objectid}"> <image action="${icon}"></image> - <text var="name" maxlength="40"></text> - <text raw="_"></text> + <text value="${name}" maxlength="40"></text> + <text value=" "></text> </link> </label> </column> </row> </list> - <if empty="object"> + <if empty="${object}"> <row> <column colspan="2"> - <text text="GLOBAL_NOT_FOUND"></text> + <text value="${message:GLOBAL_NOT_FOUND}"></text> </column> </row> </if> <row class="data"> <column> - <text raw="_" /> + <text value=" " /> </column> <column colspan="2" class="clickable"> <link type="dialog" action="folder" subaction="create"> <image method="add"></image> - <text key="menu_folder_create"></text> + <text value="${message:menu_folder_create}"></text> </link> </column> </row> </table> - <group title="#{options}"> + <group title="${message:options}"> <set var="type" value="${defaulttype}"></set> - <list list="actionlist" value="actiontype"> + <list list="${actionlist}" value="actiontype"> <part class="line"> <part class="label"> </part> <part class="input"> <radio name="type" value="${actiontype}"></radio> <label for="type" value="${actiontype}"> - <text raw="_"></text> - <text key="${actiontype}" prefix="FOLDER_SELECT_"></text> + <text value=" "></text> + <text value="${message:${actiontype}}" prefix="FOLDER_SELECT_"></text> </label> </part> </part> @@ -75,17 +75,17 @@ <part class="label"> </part> <part class="input"> - <text raw="____" /> + <text value=" " /> <checkbox name="confirm" required="true" /> <label for="confirm"> - <text key="CONFIRM_DELETE"></text> + <text value="${message:CONFIRM_DELETE}"></text> </label> </part> </part> <part class="line"> <part class="label"> - <text key="FOLDER_SELECT_TARGET_FOLDER" /> + <text value="${message:FOLDER_SELECT_TARGET_FOLDER}" /> </part> <part class="input"> <selector types="folder" param="targetobjectid" name="${rootfoldername}" diff --git a/modules/cms/ui/themes/default/html/views/folder/content.php b/modules/cms/ui/themes/default/html/views/folder/content.php @@ -1,93 +1,93 @@ <?php if (defined('OR_TITLE')) { ?> - <div class="or-table-wrapper"> - <div class="or-table-filter"> - <input type="search" name="filter" placeholder="<?php echo encodeHtml(htmlentities(@lang('SEARCH_FILTER'))) ?>" /> + <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> </div> - <div class="or-table-area"> - <table width="100%"> - <tr class="headline"> - <td class="help"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_TYPE'))) ?> + <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> + <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> + <tr class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml('') ?> + <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_TYPE').'') ?> </span> - <span> / + <span><?php echo escapeHtml(' / ') ?> </span> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_NAME').'') ?> </span> </td> - <td class="help"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_LASTCHANGE'))) ?> + <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_LASTCHANGE').'') ?> </span> </td> </tr> <?php $if1=(isset($up_url)); if($if1) { ?> - <tr class="data"> - <td> - <img src="./modules/cms/ui/themes/default/images/icon_folder.png" /> - <span>.. + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon_folder.png') ?>" /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml('..') ?> </span> </td> - <td> - <span> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml('') ?> </span> </td> </tr> <?php } ?> - <?php foreach($object as $list_key=>$list_value) { extract($list_value); ?> - <tr class="data"> - <td title="<?php echo encodeHtml(htmlentities(@$desc)) ?>" data-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-action="<?php echo encodeHtml(htmlentities(@$type)) ?>" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" class="clickable <?php echo encodeHtml(htmlentities(@$class)) ?>"> - <img src="./modules/cms/ui/themes/default/images/icon_<?php echo encodeHtml(htmlentities(@$icon)) ?>.png" /> - <span><?php echo encodeHtml(htmlentities(@$name)) ?> + <?php foreach((array)$object as $list_key=>$list_value) { extract($list_value); ?> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td title="<?php echo escapeHtml(''.@$desc.'') ?>" data-name="<?php echo escapeHtml(''.@$name.'') ?>" data-action="<?php echo escapeHtml(''.@$type.'') ?>" data-id="<?php echo escapeHtml(''.@$id.'') ?>" class="<?php echo escapeHtml('clickable '.@$class.'') ?>"><?php echo escapeHtml('') ?> + <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon_'.@$icon.'.png') ?>" /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$name.'') ?> </span> - <span> + <span><?php echo escapeHtml(' ') ?> </span> </td> - <td> + <td><?php echo escapeHtml('') ?> <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($date); ?> <?php } ?> </td> </tr> <?php } ?> <?php $if1=(($object)==FALSE); if($if1) { ?> - <tr> - <td colspan="2"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_NOT_FOUND').'') ?> </span> </td> </tr> <?php } ?> - <tr class="data"> - <td colspan="2"> - <a target="_self" data-type="view" data-action="folder" data-method="createfolder" data-id="" data-extra="[]" href="/#/folder/"> - <img src="./modules/cms/ui/themes/default/images/icon/icon/create.png" /> - <span><?php echo encodeHtml(htmlentities(@lang('menu_folder_createfolder'))) ?> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('view') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-method="<?php echo escapeHtml('createfolder') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/folder/') ?>"><?php echo escapeHtml('') ?> + <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon/icon/create.png') ?>" /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('menu_folder_createfolder').'') ?> </span> </a> </td> </tr> - <tr class="data"> - <td colspan="2"> - <a target="_self" data-type="view" data-action="folder" data-method="createpage" data-id="" data-extra="[]" href="/#/folder/"> - <img src="./modules/cms/ui/themes/default/images/icon/icon/create.png" /> - <span><?php echo encodeHtml(htmlentities(@lang('menu_folder_createpage'))) ?> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('view') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-method="<?php echo escapeHtml('createpage') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/folder/') ?>"><?php echo escapeHtml('') ?> + <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon/icon/create.png') ?>" /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('menu_folder_createpage').'') ?> </span> </a> </td> </tr> - <tr class="data"> - <td colspan="2"> - <a target="_self" data-type="view" data-action="folder" data-method="createfile" data-id="" data-extra="[]" href="/#/folder/"> - <img src="./modules/cms/ui/themes/default/images/icon/icon/create.png" /> - <span><?php echo encodeHtml(htmlentities(@lang('menu_folder_createfile'))) ?> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('view') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-method="<?php echo escapeHtml('createfile') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/folder/') ?>"><?php echo escapeHtml('') ?> + <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon/icon/create.png') ?>" /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('menu_folder_createfile').'') ?> </span> </a> </td> </tr> - <tr class="data"> - <td colspan="2"> - <a target="_self" data-type="modal" data-action="folder" data-method="createlink" data-id="" data-extra="[]" href="/#/folder/"> - <img src="./modules/cms/ui/themes/default/images/icon/icon/create.png" /> - <span><?php echo encodeHtml(htmlentities(@lang('menu_folder_createlink'))) ?> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('modal') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-method="<?php echo escapeHtml('createlink') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/folder/') ?>"><?php echo escapeHtml('') ?> + <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon/icon/create.png') ?>" /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('menu_folder_createlink').'') ?> </span> </a> </td> diff --git a/modules/cms/ui/themes/default/html/views/folder/content.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/content.tpl.src.xml @@ -3,41 +3,41 @@ <table> <row class="headline"> <column class="help"> - <text key="GLOBAL_TYPE"></text> - <text raw="_/_"></text> - <text key="GLOBAL_NAME"></text> + <text value="${message:GLOBAL_TYPE}"></text> + <text value=" / "></text> + <text value="${message:GLOBAL_NAME}"></text> </column> <column class="help"> - <text key="GLOBAL_LASTCHANGE"></text> + <text value="${message:GLOBAL_LASTCHANGE}"></text> </column> </row> <if present="up_url"> <row class="data"> <column url="${up_url}"> <image type="folder"></image> - <text raw=".."></text> + <text value=".."></text> </column> <column> <text raw=""></text> </column> </row> </if> - <list list="object" extract="true"> + <list list="${object}" extract="true"> <row class="data"> <column id="${id}" name="${name}" action="${type}" title="${desc}" class="${class}"> <image type="${icon}"></image> - <text var="name"></text> - <text raw="_"></text> + <text value="${name}"></text> + <text value=" "></text> </column> <column> <date date="${date}"></date> </column> </row> </list> - <if empty="object"> + <if empty="${object}"> <row> <column colspan="2"> - <text text="GLOBAL_NOT_FOUND"></text> + <text value="${message:GLOBAL_NOT_FOUND}"></text> </column> </row> </if> @@ -45,7 +45,7 @@ <column colspan="2"> <link type="view" action="folder" subaction="createfolder"> <image file="icon/create"></image> - <text key="menu_folder_createfolder"></text> + <text value="${message:menu_folder_createfolder}"></text> </link> </column> </row> @@ -53,7 +53,7 @@ <column colspan="2"> <link type="view" action="folder" subaction="createpage"> <image file="icon/create"></image> - <text key="menu_folder_createpage"></text> + <text value="${message:menu_folder_createpage}"></text> </link> </column> </row> @@ -61,7 +61,7 @@ <column colspan="2"> <link type="view" action="folder" subaction="createfile"> <image file="icon/create"></image> - <text key="menu_folder_createfile"></text> + <text value="${message:menu_folder_createfile}"></text> </link> </column> </row> @@ -69,7 +69,7 @@ <column colspan="2"> <link type="modal" action="folder" subaction="createlink"> <image file="icon/create"></image> - <text key="menu_folder_createlink"></text> + <text value="${message:menu_folder_createlink}"></text> </link> </column> </row> diff --git a/modules/cms/ui/themes/default/html/views/folder/create.php b/modules/cms/ui/themes/default/html/views/folder/create.php @@ -1,58 +1,58 @@ <?php if (defined('OR_TITLE')) { ?> - <div class="or-linklist"> + <div class="<?php echo escapeHtml('or-linklist') ?>"><?php echo escapeHtml('') ?> <?php $if1=($mayCreateFolder); if($if1) { ?> - <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createfolder" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createfolder'}" href="/#//"> - <span><?php echo encodeHtml(htmlentities(@lang('menu_createfolder'))) ?> + <div class="<?php echo escapeHtml('clickable or-linklist-line or-round-corners or-hover-effect') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('dialog') ?>" data-action="<?php echo escapeHtml('') ?>" data-method="<?php echo escapeHtml('createfolder') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'createfolder\'}') ?>" href="<?php echo escapeHtml('/#//') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('menu_createfolder').'') ?> </span> </a> </div> <?php } ?> <?php $if1=($mayCreatePage); if($if1) { ?> - <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createpage" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createpage'}" href="/#//"> - <span><?php echo encodeHtml(htmlentities(@lang('menu_createpage'))) ?> + <div class="<?php echo escapeHtml('clickable or-linklist-line or-round-corners or-hover-effect') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('dialog') ?>" data-action="<?php echo escapeHtml('') ?>" data-method="<?php echo escapeHtml('createpage') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'createpage\'}') ?>" href="<?php echo escapeHtml('/#//') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('menu_createpage').'') ?> </span> </a> </div> <?php } ?> <?php $if1=($mayCreateFile); if($if1) { ?> - <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createfile" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createfile'}" href="/#//"> - <span><?php echo encodeHtml(htmlentities(@lang('menu_createfile'))) ?> + <div class="<?php echo escapeHtml('clickable or-linklist-line or-round-corners or-hover-effect') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('dialog') ?>" data-action="<?php echo escapeHtml('') ?>" data-method="<?php echo escapeHtml('createfile') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'createfile\'}') ?>" href="<?php echo escapeHtml('/#//') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('menu_createfile').'') ?> </span> </a> </div> <?php } ?> <?php $if1=($mayCreateImage); if($if1) { ?> - <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createimage" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createimage'}" href="/#//"> - <span><?php echo encodeHtml(htmlentities(@lang('menu_createimage'))) ?> + <div class="<?php echo escapeHtml('clickable or-linklist-line or-round-corners or-hover-effect') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('dialog') ?>" data-action="<?php echo escapeHtml('') ?>" data-method="<?php echo escapeHtml('createimage') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'createimage\'}') ?>" href="<?php echo escapeHtml('/#//') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('menu_createimage').'') ?> </span> </a> </div> <?php } ?> <?php $if1=($mayCreateText); if($if1) { ?> - <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createtext" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createtext'}" href="/#//"> - <span><?php echo encodeHtml(htmlentities(@lang('menu_createtext'))) ?> + <div class="<?php echo escapeHtml('clickable or-linklist-line or-round-corners or-hover-effect') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('dialog') ?>" data-action="<?php echo escapeHtml('') ?>" data-method="<?php echo escapeHtml('createtext') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'createtext\'}') ?>" href="<?php echo escapeHtml('/#//') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('menu_createtext').'') ?> </span> </a> </div> <?php } ?> <?php $if1=($mayCreateUrl); if($if1) { ?> - <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createurl" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createurl'}" href="/#//"> - <span><?php echo encodeHtml(htmlentities(@lang('menu_createurl'))) ?> + <div class="<?php echo escapeHtml('clickable or-linklist-line or-round-corners or-hover-effect') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('dialog') ?>" data-action="<?php echo escapeHtml('') ?>" data-method="<?php echo escapeHtml('createurl') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'createurl\'}') ?>" href="<?php echo escapeHtml('/#//') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('menu_createurl').'') ?> </span> </a> </div> <?php } ?> <?php $if1=($mayCreateLink); if($if1) { ?> - <div class="clickable or-linklist-line or-round-corners or-hover-effect"> - <a target="_self" data-type="dialog" data-action="" data-method="createlink" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'createlink'}" href="/#//"> - <span><?php echo encodeHtml(htmlentities(@lang('menu_createlink'))) ?> + <div class="<?php echo escapeHtml('clickable or-linklist-line or-round-corners or-hover-effect') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('dialog') ?>" data-action="<?php echo escapeHtml('') ?>" data-method="<?php echo escapeHtml('createlink') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'createlink\'}') ?>" href="<?php echo escapeHtml('/#//') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('menu_createlink').'') ?> </span> </a> </div> diff --git a/modules/cms/ui/themes/default/html/views/folder/create.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/create.tpl.src.xml @@ -6,7 +6,7 @@ <if true="${mayCreateFolder}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createfolder"> - <text key="menu_createfolder"></text> + <text value="${message:menu_createfolder}"></text> </link> </part> </if> @@ -14,7 +14,7 @@ <if true="${mayCreatePage}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createpage"> - <text key="menu_createpage"></text> + <text value="${message:menu_createpage}"></text> </link> </part> </if> @@ -22,7 +22,7 @@ <if true="${mayCreateFile}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createfile"> - <text key="menu_createfile"></text> + <text value="${message:menu_createfile}"></text> </link> </part> </if> @@ -30,7 +30,7 @@ <if true="${mayCreateImage}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createimage"> - <text key="menu_createimage"></text> + <text value="${message:menu_createimage}"></text> </link> </part> </if> @@ -38,7 +38,7 @@ <if true="${mayCreateText}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createtext"> - <text key="menu_createtext"></text> + <text value="${message:menu_createtext}"></text> </link> </part> </if> @@ -46,7 +46,7 @@ <if true="${mayCreateUrl}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createurl"> - <text key="menu_createurl"></text> + <text value="${message:menu_createurl}"></text> </link> </part> </if> @@ -54,7 +54,7 @@ <if true="${mayCreateLink}"> <part class="clickable or-linklist-line or-round-corners or-hover-effect"> <link type="dialog" subaction="createlink"> - <text key="menu_createlink"></text> + <text value="${message:menu_createlink}"></text> </link> </part> </if> diff --git a/modules/cms/ui/themes/default/html/views/folder/createfile.php b/modules/cms/ui/themes/default/html/views/folder/createfile.php @@ -1,87 +1,87 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="upload" action="./" data-method="createfile" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="multipart/form-data" data-async="" data-autosave="" class="or-form folder"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="folder" /> - <input type="hidden" name="subaction" value="createfile" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <input type="hidden" name="type" value="file" /> - <div class="line"> - <div class="label"> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_FILE'))) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('upload') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('createfile') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('multipart/form-data') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form folder') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('folder') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('createfile') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('type') ?>" value="<?php echo escapeHtml('file') ?>" /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_FILE').'') ?> </span> </label> </div> - <div class="input"> - <input multiple="multiple" id="req0_file" name="file" size="40" maxlength="<?php echo encodeHtml(htmlentities(@$maxlength)) ?>" class="upload" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <input multiple="<?php echo escapeHtml('multiple') ?>" id="<?php echo escapeHtml('req0_file') ?>" name="<?php echo escapeHtml('file') ?>" size="<?php echo escapeHtml('40') ?>" maxlength="<?php echo escapeHtml(''.@$maxlength.'') ?>" class="<?php echo escapeHtml('upload') ?>" /><?php echo escapeHtml('') ?> </div> </div> - <div class="line or-dropzone-upload"> - <div class="label"> + <div class="<?php echo escapeHtml('line or-dropzone-upload') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> </div> </div> - <div class="line"> - <div class="label"> - <span class="help"><?php echo encodeHtml(htmlentities(@lang('file_max_size'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml(''.@lang('file_max_size').'') ?> </span> </div> - <div class="input"> - <span><?php echo encodeHtml(htmlentities(@$max_size)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$max_size.'') ?> </span> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('HTTP_URL'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('HTTP_URL').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="url" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('url') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$url.'') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> - <fieldset class="or-group toggle-open-close open show"> - <legend class="on-click-open-close"><?php echo encodeHtml(htmlentities(@lang('description'))) ?> - <img /> - <div class="arrow arrow-right on-closed"> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('description').'') ?> + <img /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> </div> - <div class="arrow arrow-down on-open"> + <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> </div> </legend> - <div class="closable"> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> </div> </fieldset> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_NAME'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_NAME').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="name" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('name') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$name.'') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_DESCRIPTION').'') ?> </span> </div> - <div class="input"> - <textarea name="description" class="inputarea"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('description') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml('') ?> </textarea> </div> </div> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> diff --git a/modules/cms/ui/themes/default/html/views/folder/createfile.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/createfile.tpl.src.xml @@ -6,7 +6,7 @@ <part class="line"> <part class="label"> <label for="name"> - <text text="global_FILE"></text> + <text value="${message:global_FILE}"></text> </label> </part> <part class="input"> @@ -26,24 +26,24 @@ <text class="help" key="file_max_size"></text> </part> <part class="input"> - <text var="max_size"></text> + <text value="${max_size}"></text> </part> </part> <part class="line"> <part class="label"> - <text key="HTTP_URL"></text> + <text value="${message:HTTP_URL}"></text> </part> <part class="input"> <input name="url" size="50"></input> </part> </part> - <group title="#{description}"></group> + <group title="${message:description}"></group> <part class="line"> <part class="label"> - <text text="global_NAME"></text> + <text value="${message:global_NAME}"></text> </part> <part class="input"> <input name="name" size="50"></input> @@ -53,7 +53,7 @@ <part class="line"> <part class="label"> - <text text="global_DESCRIPTION"></text> + <text value="${message:global_DESCRIPTION}"></text> </part> <part class="input"> <inputarea rows="5" cols="50" name="description" default=""></inputarea> diff --git a/modules/cms/ui/themes/default/html/views/folder/createfolder.php b/modules/cms/ui/themes/default/html/views/folder/createfolder.php @@ -1,38 +1,38 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="createfolder" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="folder" /> - <input type="hidden" name="subaction" value="createfolder" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <input type="hidden" name="languageid" value="<?php echo encodeHtml(htmlentities(@$languageid)) ?>" /> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_FOLDER'))) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('createfolder') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form folder') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('folder') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('createfolder') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('languageid') ?>" value="<?php echo escapeHtml(''.@$languageid.'') ?>" /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_FOLDER').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="name" type="text" maxlength="256" value="" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('name') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml('') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_DESCRIPTION').'') ?> </span> </div> - <div class="input"> - <textarea name="description" class="inputarea"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('description') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml('') ?> </textarea> </div> </div> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('add'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('add').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/createfolder.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/createfolder.tpl.src.xml @@ -1,11 +1,11 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <header back="true"></header> - <form visible="true" label="#{add}"> + <form visible="true" label="${message:add}"> <hidden name="languageid" /> <part class="line"> <part class="label"> - <text text="global_FOLDER"></text> + <text value="${message:global_FOLDER}"></text> </part> <part class="input"> <input name="name" size="20" default=""></input> @@ -14,7 +14,7 @@ <part class="line"> <part class="label"> - <text text="global_DESCRIPTION"></text> + <text value="${message:global_DESCRIPTION}"></text> </part> <part class="input"> <inputarea rows="5" cols="50" name="description" default=""></inputarea> diff --git a/modules/cms/ui/themes/default/html/views/folder/createimage.php b/modules/cms/ui/themes/default/html/views/folder/createimage.php @@ -1,87 +1,87 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="upload" action="./" data-method="createimage" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="multipart/form-data" data-async="" data-autosave="" class="or-form folder"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="folder" /> - <input type="hidden" name="subaction" value="createimage" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <input type="hidden" name="type" value="file" /> - <div class="line"> - <div class="label"> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_FILE'))) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('upload') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('createimage') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('multipart/form-data') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form folder') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('folder') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('createimage') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('type') ?>" value="<?php echo escapeHtml('file') ?>" /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_FILE').'') ?> </span> </label> </div> - <div class="input"> - <input multiple="multiple" id="req0_file" name="file" size="40" maxlength="<?php echo encodeHtml(htmlentities(@$maxlength)) ?>" class="upload" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <input multiple="<?php echo escapeHtml('multiple') ?>" id="<?php echo escapeHtml('req0_file') ?>" name="<?php echo escapeHtml('file') ?>" size="<?php echo escapeHtml('40') ?>" maxlength="<?php echo escapeHtml(''.@$maxlength.'') ?>" class="<?php echo escapeHtml('upload') ?>" /><?php echo escapeHtml('') ?> </div> </div> - <div class="line or-dropzone-upload"> - <div class="label"> + <div class="<?php echo escapeHtml('line or-dropzone-upload') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> </div> </div> - <div class="line"> - <div class="label"> - <span class="help"><?php echo encodeHtml(htmlentities(@lang('file_max_size'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml(''.@lang('file_max_size').'') ?> </span> </div> - <div class="input"> - <span><?php echo encodeHtml(htmlentities(@$max_size)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$max_size.'') ?> </span> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('HTTP_URL'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('HTTP_URL').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="url" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('url') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$url.'') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> - <fieldset class="or-group toggle-open-close open show"> - <legend class="on-click-open-close"><?php echo encodeHtml(htmlentities(@lang('description'))) ?> - <img /> - <div class="arrow arrow-right on-closed"> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('description').'') ?> + <img /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> </div> - <div class="arrow arrow-down on-open"> + <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> </div> </legend> - <div class="closable"> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> </div> </fieldset> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_NAME'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_NAME').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="name" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('name') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$name.'') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_DESCRIPTION').'') ?> </span> </div> - <div class="input"> - <textarea name="description" class="inputarea"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('description') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml('') ?> </textarea> </div> </div> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> diff --git a/modules/cms/ui/themes/default/html/views/folder/createimage.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/createimage.tpl.src.xml @@ -6,7 +6,7 @@ <part class="line"> <part class="label"> <label for="name"> - <text text="global_FILE"></text> + <text value="${message:global_FILE}"></text> </label> </part> <part class="input"> @@ -26,24 +26,24 @@ <text class="help" key="file_max_size"></text> </part> <part class="input"> - <text var="max_size"></text> + <text value="${max_size}"></text> </part> </part> <part class="line"> <part class="label"> - <text key="HTTP_URL"></text> + <text value="${message:HTTP_URL}"></text> </part> <part class="input"> <input name="url" size="50"></input> </part> </part> - <group title="#{description}"></group> + <group title="${message:description}"></group> <part class="line"> <part class="label"> - <text text="global_NAME"></text> + <text value="${message:global_NAME}"></text> </part> <part class="input"> <input name="name" size="50"></input> @@ -53,7 +53,7 @@ <part class="line"> <part class="label"> - <text text="global_DESCRIPTION"></text> + <text value="${message:global_DESCRIPTION}"></text> </part> <part class="input"> <inputarea rows="5" cols="50" name="description" default=""></inputarea> diff --git a/modules/cms/ui/themes/default/html/views/folder/createlink.php b/modules/cms/ui/themes/default/html/views/folder/createlink.php @@ -1,42 +1,42 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="createlink" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="folder" /> - <input type="hidden" name="subaction" value="createlink" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_NAME'))) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('createlink') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form folder') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('folder') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('createlink') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_NAME').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="name" type="text" maxlength="256" value="" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('name') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml('') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_DESCRIPTION').'') ?> </span> </div> - <div class="input"> - <textarea name="description" class="inputarea"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('description') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml('') ?> </textarea> </div> </div> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/createlink.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/createlink.tpl.src.xml @@ -4,7 +4,7 @@ <part class="line"> <part class="label"> - <text text="global_NAME"></text> + <text value="${message:global_NAME}"></text> </part> <part class="input"> <input name="name" size="20" default=""></input> @@ -20,7 +20,7 @@ <part class="line"> <part class="label"> - <text text="global_DESCRIPTION"></text> + <text value="${message:global_DESCRIPTION}"></text> </part> <part class="input"> <inputarea rows="5" cols="50" name="description" default=""></inputarea> diff --git a/modules/cms/ui/themes/default/html/views/folder/createpage.php b/modules/cms/ui/themes/default/html/views/folder/createpage.php @@ -1,51 +1,51 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="createpage" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="folder" /> - <input type="hidden" name="subaction" value="createpage" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_TEMPLATE'))) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('createpage') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form folder') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('folder') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('createpage') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_TEMPLATE').'') ?> </span> </div> - <div class="input"> - <select name="templateid" size="1"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('templateid') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> <?php foreach($templates as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$templateid){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==''){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_NAME'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_NAME').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="name" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus,name" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('name') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$name.'') ?>" class="<?php echo escapeHtml('focus,name') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_DESCRIPTION').'') ?> </span> </div> - <div class="input"> - <textarea name="description" class="inputarea"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('description') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml('') ?> </textarea> </div> </div> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/createpage.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/createpage.tpl.src.xml @@ -4,7 +4,7 @@ <form> <part class="line"> <part class="label"> - <text text="global_TEMPLATE"></text> + <text value="${message:global_TEMPLATE}"></text> </part> <part class="input"> <selectbox name="templateid" default="" list="templates"></selectbox> @@ -14,7 +14,7 @@ <part class="line"> <part class="label"> - <text text="global_NAME"></text> + <text value="${message:global_NAME}"></text> </part> <part class="input"> <input name="name" size="20" class="focus,name"></input> @@ -24,7 +24,7 @@ <part class="line"> <part class="label"> - <text text="global_DESCRIPTION"></text> + <text value="${message:global_DESCRIPTION}"></text> </part> <part class="input"> diff --git a/modules/cms/ui/themes/default/html/views/folder/createtext.php b/modules/cms/ui/themes/default/html/views/folder/createtext.php @@ -1,86 +1,86 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="createtext" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="folder" /> - <input type="hidden" name="subaction" value="createtext" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <div class="line"> - <div class="label"> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_FILE'))) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('createtext') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form folder') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('folder') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('createtext') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_FILE').'') ?> </span> </label> </div> - <div class="input"> - <input multiple="multiple" id="req0_file" name="file" size="40" maxlength="<?php echo encodeHtml(htmlentities(@$maxlength)) ?>" class="upload" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <input multiple="<?php echo escapeHtml('multiple') ?>" id="<?php echo escapeHtml('req0_file') ?>" name="<?php echo escapeHtml('file') ?>" size="<?php echo escapeHtml('40') ?>" maxlength="<?php echo escapeHtml(''.@$maxlength.'') ?>" class="<?php echo escapeHtml('upload') ?>" /><?php echo escapeHtml('') ?> </div> </div> - <div class="line or-dropzone-upload"> - <div class="label"> + <div class="<?php echo escapeHtml('line or-dropzone-upload') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> </div> </div> - <div class="line"> - <div class="label"> - <span class="help"><?php echo encodeHtml(htmlentities(@lang('file_max_size'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml(''.@lang('file_max_size').'') ?> </span> </div> - <div class="input"> - <span><?php echo encodeHtml(htmlentities(@$max_size)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$max_size.'') ?> </span> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('HTTP_URL'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('HTTP_URL').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="url" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$url)) ?>" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('url') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$url.'') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> - <fieldset class="or-group toggle-open-close open show"> - <legend class="on-click-open-close"><?php echo encodeHtml(htmlentities(@lang('description'))) ?> - <img /> - <div class="arrow arrow-right on-closed"> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('description').'') ?> + <img /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> </div> - <div class="arrow arrow-down on-open"> + <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> </div> </legend> - <div class="closable"> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> </div> </fieldset> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_NAME'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_NAME').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="name" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('name') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$name.'') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_DESCRIPTION').'') ?> </span> </div> - <div class="input"> - <textarea name="description" class="inputarea"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('description') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml('') ?> </textarea> </div> </div> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> diff --git a/modules/cms/ui/themes/default/html/views/folder/createtext.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/createtext.tpl.src.xml @@ -5,7 +5,7 @@ <part class="line"> <part class="label"> <label for="name"> - <text text="global_FILE"></text> + <text value="${message:global_FILE}"></text> </label> </part> <part class="input"> @@ -25,24 +25,24 @@ <text class="help" key="file_max_size"></text> </part> <part class="input"> - <text var="max_size"></text> + <text value="${max_size}"></text> </part> </part> <part class="line"> <part class="label"> - <text key="HTTP_URL"></text> + <text value="${message:HTTP_URL}"></text> </part> <part class="input"> <input name="url" size="50"></input> </part> </part> - <group title="#{description}"></group> + <group title="${message:description}"></group> <part class="line"> <part class="label"> - <text text="global_NAME"></text> + <text value="${message:global_NAME}"></text> </part> <part class="input"> <input name="name" size="50"></input> @@ -52,7 +52,7 @@ <part class="line"> <part class="label"> - <text text="global_DESCRIPTION"></text> + <text value="${message:global_DESCRIPTION}"></text> </part> <part class="input"> <inputarea rows="5" cols="50" name="description" default=""></inputarea> diff --git a/modules/cms/ui/themes/default/html/views/folder/createurl.php b/modules/cms/ui/themes/default/html/views/folder/createurl.php @@ -1,53 +1,53 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="createurl" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="folder" /> - <input type="hidden" name="subaction" value="createurl" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('URL'))) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('createurl') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form folder') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('folder') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('createurl') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('URL').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="url" type="text" maxlength="256" value="" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('url') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml('') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_NAME'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_NAME').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="name" type="text" maxlength="256" value="" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('name') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml('') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('global_DESCRIPTION'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('global_DESCRIPTION').'') ?> </span> </div> - <div class="input"> - <textarea name="description" class="inputarea"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('description') ?>" class="<?php echo escapeHtml('inputarea') ?>"><?php echo escapeHtml('') ?> </textarea> </div> </div> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/createurl.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/createurl.tpl.src.xml @@ -4,7 +4,7 @@ <part class="line"> <part class="label"> - <text text="URL"></text> + <text value="${message:URL}"></text> </part> <part class="input"> <input name="url" size="50" default=""></input> @@ -13,7 +13,7 @@ <part class="line"> <part class="label"> - <text text="global_NAME"></text> + <text value="${message:global_NAME}"></text> </part> <part class="input"> <input name="name" size="20" default=""></input> @@ -29,7 +29,7 @@ <part class="line"> <part class="label"> - <text text="global_DESCRIPTION"></text> + <text value="${message:global_DESCRIPTION}"></text> </part> <part class="input"> <inputarea rows="5" cols="50" name="description" default=""></inputarea> diff --git a/modules/cms/ui/themes/default/html/views/folder/edit.php b/modules/cms/ui/themes/default/html/views/folder/edit.php @@ -1,65 +1,65 @@ <?php if (defined('OR_TITLE')) { ?> - <div class="or-table-wrapper"> - <div class="or-table-filter"> - <input type="search" name="filter" placeholder="<?php echo encodeHtml(htmlentities(@lang('SEARCH_FILTER'))) ?>" /> + <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> </div> - <div class="or-table-area"> - <table width="100%"> - <tr class="headline"> - <th> - <span><?php echo encodeHtml(htmlentities(@lang('TYPE'))) ?> + <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> + <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> + <tr class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml('') ?> + <th><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('TYPE').'') ?> </span> </th> - <th> - <span><?php echo encodeHtml(htmlentities(@lang('NAME'))) ?> + <th><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('NAME').'') ?> </span> </th> - <th> - <span><?php echo encodeHtml(htmlentities(@lang('LASTCHANGE'))) ?> + <th><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('LASTCHANGE').'') ?> </span> </th> </tr> <?php $if1=(isset($up_url)); if($if1) { ?> - <tr class="data clickable"> - <td> - <a target="_self" data-type="open" data-action="folder" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$parentid)) ?>" data-extra="[]" href="/#/folder/<?php echo encodeHtml(htmlentities(@$parentid)) ?>"> - <i class="image-icon image-icon--action-folder"> + <tr class="<?php echo escapeHtml('data clickable') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('open') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-method="<?php echo escapeHtml('') ?>" data-id="<?php echo escapeHtml(''.@$parentid.'') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/folder/'.@$parentid.'') ?>"><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--action-folder') ?>"><?php echo escapeHtml('') ?> </i> - <span>.. + <span><?php echo escapeHtml('..') ?> </span> </a> </td> - <td> - <span> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml('') ?> </span> </td> </tr> <?php } ?> - <?php foreach($object as $list_key=>$list_value) { extract($list_value); ?> - <tr class="data clickable"> - <td> - <i class="image-icon image-icon--action-<?php echo encodeHtml(htmlentities(@$icon)) ?>"> + <?php foreach((array)$object as $list_key=>$list_value) { extract($list_value); ?> + <tr class="<?php echo escapeHtml('data clickable') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--action-'.@$icon.'') ?>"><?php echo escapeHtml('') ?> </i> </td> - <td> - <a title="<?php echo encodeHtml(htmlentities(@$desc)) ?>" target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="<?php echo encodeHtml(htmlentities(@$type)) ?>" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/<?php echo encodeHtml(htmlentities(@$type)) ?>/<?php echo encodeHtml(htmlentities(@$id)) ?>"> - <span><?php echo encodeHtml(htmlentities(@$name)) ?> + <td><?php echo escapeHtml('') ?> + <a title="<?php echo escapeHtml(''.@$desc.'') ?>" target="<?php echo escapeHtml('_self') ?>" date-name="<?php echo escapeHtml(''.@$name.'') ?>" name="<?php echo escapeHtml(''.@$name.'') ?>" data-type="<?php echo escapeHtml('open') ?>" data-action="<?php echo escapeHtml(''.@$type.'') ?>" data-method="<?php echo escapeHtml('') ?>" data-id="<?php echo escapeHtml(''.@$id.'') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/'.@$type.'/'.@$id.'') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$name.'') ?> </span> - <span> + <span><?php echo escapeHtml(' ') ?> </span> </a> </td> - <td> + <td><?php echo escapeHtml('') ?> <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($date); ?> <?php } ?> </td> </tr> <?php } ?> <?php $if1=(($object)==FALSE); if($if1) { ?> - <tr> - <td colspan="2"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_NOT_FOUND').'') ?> </span> </td> </tr> @@ -67,11 +67,11 @@ </table> </div> </div> - <div class="clickable"> - <a target="_self" data-type="dialog" data-action="folder" data-method="create" data-id="" data-extra="{'dialogAction':'folder','dialogMethod':'create'}" href="/#/folder/" class="or-link-btn"> - <i class="image-icon image-icon--action-new"> + <div class="<?php echo escapeHtml('clickable') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('dialog') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-method="<?php echo escapeHtml('create') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('{\'dialogAction\':\'folder\',\'dialogMethod\':\'create\'}') ?>" href="<?php echo escapeHtml('/#/folder/') ?>" class="<?php echo escapeHtml('or-link-btn') ?>"><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--action-new') ?>"><?php echo escapeHtml('') ?> </i> - <span><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + <span><?php echo escapeHtml(''.@lang('new').'') ?> </span> </a> </div> diff --git a/modules/cms/ui/themes/default/html/views/folder/edit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/edit.tpl.src.xml @@ -3,13 +3,13 @@ <table> <row class="headline"> <column header="true"> - <text key="TYPE"></text> + <text value="${message:TYPE}"></text> </column> <column header="true"> - <text key="NAME"></text> + <text value="${message:NAME}"></text> </column> <column header="true"> - <text key="LASTCHANGE"></text> + <text value="${message:LASTCHANGE}"></text> </column> </row> <if present="up_url"> @@ -25,15 +25,15 @@ </column> </row> </if> - <list list="object" extract="true"> + <list list="${object}" extract="true"> <row class="data clickable"> <column class=""> <image action="${icon}"></image> </column> <column class=""> <link type="open" id="${id}" name="${name}" action="${type}" title="${desc}"> - <text var="name"></text> - <text raw="_"></text> + <text value="${name}"></text> + <text value=" "></text> </link> </column> <column> @@ -41,10 +41,10 @@ </column> </row> </list> - <if empty="object"> + <if empty="${object}"> <row> <column colspan="2"> - <text text="GLOBAL_NOT_FOUND"></text> + <text value="${message:GLOBAL_NOT_FOUND}"></text> </column> </row> </if> @@ -54,7 +54,7 @@ <link type="dialog" action="folder" subaction="create" class="or-link-btn"> <image action="new" /> - <text key="new"></text> + <text value="${message:new}"></text> </link> </part> </output> diff --git a/modules/cms/ui/themes/default/html/views/folder/inherit.php b/modules/cms/ui/themes/default/html/views/folder/inherit.php @@ -1,33 +1,33 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="inherit" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="folder" /> - <input type="hidden" name="subaction" value="inherit" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <?php $if1=($type=='folder'); if($if1) { ?> - <fieldset class="or-group toggle-open-close open show"> - <legend class="on-click-open-close"><?php echo encodeHtml(htmlentities(@lang('options'))) ?> - <img /> - <div class="arrow arrow-right on-closed"> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('inherit') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form folder') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('folder') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('inherit') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <?php $if1=($type==folder); if($if1) { ?> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('options').'') ?> + <img /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> </div> - <div class="arrow arrow-down on-open"> + <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> </div> </legend> - <div class="closable"> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <?php { $inherit= '1'; ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <?php { $inherit= 1; ?> <?php } ?> - <div class="inputholder"> - <input name="inherit" type="checkbox" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$inherit)) ?>" /> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('inherit') ?>" type="<?php echo escapeHtml('checkbox') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$inherit.'') ?>" /><?php echo escapeHtml('') ?> </div> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('inherit_rights'))) ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('inherit_rights').'') ?> </span> </label> </div> @@ -36,9 +36,9 @@ </fieldset> <?php } ?> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/inherit.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/inherit.tpl.src.xml @@ -4,7 +4,7 @@ <form> <if value="${type}" equals="folder"> - <group title="#{options}"> + <group title="${message:options}"> <part class="line"> <part class="label"> </part> @@ -12,7 +12,7 @@ <set var="inherit" value="1"></set> <input type="checkbox" name="inherit"></input> <label for="inherit"> - <text key="inherit_rights"></text> + <text value="${message:inherit_rights}"></text> </label> </part> </part> diff --git a/modules/cms/ui/themes/default/html/views/folder/order.php b/modules/cms/ui/themes/default/html/views/folder/order.php @@ -1,60 +1,60 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="order" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="folder" /> - <input type="hidden" name="subaction" value="order" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <div class="or-table-wrapper"> - <div class="or-table-filter"> - <input type="search" name="filter" placeholder="<?php echo encodeHtml(htmlentities(@lang('SEARCH_FILTER'))) ?>" /> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('order') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form folder') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('folder') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('order') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> </div> - <div class="or-table-area"> - <table width="100%" class="or-table--sortable"> - <tr class="headline"> - <td class="help"> - <span><?php echo encodeHtml(htmlentities(@lang('FOLDER_ORDER'))) ?> + <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> + <table width="<?php echo escapeHtml('100%') ?>" class="<?php echo escapeHtml('or-table--sortable') ?>"><?php echo escapeHtml('') ?> + <tr class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml('') ?> + <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('FOLDER_ORDER').'') ?> </span> </td> - <td class="help"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_TYPE'))) ?> + <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_TYPE').'') ?> </span> </td> - <td class="help"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_NAME').'') ?> </span> </td> - <td class="help"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_FILENAME'))) ?> + <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_FILENAME').'') ?> </span> </td> - <td class="help"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_LASTCHANGE'))) ?> + <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_LASTCHANGE').'') ?> </span> </td> </tr> - <?php foreach($object as $list_key=>$list_value) { extract($list_value); ?> - <tr data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" class="data"> - <td> - <span> + <?php foreach((array)$object as $list_key=>$list_value) { extract($list_value); ?> + <tr data-id="<?php echo escapeHtml(''.@$id.'') ?>" class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(' ') ?> </span> </td> - <td> - <span class="sort-value"><?php echo encodeHtml(htmlentities(@$icon)) ?> + <td><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('sort-value') ?>"><?php echo escapeHtml(''.@$icon.'') ?> </span> - <i class="image-icon image-icon--action-<?php echo encodeHtml(htmlentities(@$icon)) ?>"> + <i class="<?php echo escapeHtml('image-icon image-icon--action-'.@$icon.'') ?>"><?php echo escapeHtml('') ?> </i> </td> - <td> - <span><?php echo encodeHtml(htmlentities(@$name)) ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$name.'') ?> </span> </td> - <td> - <span><?php echo encodeHtml(htmlentities(@$filename)) ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$filename.'') ?> </span> </td> - <td> + <td><?php echo escapeHtml('') ?> <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($date); ?> <?php } ?> </td> @@ -63,11 +63,11 @@ </table> </div> </div> - <input type="hidden" name="order" value="<?php echo encodeHtml(htmlentities(@$order)) ?>" /> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('order') ?>" value="<?php echo escapeHtml(''.@$order.'') ?>" /><?php echo escapeHtml('') ?> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/order.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/order.tpl.src.xml @@ -5,35 +5,35 @@ <row class="headline"> <column class="help"> - <text key="FOLDER_ORDER"></text> + <text value="${message:FOLDER_ORDER}"></text> </column> <column class="help"> - <text key="GLOBAL_TYPE"></text> + <text value="${message:GLOBAL_TYPE}"></text> </column> <column class="help"> - <text key="GLOBAL_NAME"></text> + <text value="${message:GLOBAL_NAME}"></text> </column> <column class="help"> - <text key="GLOBAL_FILENAME"></text> + <text value="${message:GLOBAL_FILENAME}"></text> </column> <column class="help"> - <text key="GLOBAL_LASTCHANGE"></text> + <text value="${message:GLOBAL_LASTCHANGE}"></text> </column> </row> - <list list="object" extract="true"> + <list list="${object}" extract="true"> <row class="data" id="${id}"> <column> - <text raw="_"></text> + <text value=" "></text> </column> <column> <text class="sort-value" value="${icon}" /> <image action="${icon}"></image> </column> <column> - <text var="name"></text> + <text value="${name}"></text> </column> <column> - <text var="filename"></text> + <text value="${filename}"></text> </column> <column> <date date="${date}"></date> 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,81 +1,81 @@ <?php if (defined('OR_TITLE')) { ?> <?php $if1=(config('security','nopublish')); if($if1) { ?> - <div class="message warn"> - <span class="help"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOPUBLISH_DESC'))) ?> + <div class="<?php echo escapeHtml('message warn') ?>"><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml(''.@lang('GLOBAL_NOPUBLISH_DESC').'') ?> </span> </div> <?php } ?> - <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="1" data-autosave="" class="or-form folder"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="folder" /> - <input type="hidden" name="subaction" value="pub" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('pub') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('1') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form folder') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('folder') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('pub') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> <?php $if1=($pages); if($if1) { ?> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <input type="checkbox" name="pages" value="1" <?php if(@$pages){ ?>checked="1"<?php } ?> /> - <label class="label"> - <span> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('pages') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$pages){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(' ') ?> </span> - <span><?php echo encodeHtml(htmlentities(@lang('global_pages'))) ?> + <span><?php echo escapeHtml(''.@lang('global_pages').'') ?> </span> </label> </div> </div> <?php } ?> <?php $if1=($files); if($if1) { ?> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <input type="checkbox" name="files" value="1" <?php if(@$files){ ?>checked="1"<?php } ?> /> - <label class="label"> - <span> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('files') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$files){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(' ') ?> </span> - <span><?php echo encodeHtml(htmlentities(@lang('global_files'))) ?> + <span><?php echo escapeHtml(''.@lang('global_files').'') ?> </span> </label> </div> </div> <?php } ?> - <fieldset class="or-group toggle-open-close open show"> - <legend class="on-click-open-close"><?php echo encodeHtml(htmlentities(@lang('options'))) ?> - <img /> - <div class="arrow arrow-right on-closed"> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('options').'') ?> + <img /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> </div> - <div class="arrow arrow-down on-open"> + <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> </div> </legend> - <div class="closable"> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> <?php $if1=(isset($subdirs)); if($if1) { ?> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <input type="checkbox" name="subdirs" disabled="disabled" value="1" <?php if(@$subdirs){ ?>checked="1"<?php } ?> /> - <label class="label"> - <span> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('subdirs') ?>" disabled="<?php echo escapeHtml('disabled') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$subdirs){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(' ') ?> </span> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_PUBLISH_WITH_SUBDIRS'))) ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_PUBLISH_WITH_SUBDIRS').'') ?> </span> </label> </div> </div> <?php } ?> <?php $if1=(isset($clean)); if($if1) { ?> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <input type="checkbox" name="clean" value="1" <?php if(@$clean){ ?>checked="1"<?php } ?> /> - <label class="label"> - <span> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('clean') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$clean){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(' ') ?> </span> - <span><?php echo encodeHtml(htmlentities(@lang('global_CLEAN_AFTER_PUBLISH'))) ?> + <span><?php echo escapeHtml(''.@lang('global_CLEAN_AFTER_PUBLISH').'') ?> </span> </label> </div> @@ -84,8 +84,8 @@ </div> </fieldset> </div> - <div class="or-form-actionbar"> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('publish'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('publish').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/pub.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/pub.tpl.src.xml @@ -4,14 +4,14 @@ <!-- Falls das Veroeffentlichen deaktiviert ist, eine Warnmeldung anzeigen. --> - <if true="%{security/nopublish}"> + <if true="${config:security/nopublish}"> <part class="message warn"> - <text key="GLOBAL_NOPUBLISH_DESC" class="help"></text> + <text value="${message:GLOBAL_NOPUBLISH_DESC}" class="help"></text> </part> </if> - <form cancel="false" visible="true" label="#{publish}" async="true"> + <form cancel="false" visible="true" label="${message:publish}" async="true"> <if true="${pages}"> <part class="line"> @@ -20,8 +20,8 @@ <part class="input"> <checkbox name="pages"></checkbox> <label for="pages"> - <text raw="_"></text> - <text text="global_pages"></text> + <text value=" "></text> + <text value="${message:global_pages}"></text> </label> </part> </part> @@ -33,14 +33,14 @@ <part class="input"> <checkbox name="files"></checkbox> <label for="files"> - <text raw="_"></text> - <text text="global_files"></text> + <text value=" "></text> + <text value="${message:global_files}"></text> </label> </part> </part> </if> - <group title="#{options}"> + <group title="${message:options}"> <if present="subdirs"> <part class="line"> <part class="label"> @@ -48,8 +48,8 @@ <part class="input"> <checkbox readonly="${subdirs}" name="subdirs"></checkbox> <label for="subdirs"> - <text raw="_"></text> - <text text="GLOBAL_PUBLISH_WITH_SUBDIRS"></text> + <text value=" "></text> + <text value="${message:GLOBAL_PUBLISH_WITH_SUBDIRS}"></text> </label> </part> </part> @@ -61,8 +61,8 @@ <part class="input"> <checkbox name="clean"></checkbox> <label for="clean"> - <text raw="_"></text> - <text text="global_CLEAN_AFTER_PUBLISH"></text> + <text value=" "></text> + <text value="${message:global_CLEAN_AFTER_PUBLISH}"></text> </label> </part> </part> diff --git a/modules/cms/ui/themes/default/html/views/folder/remove.php b/modules/cms/ui/themes/default/html/views/folder/remove.php @@ -1,31 +1,31 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form folder"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="folder" /> - <input type="hidden" name="subaction" value="remove" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <label class="or-form-row"> - <span class="or-form-input"> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('remove') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form folder') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('folder') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('remove') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('or-form-row') ?>"><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('or-form-input') ?>"><?php echo escapeHtml('') ?> </span> - <span class="or-form-label">message:GLOBAL_NAME + <span class="<?php echo escapeHtml('or-form-label') ?>"><?php echo escapeHtml(''.@lang('GLOBAL_NAME').'') ?> </span> </label> - <label class="or-form-row or-form-checkbox"> - <span class="or-form-label">GLOBAL_DELETE + <label class="<?php echo escapeHtml('or-form-row or-form-checkbox') ?>"><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('or-form-label') ?>"><?php echo escapeHtml(''.@lang('GLOBAL_DELETE').'') ?> </span> - <input type="checkbox" name="delete" value="1" <?php if(@$delete){ ?>checked="1"<?php } ?> /> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('delete') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> </label> - <label class="or-form-row or-form-checkbox"> - <span class="or-form-label">GLOBAL_DELETE_WITH_CHILDREN + <label class="<?php echo escapeHtml('or-form-row or-form-checkbox') ?>"><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('or-form-label') ?>"><?php echo escapeHtml(''.@lang('GLOBAL_DELETE_WITH_CHILDREN').'') ?> </span> - <input type="checkbox" name="withChildren" disabled="disabled" value="1" <?php if(@$withChildren){ ?>checked="1"<?php } ?> /> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('withChildren') ?>" disabled="<?php echo escapeHtml('disabled') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$withChildren){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> </label> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/remove.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/remove.tpl.src.xml @@ -4,8 +4,8 @@ <form> <text label="GLOBAL_NAME" var="name"></text> - <checkbox label="GLOBAL_DELETE" name="delete"></checkbox> + <checkbox label="${message:GLOBAL_DELETE}" name="delete"></checkbox> - <checkbox label="GLOBAL_DELETE_WITH_CHILDREN" name="withChildren" readonly="not:var:hasChildren"></checkbox> + <checkbox label="${message:GLOBAL_DELETE_WITH_CHILDREN}" name="withChildren" readonly="not:var:hasChildren"></checkbox> </form> </output> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/show.php b/modules/cms/ui/themes/default/html/views/folder/show.php @@ -1,60 +1,60 @@ <?php if (defined('OR_TITLE')) { ?> - <div class="or-table-wrapper"> - <div class="or-table-filter"> - <input type="search" name="filter" placeholder="<?php echo encodeHtml(htmlentities(@lang('SEARCH_FILTER'))) ?>" /> + <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> </div> - <div class="or-table-area"> - <table width="100%"> - <tr class="headline"> - <th> - <span><?php echo encodeHtml(htmlentities(@lang('TYPE'))) ?> + <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> + <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> + <tr class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml('') ?> + <th><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('TYPE').'') ?> </span> </th> - <th> - <span><?php echo encodeHtml(htmlentities(@lang('NAME'))) ?> + <th><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('NAME').'') ?> </span> </th> - <th> - <span><?php echo encodeHtml(htmlentities(@lang('LASTCHANGE'))) ?> + <th><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('LASTCHANGE').'') ?> </span> </th> </tr> <?php $if1=(isset($up_url)); if($if1) { ?> - <tr class="data clickable"> - <td> - <i class="image-icon image-icon--action-folder"> + <tr class="<?php echo escapeHtml('data clickable') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--action-folder') ?>"><?php echo escapeHtml('') ?> </i> </td> - <td> - <span>.. + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml('..') ?> </span> </td> - <td> - <span> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml('') ?> </span> </td> </tr> <?php } ?> - <?php foreach($object as $list_key=>$list_value) { extract($list_value); ?> - <tr class="data"> - <td title="<?php echo encodeHtml(htmlentities(@$desc)) ?>" data-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-action="<?php echo encodeHtml(htmlentities(@$type)) ?>" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" class="clickable <?php echo encodeHtml(htmlentities(@$class)) ?>"> - <img src="./modules/cms/ui/themes/default/images/icon_<?php echo encodeHtml(htmlentities(@$icon)) ?>.png" /> - <span><?php echo encodeHtml(htmlentities(@$name)) ?> + <?php foreach((array)$object as $list_key=>$list_value) { extract($list_value); ?> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td title="<?php echo escapeHtml(''.@$desc.'') ?>" data-name="<?php echo escapeHtml(''.@$name.'') ?>" data-action="<?php echo escapeHtml(''.@$type.'') ?>" data-id="<?php echo escapeHtml(''.@$id.'') ?>" class="<?php echo escapeHtml('clickable '.@$class.'') ?>"><?php echo escapeHtml('') ?> + <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon_'.@$icon.'.png') ?>" /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$name.'') ?> </span> - <span> + <span><?php echo escapeHtml(' ') ?> </span> </td> - <td> + <td><?php echo escapeHtml('') ?> <?php include_once( 'modules/template_engine/components/html/date/component-date.php'); { component_date($date); ?> <?php } ?> </td> </tr> <?php } ?> <?php $if1=(($object)==FALSE); if($if1) { ?> - <tr> - <td colspan="2"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_NOT_FOUND').'') ?> </span> </td> </tr> @@ -62,11 +62,11 @@ </table> </div> </div> - <div class="clickable"> - <a target="_self" data-type="view" data-action="folder" data-method="create" data-id="" data-extra="[]" href="/#/folder/" class="or-link-btn"> - <i class="image-icon image-icon--action-new"> + <div class="<?php echo escapeHtml('clickable') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('view') ?>" data-action="<?php echo escapeHtml('folder') ?>" data-method="<?php echo escapeHtml('create') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/folder/') ?>" class="<?php echo escapeHtml('or-link-btn') ?>"><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--action-new') ?>"><?php echo escapeHtml('') ?> </i> - <span><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + <span><?php echo escapeHtml(''.@lang('new').'') ?> </span> </a> </div> diff --git a/modules/cms/ui/themes/default/html/views/folder/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/show.tpl.src.xml @@ -3,13 +3,13 @@ <table> <row class="headline"> <column header="true"> - <text key="TYPE"></text> + <text value="${message:TYPE}"></text> </column> <column header="true"> - <text key="NAME"></text> + <text value="${message:NAME}"></text> </column> <column header="true"> - <text key="LASTCHANGE"></text> + <text value="${message:LASTCHANGE}"></text> </column> </row> <if present="up_url"> @@ -18,29 +18,29 @@ <image action="folder" /> </column> <column url="${up_url}"> - <text raw=".."></text> + <text value=".."></text> </column> <column> <text raw=""></text> </column> </row> </if> - <list list="object" extract="true"> + <list list="${object}" extract="true"> <row class="data"> <column id="${id}" name="${name}" action="${type}" title="${desc}" class="${class}"> <image type="${icon}"></image> - <text var="name"></text> - <text raw="_"></text> + <text value="${name}"></text> + <text value=" "></text> </column> <column> <date date="${date}"></date> </column> </row> </list> - <if empty="object"> + <if empty="${object}"> <row> <column colspan="2"> - <text text="GLOBAL_NOT_FOUND"></text> + <text value="${message:GLOBAL_NOT_FOUND}"></text> </column> </row> </if> @@ -50,7 +50,7 @@ <link type="view" action="folder" subaction="create" class="or-link-btn"> <image action="new" /> - <text key="new"></text> + <text value="${message:new}"></text> </link> </part> </output> diff --git a/modules/cms/ui/themes/default/html/views/folder/structure.php b/modules/cms/ui/themes/default/html/views/folder/structure.php @@ -1,6 +1,6 @@ <?php if (defined('OR_TITLE')) { ?> - <div class="structure tree"> - + <div class="<?php echo escapeHtml('structure tree') ?>"><?php echo escapeHtml('') ?> + <?php echo escapeHtml('') ?> </div> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/group/add.php b/modules/cms/ui/themes/default/html/views/group/add.php @@ -1,27 +1,27 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form group"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="group" /> - <input type="hidden" name="subaction" value="add" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <div class="line"> - <div class="label"> - <label class="label"><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('add') ?>" data-action="<?php echo escapeHtml('group') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form group') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('group') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('add') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml(''.@lang('name').'') ?> </label> </div> - <div class="input"> - <div class="inputholder"> - <input name="name" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('name') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$name.'') ?>" class="<?php echo escapeHtml('focus') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/group/info.php b/modules/cms/ui/themes/default/html/views/group/info.php @@ -1,56 +1,56 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form group"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="group" /> - <input type="hidden" name="subaction" value="info" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <span class="headline"><?php echo encodeHtml(htmlentities(@$name)) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('info') ?>" data-action="<?php echo escapeHtml('group') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form group') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('group') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('info') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml(''.@$name.'') ?> </span> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_NAME').'') ?> </span> </div> - <div class="input clickable"> - <span><?php echo encodeHtml(htmlentities(@$name)) ?> + <div class="<?php echo escapeHtml('input clickable') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$name.'') ?> </span> - <a target="_self" data-type="edit" data-action="group" data-method="prop" data-id="" data-extra="[]" href="/#/group/" class="or-link-btn"> - <span><?php echo encodeHtml(htmlentities(@lang('edit'))) ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('edit') ?>" data-action="<?php echo escapeHtml('group') ?>" data-method="<?php echo escapeHtml('prop') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/group/') ?>" class="<?php echo escapeHtml('or-link-btn') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('edit').'') ?> </span> </a> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('USERS'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('USERS').'') ?> </span> </div> - <div class="input"> - <?php foreach($users as $id=>$name) { ?> - <div class="clickable"> - <a target="_self" data-type="open" data-action="user" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/user/<?php echo encodeHtml(htmlentities(@$id)) ?>"> - <span><?php echo encodeHtml(htmlentities(@$name)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <?php foreach((array)$users as $id=>$name) { ?> + <div class="<?php echo escapeHtml('clickable') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('open') ?>" data-action="<?php echo escapeHtml('user') ?>" data-method="<?php echo escapeHtml('') ?>" data-id="<?php echo escapeHtml(''.@$id.'') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/user/'.@$id.'') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$name.'') ?> </span> </a> - <br /> + <br /><?php echo escapeHtml('') ?> </div> <?php } ?> </div> </div> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input clickable"> - <a target="_self" data-type="edit" data-action="group" data-method="memberships" data-id="" data-extra="[]" href="/#/group/" class="or-link-btn"> - <span><?php echo encodeHtml(htmlentities(@lang('edit'))) ?> + <div class="<?php echo escapeHtml('input clickable') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('edit') ?>" data-action="<?php echo escapeHtml('group') ?>" data-method="<?php echo escapeHtml('memberships') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/group/') ?>" class="<?php echo escapeHtml('or-link-btn') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('edit').'') ?> </span> </a> </div> </div> </div> - <div class="or-form-actionbar"> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/group/info.tpl.src.xml b/modules/cms/ui/themes/default/html/views/group/info.tpl.src.xml @@ -6,26 +6,26 @@ <part class="line"> <part class="label"> - <text text="GLOBAL_NAME"></text> + <text value="${message:GLOBAL_NAME}"></text> </part> <part class="input clickable"> - <text var="name"/> + <text value="${name}"/> <link class="or-link-btn" action="group" subaction="prop" type="edit"> - <text key="edit"/> + <text value="${message:edit}"/> </link> </part> </part> <part class="line"> <part class="label"> - <text text="USERS"></text> + <text value="${message:USERS}"></text> </part> <part class="input"> - <list list="users" key="id" value="name"> + <list list="${users}" key="id" value="name"> <part class="clickable"> <link type="open" action="user" id="${id}"> - <text var="name"/> + <text value="${name}"/> </link> <newline/> </part> @@ -39,7 +39,7 @@ <part class="input clickable"> <link class="or-link-btn" action="group" subaction="memberships" type="edit"> - <text key="edit"/> + <text value="${message:edit}"/> </link> </part> </part> diff --git a/modules/cms/ui/themes/default/html/views/group/memberships.php b/modules/cms/ui/themes/default/html/views/group/memberships.php @@ -1,35 +1,35 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="memberships" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="1" class="or-form group"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="group" /> - <input type="hidden" name="subaction" value="memberships" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <div class="or-table-wrapper"> - <div class="or-table-filter"> - <input type="search" name="filter" placeholder="<?php echo encodeHtml(htmlentities(@lang('SEARCH_FILTER'))) ?>" /> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('memberships') ?>" data-action="<?php echo escapeHtml('group') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('1') ?>" class="<?php echo escapeHtml('or-form group') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('group') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('memberships') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> </div> - <div class="or-table-area"> - <table width="100%"> - <tr class="headline"> - <td width="10%"> + <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> + <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> + <tr class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml('') ?> + <td width="<?php echo escapeHtml('10%') ?>"><?php echo escapeHtml('') ?> </td> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('name').'') ?> </span> </td> </tr> - <?php foreach($memberships as $list_key=>$list_value) { extract($list_value); ?> - <tr class="data"> - <td> - <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$var)) ?>" value="1" <?php if(@$${var}){ ?>checked="1"<?php } ?> /> + <?php foreach((array)$memberships as $list_key=>$list_value) { extract($list_value); ?> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml(''.@$var.'') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$$var){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> </td> - <td> - <label class="label"> - <i class="image-icon image-icon--action-user"> + <td><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--action-user') ?>"><?php echo escapeHtml('') ?> </i> - <span><?php echo encodeHtml(htmlentities(@$name)) ?> + <span><?php echo escapeHtml(''.@$name.'') ?> </span> </label> </td> @@ -38,15 +38,15 @@ </table> </div> </div> - <tr> - <td colspan="2" class="act"> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> </td> </tr> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/group/memberships.tpl.src.xml b/modules/cms/ui/themes/default/html/views/group/memberships.tpl.src.xml @@ -5,10 +5,10 @@ <row class="headline"> <column width="10%"></column> <column> - <text key="name"></text> + <text value="${message:name}"></text> </column> </row> - <list list="memberships" extract="true"> + <list list="${memberships}" extract="true"> <row class="data"> <column> <checkbox name="${var}"></checkbox> @@ -16,7 +16,7 @@ <column> <label for="${var}"> <image action="user"></image> - <text var="name"></text> + <text value="${name}"></text> </label> </column> </row> diff --git a/modules/cms/ui/themes/default/html/views/group/prop.php b/modules/cms/ui/themes/default/html/views/group/prop.php @@ -1,28 +1,28 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="group" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form group"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="group" /> - <input type="hidden" name="subaction" value="prop" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <div class="line"> - <div class="label"> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('prop') ?>" data-action="<?php echo escapeHtml('group') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('post') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form group') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('group') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('prop') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_NAME').'') ?> </span> </label> </div> - <div class="input"> - <div class="inputholder"> - <input name="name" type="text" maxlength="100" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="name focus" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('name') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('100') ?>" value="<?php echo escapeHtml(''.@$name.'') ?>" class="<?php echo escapeHtml('name focus') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/group/prop.tpl.src.xml b/modules/cms/ui/themes/default/html/views/group/prop.tpl.src.xml @@ -4,7 +4,7 @@ <part class="line"> <part class="label"> <label for="name"> - <text text="GLOBAL_NAME"></text> + <text value="${message:GLOBAL_NAME}"></text> </label> </part> <part class="input"> diff --git a/modules/cms/ui/themes/default/html/views/group/remove.php b/modules/cms/ui/themes/default/html/views/group/remove.php @@ -1,45 +1,45 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form group"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="group" /> - <input type="hidden" name="subaction" value="remove" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <div class="line"> - <div class="label"> - <label class="label"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('remove') ?>" data-action="<?php echo escapeHtml('group') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form group') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('group') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('remove') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml(''.@lang('GLOBAL_NAME').'') ?> </label> </div> - <div class="input"> - <span><?php echo encodeHtml(htmlentities(@$name)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$name.'') ?> </span> </div> </div> - <fieldset class="or-group toggle-open-close open show"> - <legend class="on-click-open-close"><?php echo encodeHtml(htmlentities(@lang('options'))) ?> - <img /> - <div class="arrow arrow-right on-closed"> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('options').'') ?> + <img /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> </div> - <div class="arrow arrow-down on-open"> + <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> </div> </legend> - <div class="closable"> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> </div> </fieldset> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <input type="checkbox" name="confirm" value="1" <?php if(@$confirm){ ?>checked="1"<?php } ?> required="required" /> - <label class="label"><?php echo encodeHtml(htmlentities(@lang('GROUP_DELETE'))) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('confirm') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$confirm){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> required="<?php echo escapeHtml('required') ?>" /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml(''.@lang('GROUP_DELETE').'') ?> </label> </div> </div> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/group/remove.tpl.src.xml b/modules/cms/ui/themes/default/html/views/group/remove.tpl.src.xml @@ -7,10 +7,10 @@ <label key="GLOBAL_NAME"></label> </part> <part class="input"> - <text var="name"></text> + <text value="${name}"></text> </part> </part> - <group title="#{options}"></group> + <group title="${message:options}"></group> <part class="line"> <part class="label"></part> <part class="input"> diff --git a/modules/cms/ui/themes/default/html/views/group/rights.php b/modules/cms/ui/themes/default/html/views/group/rights.php @@ -1,69 +1,69 @@ <?php if (defined('OR_TITLE')) { ?> - <div class="or-table-wrapper"> - <div class="or-table-area"> - <table width="100%"> - <?php foreach($projects as $list_key=>$list_value) { extract($list_value); ?> - <tr> - <td> - <fieldset class="or-group toggle-open-close open show"> - <legend class="on-click-open-close"><?php echo encodeHtml(htmlentities(@$projectname)) ?> - <img /> - <div class="arrow arrow-right on-closed"> + <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> + <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> + <?php foreach((array)$projects as $list_key=>$list_value) { extract($list_value); ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@$projectname.'') ?> + <img /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> </div> - <div class="arrow arrow-down on-open"> + <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> </div> </legend> - <div class="closable"> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> <?php $if1=(($rights)==FALSE); if($if1) { ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOT_FOUND'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_NOT_FOUND').'') ?> </span> </td> </tr> <?php } ?> <?php $if1=!(($rights)==FALSE); if($if1) { ?> - <div class="or-table-wrapper"> - <div class="or-table-filter"> - <input type="search" name="filter" placeholder="<?php echo encodeHtml(htmlentities(@lang('SEARCH_FILTER'))) ?>" /> + <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> </div> - <div class="or-table-area"> - <table width="100%"> - <tr class="headline"> - <td class="help"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_USER'))) ?> + <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> + <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> + <tr class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml('') ?> + <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_USER').'') ?> </span> </td> - <td class="help"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_NAME').'') ?> </span> </td> - <td class="help"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_LANGUAGE'))) ?> + <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_LANGUAGE').'') ?> </span> </td> - <?php foreach($show as $list_key=>$t) { ?> - <td class="help"> - <span title="message:acl<?php echo encodeHtml(htmlentities()) ?>"><?php echo encodeHtml(htmlentities(@lang(''.@$t.''))) ?> + <?php foreach((array)$show as $list_key=>$t) { ?> + <td class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml('') ?> + <span title="<?php echo escapeHtml('message:acl_{t}') ?>"><?php echo escapeHtml(''.@lang(''.@$t.'').'') ?> </span> </td> <?php } ?> </tr> - <?php foreach($rights as $aclid=>$acl) { extract($acl); ?> - <tr class="data clickable"> - <td> + <?php foreach((array)$rights as $aclid=>$acl) { extract($acl); ?> + <tr class="<?php echo escapeHtml('data clickable') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> <?php $if1=(isset($groupname)); if($if1) { ?> - <i class="image-icon image-icon--action-group"> + <i class="<?php echo escapeHtml('image-icon image-icon--action-group') ?>"><?php echo escapeHtml('') ?> </i> - <span><?php echo encodeHtml(htmlentities(@$groupname)) ?> + <span><?php echo escapeHtml(''.@$groupname.'') ?> </span> <?php } ?> <?php $if1=!(isset($username)); if($if1) { ?> <?php $if1=!(isset($groupname)); if($if1) { ?> - <i class="image-icon image-icon--action-group"> + <i class="<?php echo escapeHtml('image-icon image-icon--action-group') ?>"><?php echo escapeHtml('') ?> </i> - <span><?php echo encodeHtml(htmlentities(@lang('global_all'))) ?> + <span><?php echo escapeHtml(''.@lang('global_all').'') ?> </span> <?php } ?> <?php } ?> @@ -72,23 +72,23 @@ <?php { unset($groupname) ?> <?php } ?> </td> - <td title="<?php echo encodeHtml(htmlentities(@$objectname)) ?>"> - <i class="image-icon image-icon--action-<?php echo encodeHtml(htmlentities(@$objecttype)) ?>"> + <td title="<?php echo escapeHtml(''.@$objectname.'') ?>"><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--action-'.@$objecttype.'') ?>"><?php echo escapeHtml('') ?> </i> - <a target="_self" data-type="open" data-action="<?php echo encodeHtml(htmlentities(@$objecttype)) ?>" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$objectid)) ?>" data-extra="[]" href="/#/<?php echo encodeHtml(htmlentities(@$objecttype)) ?>/<?php echo encodeHtml(htmlentities(@$objectid)) ?>"> - <span><?php echo encodeHtml(htmlentities(@$objectname)) ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('open') ?>" data-action="<?php echo escapeHtml(''.@$objecttype.'') ?>" data-method="<?php echo escapeHtml('') ?>" data-id="<?php echo escapeHtml(''.@$objectid.'') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/'.@$objecttype.'/'.@$objectid.'') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$objectname.'') ?> </span> </a> </td> - <td> - <span><?php echo encodeHtml(htmlentities(@$languagename)) ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$languagename.'') ?> </span> </td> - <?php foreach($show as $list_key=>$list_value) { ?> - <td> + <?php foreach((array)$show as $list_key=>$list_value) { ?> + <td><?php echo escapeHtml('') ?> <?php { $$list_value= $bits[$list_value]; ?> <?php } ?> - <input type="checkbox" name="<?php echo encodeHtml(htmlentities(@$list_value)) ?>" disabled="disabled" value="1" <?php if(@$${list_value}){ ?>checked="1"<?php } ?> /> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml(''.@$list_value.'') ?>" disabled="<?php echo escapeHtml('disabled') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$$list_value){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> </td> <?php } ?> </tr> diff --git a/modules/cms/ui/themes/default/html/views/group/rights.tpl.src.xml b/modules/cms/ui/themes/default/html/views/group/rights.tpl.src.xml @@ -1,47 +1,47 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <table filter="false"> - <list list="projects" extract="true"> + <list list="${projects}" extract="true"> <row> <column> <group title="${projectname}"> - <if empty="rights"> + <if empty="${rights}"> <row> <column> - <text text="GLOBAL_NOT_FOUND"></text> + <text value="${message:GLOBAL_NOT_FOUND}"></text> </column> </row> </if> - <if not="true" empty="rights"> + <if not="true" empty="${rights}"> <table> <row class="headline"> <column class="help"> - <text text="GLOBAL_USER"></text> + <text value="${message:GLOBAL_USER}"></text> </column> <column class="help"> - <text text="GLOBAL_NAME"></text> + <text value="${message:GLOBAL_NAME}"></text> </column> <column class="help"> - <text text="GLOBAL_LANGUAGE"></text> + <text value="${message:GLOBAL_LANGUAGE}"></text> </column> - <list list="show" value="t"> + <list list="${show}" value="t"> <column class="help"> - <text key="${t}" prefix="acl_" suffix="_abbrev" + <text value="${message:${t}}" prefix="acl_" suffix="_abbrev" title="message:acl_{t}"></text> </column> </list> </row> - <list list="rights" key="aclid" value="acl" extract="true"> + <list list="${rights}" key="aclid" value="acl" extract="true"> <row class="data clickable"> <column> <if present="groupname"> <image action="group"></image> - <text var="groupname" maxlength="20"></text> + <text value="${groupname}" maxlength="20"></text> </if> <if not="true" present="username"> <if not="true" present="groupname"> <image action="group"></image> - <text key="global_all"></text> + <text value="${message:global_all}"></text> </if> </if> <set var="username"></set> @@ -50,13 +50,13 @@ <column title="${objectname}"> <image action="${objecttype}"></image> <link type="open" action="${objecttype}" subaction="" id="${objectid}"> - <text var="objectname"></text> + <text value="${objectname}"></text> </link> </column> <column> - <text var="languagename" maxlength="20"></text> + <text value="${languagename}" maxlength="20"></text> </column> - <list list="show"> + <list list="${show}"> <column> <set var="${list_value}" value="${bits}" key="${list_value}"></set> <checkbox name="${list_value}" readonly="true"></checkbox> diff --git a/modules/cms/ui/themes/default/html/views/grouplist/add.php b/modules/cms/ui/themes/default/html/views/grouplist/add.php @@ -1,26 +1,26 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="grouplist" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form grouplist"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="grouplist" /> - <input type="hidden" name="subaction" value="add" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <div class="line"> - <div class="label"> - <label class="label"><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('add') ?>" data-action="<?php echo escapeHtml('grouplist') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form grouplist') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('grouplist') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('add') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml(''.@lang('name').'') ?> </label> </div> - <div class="input"> - <div class="inputholder"> - <input name="name" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('name') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$name.'') ?>" class="<?php echo escapeHtml('focus') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/grouplist/show.php b/modules/cms/ui/themes/default/html/views/grouplist/show.php @@ -1,36 +1,36 @@ <?php if (defined('OR_TITLE')) { ?> - <div class="or-table-wrapper"> - <div class="or-table-filter"> - <input type="search" name="filter" placeholder="<?php echo encodeHtml(htmlentities(@lang('SEARCH_FILTER'))) ?>" /> + <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> </div> - <div class="or-table-area"> - <table width="100%"> - <tr class="headline"> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> + <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> + <tr class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('name').'') ?> </span> </td> </tr> - <?php foreach($el as $list_key=>$list_value) { extract($list_value); ?> - <tr class="data"> - <td data-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-action="group" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" class="clickable clickable"> - <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="group" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/group/<?php echo encodeHtml(htmlentities(@$id)) ?>"> - <i class="image-icon image-icon--action-group"> + <?php foreach((array)$el as $list_key=>$list_value) { extract($list_value); ?> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td data-name="<?php echo escapeHtml(''.@$name.'') ?>" data-action="<?php echo escapeHtml('group') ?>" data-id="<?php echo escapeHtml(''.@$id.'') ?>" class="<?php echo escapeHtml('clickable clickable') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" date-name="<?php echo escapeHtml(''.@$name.'') ?>" name="<?php echo escapeHtml(''.@$name.'') ?>" data-type="<?php echo escapeHtml('open') ?>" data-action="<?php echo escapeHtml('group') ?>" data-method="<?php echo escapeHtml('') ?>" data-id="<?php echo escapeHtml(''.@$id.'') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/group/'.@$id.'') ?>"><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--action-group') ?>"><?php echo escapeHtml('') ?> </i> - <span><?php echo encodeHtml(htmlentities(@$name)) ?> + <span><?php echo escapeHtml(''.@$name.'') ?> </span> </a> </td> </tr> <?php } ?> - <tr class="data"> - <td colspan="2" class="clickable"> - <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@lang('menu_add'))) ?>" name="<?php echo encodeHtml(htmlentities(@lang('menu_add'))) ?>" data-type="dialog" data-action="" data-method="add" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="/#//"> - <i class="image-icon image-icon--method-add"> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('clickable') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" date-name="<?php echo escapeHtml(''.@lang('menu_add').'') ?>" name="<?php echo escapeHtml(''.@lang('menu_add').'') ?>" data-type="<?php echo escapeHtml('dialog') ?>" data-action="<?php echo escapeHtml('') ?>" data-method="<?php echo escapeHtml('add') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'add\'}') ?>" href="<?php echo escapeHtml('/#//') ?>"><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--method-add') ?>"><?php echo escapeHtml('') ?> </i> - <span><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + <span><?php echo escapeHtml(''.@lang('new').'') ?> </span> </a> </td> diff --git a/modules/cms/ui/themes/default/html/views/grouplist/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/grouplist/show.tpl.src.xml @@ -4,15 +4,15 @@ <table> <row class="headline"> <column> - <text key="name"></text> + <text value="${message:name}"></text> </column> </row> - <list list="el" extract="true"> + <list list="${el}" extract="true"> <row class="data"> <column id="${id}" name="${name}" action="group" class="clickable"> <link type="open" id="${id}" name="${name}" action="group"> <image action="group"></image> - <text var="name" maxlength="30"></text> + <text value="${name}" maxlength="30"></text> </link> </column> @@ -20,9 +20,9 @@ </list> <row class="data"> <column colspan="2" class="clickable"> - <link type="dialog" subaction="add" name="#{menu_add}"> + <link type="dialog" subaction="add" name="${message:menu_add}"> <image method="add"/> - <text text="new"/> + <text value="${message:new}"/> </link> </column> </row> diff --git a/modules/cms/ui/themes/default/html/views/image/compress.php b/modules/cms/ui/themes/default/html/views/image/compress.php @@ -1,45 +1,45 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="compress" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="image" /> - <input type="hidden" name="subaction" value="compress" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <fieldset class="or-group toggle-open-close open show"> - <legend class="on-click-open-close"><?php echo encodeHtml(htmlentities(@lang('OPTIONS'))) ?> - <img /> - <div class="arrow arrow-right on-closed"> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('compress') ?>" data-action="<?php echo escapeHtml('image') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form image') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('image') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('compress') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('OPTIONS').'') ?> + <img /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> </div> - <div class="arrow arrow-down on-open"> + <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> </div> </legend> - <div class="closable"> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('type'))) ?> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('type').'') ?> </span> </div> - <div class="input"> - <?php { $gz= 'gz'; ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <?php { $gz= gz; ?> <?php } ?> - <select name="format" size="1"> + <select name="<?php echo escapeHtml('format') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> <?php foreach($formats as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key=='gz'){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==gz){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> - <?php { $replace= '1'; ?> + <?php { $replace= 1; ?> <?php } ?> - <input type="radio" name="replace" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" /> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('replace'))) ?> + <input type="<?php echo escapeHtml('radio') ?>" name="<?php echo escapeHtml('replace') ?>" value="<?php echo escapeHtml('1') ?>" checked="<?php echo escapeHtml(''.@$replace.'') ?>" /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('replace').'') ?> </span> </label> - <br /> - <input type="radio" name="replace" disabled="" value="0" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" /> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + <br /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('radio') ?>" name="<?php echo escapeHtml('replace') ?>" value="<?php echo escapeHtml('') ?>" checked="<?php echo escapeHtml(''.@$replace.'') ?>" /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('new').'') ?> </span> </label> </div> @@ -47,9 +47,9 @@ </div> </fieldset> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/image/compress.tpl.src.xml b/modules/cms/ui/themes/default/html/views/image/compress.tpl.src.xml @@ -1,10 +1,10 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <form> - <group title="#{OPTIONS}"> + <group title="${message:OPTIONS}"> <part class="line"> <part class="label"> - <text text="type"></text> + <text value="${message:type}"></text> </part> <part class="input"> <set var="gz" value="gz"></set> @@ -12,12 +12,12 @@ <set var="replace" value="1"></set> <radio name="replace" value="1"></radio> <label for="replace_1"> - <text key="replace"></text> + <text value="${message:replace}"></text> </label> <newline></newline> <radio name="replace" value="0"></radio> <label for="replace_0"> - <text key="new"></text> + <text value="${message:new}"></text> </label> </part> </part> diff --git a/modules/cms/ui/themes/default/html/views/image/edit.php b/modules/cms/ui/themes/default/html/views/image/edit.php @@ -1,31 +1,31 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="image" /> - <input type="hidden" name="subaction" value="edit" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <div class="line"> - <div class="label"> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('edit') ?>" data-action="<?php echo escapeHtml('image') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form image') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('image') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('edit') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <br /> - <input id="req0_file" name="file" size="40" class="upload" /> - <br /> - <br /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <br /><?php echo escapeHtml('') ?> + <input id="<?php echo escapeHtml('req0_file') ?>" name="<?php echo escapeHtml('file') ?>" size="<?php echo escapeHtml('40') ?>" class="<?php echo escapeHtml('upload') ?>" /><?php echo escapeHtml('') ?> + <br /><?php echo escapeHtml('') ?> + <br /><?php echo escapeHtml('') ?> </div> </div> - <div class="line or-dropzone-upload"> - <div class="label"> + <div class="<?php echo escapeHtml('line or-dropzone-upload') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> </div> </div> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/image/extract.php b/modules/cms/ui/themes/default/html/views/image/extract.php @@ -1,22 +1,22 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="extract" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="image" /> - <input type="hidden" name="subaction" value="extract" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('extract') ?>" data-action="<?php echo escapeHtml('image') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form image') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('image') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('extract') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> - <tr> - <td colspan="2" class="act"> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> </td> </tr> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/image/preview.php b/modules/cms/ui/themes/default/html/views/image/preview.php @@ -1,5 +1,5 @@ <?php if (defined('OR_TITLE')) { ?> - <iframe src="<?php echo encodeHtml(htmlentities(@$preview_url)) ?>"> + <iframe src="<?php echo escapeHtml(''.@$preview_url.'') ?>"><?php echo escapeHtml('') ?> </iframe> <?php } ?> \ No newline at end of file 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,30 +1,30 @@ <?php if (defined('OR_TITLE')) { ?> <?php $if1=(config('security','nopublish')); if($if1) { ?> - <div class="message warn"> - <span class="help"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NOPUBLISH_DESC'))) ?> + <div class="<?php echo escapeHtml('message warn') ?>"><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('help') ?>"><?php echo escapeHtml(''.@lang('GLOBAL_NOPUBLISH_DESC').'') ?> </span> </div> <?php } ?> - <form name="" target="_self" data-target="view" action="./" data-method="pub" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="1" data-autosave="" class="or-form image"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="image" /> - <input type="hidden" name="subaction" value="pub" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <tr> - <td> - <br /> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('pub') ?>" data-action="<?php echo escapeHtml('image') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('1') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form image') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('image') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('pub') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <br /><?php echo escapeHtml('') ?> </td> </tr> - <tr> - <td class="act"> + <tr><?php echo escapeHtml('') ?> + <td class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> </td> </tr> </div> - <div class="or-form-actionbar"> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('publish'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('publish').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/image/pub.tpl.src.xml b/modules/cms/ui/themes/default/html/views/image/pub.tpl.src.xml @@ -4,13 +4,13 @@ <!-- Falls das Veroeffentlichen deaktiviert ist, eine Warnmeldung anzeigen. --> - <if true="%{security/nopublish}"> + <if true="${config:security/nopublish}"> <part class="message warn"> - <text key="GLOBAL_NOPUBLISH_DESC" class="help"></text> + <text value="${message:GLOBAL_NOPUBLISH_DESC}" class="help"></text> </part> </if> - <form cancel="false" visible="true" label="#{publish}" async="true"> + <form cancel="false" visible="true" label="${message:publish}" async="true"> <row> <column> <newline></newline> diff --git a/modules/cms/ui/themes/default/html/views/image/remove.php b/modules/cms/ui/themes/default/html/views/image/remove.php @@ -1,41 +1,41 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="image" /> - <input type="hidden" name="subaction" value="remove" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('remove') ?>" data-action="<?php echo escapeHtml('image') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form image') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('image') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('remove') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_NAME').'') ?> </span> </td> - <td> - <span><?php echo encodeHtml(htmlentities(@$name)) ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$name.'') ?> </span> </td> </tr> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_DELETE'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_DELETE').'') ?> </span> </td> - <td> - <input type="checkbox" name="delete" value="1" <?php if(@$delete){ ?>checked="1"<?php } ?> /> + <td><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('delete') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> </td> </tr> - <tr> - <td colspan="2"> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> </td> </tr> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> diff --git a/modules/cms/ui/themes/default/html/views/image/remove.tpl.src.xml b/modules/cms/ui/themes/default/html/views/image/remove.tpl.src.xml @@ -1,3 +1,3 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"><dummy><form><window icon="group" name="GLOBAL_GROUPS"><row><column><text text="GLOBAL_NAME"></text></column><column><text var="name"></text></column></row><row><column><text text="GLOBAL_DELETE"></text></column><column><checkbox name="delete"></checkbox></column></row><row><column colspan="2"><button type="ok"></button></column></row></window></form><focus field="delete"></focus></dummy></output>- \ No newline at end of file + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"><dummy><form><window icon="group" name="GLOBAL_GROUPS"><row><column><text value="${message:GLOBAL_NAME}"></text></column><column><text value="${name}"></text></column></row><row><column><text value="${message:GLOBAL_DELETE}"></text></column><column><checkbox name="delete"></checkbox></column></row><row><column colspan="2"><button type="ok"></button></column></row></window></form><focus field="delete"></focus></dummy></output>+ \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/image/show.php b/modules/cms/ui/themes/default/html/views/image/show.php @@ -2,18 +2,18 @@ - <tr> - <td colspan="2"> - <iframe src="<?php echo encodeHtml(htmlentities(@$preview_url)) ?>"> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?> + <iframe src="<?php echo escapeHtml(''.@$preview_url.'') ?>"><?php echo escapeHtml('') ?> </iframe> - <a target="_self" data-action="file" data-method="edit" data-id="" data-extra="[]" href="/#/file/" class="action"> - <img src="./modules/cms/ui/themes/default/images/icon/icon/edit.png" /> - <span><?php echo encodeHtml(htmlentities(@lang('menu_file_edit'))) ?> + <a target="<?php echo escapeHtml('_self') ?>" data-action="<?php echo escapeHtml('file') ?>" data-method="<?php echo escapeHtml('edit') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/file/') ?>" class="<?php echo escapeHtml('action') ?>"><?php echo escapeHtml('') ?> + <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon/icon/edit.png') ?>" /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('menu_file_edit').'') ?> </span> </a> - <a target="_self" data-action="file" data-method="editvalue" data-id="" data-extra="[]" href="/#/file/" class="action"> - <img src="./modules/cms/ui/themes/default/images/icon/icon/editvalue.png" /> - <span><?php echo encodeHtml(htmlentities(@lang('menu_file_editvalue'))) ?> + <a target="<?php echo escapeHtml('_self') ?>" data-action="<?php echo escapeHtml('file') ?>" data-method="<?php echo escapeHtml('editvalue') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/file/') ?>" class="<?php echo escapeHtml('action') ?>"><?php echo escapeHtml('') ?> + <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon/icon/editvalue.png') ?>" /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('menu_file_editvalue').'') ?> </span> </a> </td> diff --git a/modules/cms/ui/themes/default/html/views/image/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/image/show.tpl.src.xml @@ -8,11 +8,11 @@ <insert url="${preview_url}"></insert> <link class="action" action="file" subaction="edit"> <image file="icon/edit"></image> - <text key="menu_file_edit"></text> + <text value="${message:menu_file_edit}"></text> </link> <link class="action" action="file" subaction="editvalue"> <image file="icon/editvalue"></image> - <text key="menu_file_editvalue"></text> + <text value="${message:menu_file_editvalue}"></text> </link> </column> </row> diff --git a/modules/cms/ui/themes/default/html/views/image/size.php b/modules/cms/ui/themes/default/html/views/image/size.php @@ -1,129 +1,129 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="size" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="image" /> - <input type="hidden" name="subaction" value="size" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('IMAGE_OLD_SIZE'))) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('size') ?>" data-action="<?php echo escapeHtml('image') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form image') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('image') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('size') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('IMAGE_OLD_SIZE').'') ?> </span> </div> - <div class="input"> - <span><?php echo encodeHtml(htmlentities(@$width)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$width.'') ?> </span> - <span> * + <span><?php echo escapeHtml(' * ') ?> </span> - <span><?php echo encodeHtml(htmlentities(@$height)) ?> + <span><?php echo escapeHtml(''.@$height.'') ?> </span> </div> </div> <?php $if1=!(($formats)==FALSE); if($if1) { ?> - <fieldset class="or-group toggle-open-close open show"> - <legend class="on-click-open-close"><?php echo encodeHtml(htmlentities(@lang('IMAGE_NEW_SIZE'))) ?> - <img /> - <div class="arrow arrow-right on-closed"> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('IMAGE_NEW_SIZE').'') ?> + <img /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> </div> - <div class="arrow arrow-down on-open"> + <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> </div> </legend> - <div class="closable"> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <input type="radio" name="type" disabled="" value="factor" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" /> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('FILE_IMAGE_SIZE_FACTOR'))) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('radio') ?>" name="<?php echo escapeHtml('type') ?>" value="<?php echo escapeHtml('factor') ?>" checked="<?php echo escapeHtml(''.@$type.'') ?>" /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('FILE_IMAGE_SIZE_FACTOR').'') ?> </span> </label> - <select name="factor" size="1"> + <select name="<?php echo escapeHtml('factor') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> <?php foreach($factors as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$factor){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$factor){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> - <?php { $factor= '1'; ?> + <?php { $factor= 1; ?> <?php } ?> </div> </div> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <input type="radio" name="type" disabled="" value="input" checked="<?php echo encodeHtml(htmlentities(@$type)) ?>" /> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('FILE_IMAGE_NEW_WIDTH_HEIGHT'))) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('radio') ?>" name="<?php echo escapeHtml('type') ?>" value="<?php echo escapeHtml('input') ?>" checked="<?php echo escapeHtml(''.@$type.'') ?>" /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('FILE_IMAGE_NEW_WIDTH_HEIGHT').'') ?> </span> </label> </div> - <div class="label"> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <div class="inputholder"> - <input name="width" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$width)) ?>" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('width') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$width.'') ?>" /><?php echo escapeHtml('') ?> </div> - <span> * + <span><?php echo escapeHtml(' * ') ?> </span> - <div class="inputholder"> - <input name="height" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$height)) ?>" /> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('height') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$height.'') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> </div> </fieldset> - <fieldset class="or-group toggle-open-close open show"> - <legend class="on-click-open-close"><?php echo encodeHtml(htmlentities(@lang('options'))) ?> - <img /> - <div class="arrow arrow-right on-closed"> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('options').'') ?> + <img /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> </div> - <div class="arrow arrow-down on-open"> + <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> </div> </legend> - <div class="closable"> - <div class="line"> - <div class="label"> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('FILE_IMAGE_FORMAT'))) ?> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('FILE_IMAGE_FORMAT').'') ?> </span> </label> </div> - <div class="input"> - <select name="format" size="1"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('format') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> <?php foreach($formats as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$format){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$format){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> </div> </div> - <div class="line"> - <div class="label"> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('FILE_IMAGE_JPEG_COMPRESSION'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('FILE_IMAGE_JPEG_COMPRESSION').'') ?> </span> </label> </div> - <div class="input"> - <?php { $jpeg_compression= '70'; ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <?php { $jpeg_compression= 70; ?> <?php } ?> - <select name="jpeg_compression" size="1"> + <select name="<?php echo escapeHtml('jpeg_compression') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> <?php foreach($jpeglist as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$jpeg_compression){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$jpeg_compression){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> </div> </div> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <input type="checkbox" name="copy" value="1" <?php if(@$copy){ ?>checked="1"<?php } ?> /> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('copy'))) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('copy') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$copy){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('copy').'') ?> </span> </label> </div> @@ -132,9 +132,9 @@ </fieldset> <?php } ?> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/image/size.tpl.src.xml b/modules/cms/ui/themes/default/html/views/image/size.tpl.src.xml @@ -3,16 +3,16 @@ <form> <part class="line"> <part class="label"> - <text text="IMAGE_OLD_SIZE"></text> + <text value="${message:IMAGE_OLD_SIZE}"></text> </part> <part class="input"> - <text var="width"></text> - <text raw="_*_"></text> - <text var="height"></text> + <text value="${width}"></text> + <text value=" * "></text> + <text value="${height}"></text> </part> </part> - <if not="" empty="formats"> - <group title="#{IMAGE_NEW_SIZE}"> + <if not="" empty="${formats}"> + <group title="${message:IMAGE_NEW_SIZE}"> <part class="line"> <part class="label"></part> @@ -20,7 +20,7 @@ <radio name="type" value="factor"></radio> <label for="type_factor"> - <text text="FILE_IMAGE_SIZE_FACTOR"></text> + <text value="${message:FILE_IMAGE_SIZE_FACTOR}"></text> </label> @@ -33,22 +33,22 @@ <part class="input"> <radio name="type" value="input"></radio> <label for="type_input"> - <text text="FILE_IMAGE_NEW_WIDTH_HEIGHT"></text> + <text value="${message:FILE_IMAGE_NEW_WIDTH_HEIGHT}"></text> </label> </part> <part class="label"></part> <part class="input"> <input name="width" size="10"></input> - <text raw="_*_"></text> + <text value=" * "></text> <input name="height" size="10"></input> </part> </part> </group> - <group title="#{options}"> + <group title="${message:options}"> <part class="line"> <part class="label"> <label for="format"> - <text text="FILE_IMAGE_FORMAT"></text> + <text value="${message:FILE_IMAGE_FORMAT}"></text> </label> </part> <part class="input"> @@ -58,7 +58,7 @@ <part class="line"> <part class="label"> <label for="jpeglist_compression"> - <text text="FILE_IMAGE_JPEG_COMPRESSION"></text> + <text value="${message:FILE_IMAGE_JPEG_COMPRESSION}"></text> </label> </part> <part class="input"> @@ -72,7 +72,7 @@ <part class="input"> <checkbox name="copy"></checkbox> <label for="copy"> - <text key="copy"></text> + <text value="${message:copy}"></text> </label> </part> </part> diff --git a/modules/cms/ui/themes/default/html/views/image/structure.php b/modules/cms/ui/themes/default/html/views/image/structure.php @@ -1,6 +1,6 @@ <?php if (defined('OR_TITLE')) { ?> - <div class="structure tree"> - + <div class="<?php echo escapeHtml('structure tree') ?>"><?php echo escapeHtml('') ?> + <?php echo escapeHtml('') ?> </div> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/image/uncompress.php b/modules/cms/ui/themes/default/html/views/image/uncompress.php @@ -1,45 +1,45 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="uncompress" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="image" /> - <input type="hidden" name="subaction" value="uncompress" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <fieldset class="or-group toggle-open-close open show"> - <legend class="on-click-open-close"><?php echo encodeHtml(htmlentities(@lang('options'))) ?> - <img /> - <div class="arrow arrow-right on-closed"> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('uncompress') ?>" data-action="<?php echo escapeHtml('image') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form image') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('image') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('uncompress') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('options').'') ?> + <img /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> </div> - <div class="arrow arrow-down on-open"> + <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> </div> </legend> - <div class="closable"> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> </div> </fieldset> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <?php { $replace= '1'; ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <?php { $replace= 1; ?> <?php } ?> - <input type="radio" name="replace" disabled="" value="1" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" /> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('replace'))) ?> + <input type="<?php echo escapeHtml('radio') ?>" name="<?php echo escapeHtml('replace') ?>" value="<?php echo escapeHtml('1') ?>" checked="<?php echo escapeHtml(''.@$replace.'') ?>" /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('replace').'') ?> </span> </label> - <br /> - <input type="radio" name="replace" disabled="" value="0" checked="<?php echo encodeHtml(htmlentities(@$replace)) ?>" /> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + <br /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('radio') ?>" name="<?php echo escapeHtml('replace') ?>" value="<?php echo escapeHtml('') ?>" checked="<?php echo escapeHtml(''.@$replace.'') ?>" /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('new').'') ?> </span> </label> </div> </div> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/image/uncompress.tpl.src.xml b/modules/cms/ui/themes/default/html/views/image/uncompress.tpl.src.xml @@ -1,7 +1,7 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> <form> - <group title="#{options}"></group> + <group title="${message:options}"></group> <part class="line"> <part class="label"> </part> @@ -9,12 +9,12 @@ <set var="replace" value="1"></set> <radio name="replace" value="1"></radio> <label for="replace_1"> - <text key="replace"></text> + <text value="${message:replace}"></text> </label> <newline></newline> <radio name="replace" value="0"></radio> <label for="replace_0"> - <text key="new"></text> + <text value="${message:new}"></text> </label> </part> </part> diff --git a/modules/cms/ui/themes/default/html/views/image/value.php b/modules/cms/ui/themes/default/html/views/image/value.php @@ -1,31 +1,31 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="value" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form image"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="image" /> - <input type="hidden" name="subaction" value="value" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('value') ?>" data-action="<?php echo escapeHtml('image') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form image') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('image') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('value') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> - <tr> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_VALUE'))) ?> + <tr><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_VALUE').'') ?> </span> </td> - <td> - <textarea name="value" data-extension="" data-mimetype="" data-mode="htmlmixed" class="editor code-editor"><?php echo encodeHtml(htmlentities(@$value)) ?> + <td><?php echo escapeHtml('') ?> + <textarea name="<?php echo escapeHtml('value') ?>" data-extension="<?php echo escapeHtml('') ?>" data-mimetype="<?php echo escapeHtml('') ?>" data-mode="<?php echo escapeHtml('htmlmixed') ?>" class="<?php echo escapeHtml('editor code-editor') ?>"><?php echo escapeHtml(''.@$value.'') ?> </textarea> </td> </tr> - <tr> - <td colspan="2" class="act"> + <tr><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('2') ?>" class="<?php echo escapeHtml('act') ?>"><?php echo escapeHtml('') ?> </td> </tr> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> diff --git a/modules/cms/ui/themes/default/html/views/image/value.tpl.src.xml b/modules/cms/ui/themes/default/html/views/image/value.tpl.src.xml @@ -5,7 +5,7 @@ <window> <row> <column> - <text text="GLOBAL_VALUE"></text> + <text value="${message:GLOBAL_VALUE}"></text> </column> <column> <editor name="value" type="code"></editor> diff --git a/modules/cms/ui/themes/default/html/views/include/timestamps.inc.xml b/modules/cms/ui/themes/default/html/views/include/timestamps.inc.xml @@ -1,6 +1,6 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> - <group title="message:prop_userinfo" open="false"> + <group title="${message:prop_userinfo}" open="false"> <part class="line"> <part class="label"> <label for="create_date"> @@ -9,10 +9,10 @@ </part> <part class="input"> <image icon="el_date"></image> - <date date="var:create_date"></date> + <date date="${create_date}"></date> <newline></newline> <image icon="user"></image> - <user user="var:create_user"></user> + <user user="${create_user}"></user> </part> </part> <part class="line"> @@ -23,10 +23,10 @@ </part> <part class="input"> <image icon="el_date"></image> - <date date="var:lastchange_date"></date> + <date date="${lastchange_date}"></date> <newline></newline> <image icon="user"></image> - <user user="var:lastchange_user"></user> + <user user="${lastchange_user}"></user> </part> </part> <part class="line"> @@ -37,10 +37,10 @@ </part> <part class="input"> <image icon="el_date"></image> - <date date="var:published_date"></date> + <date date="${published_date}"></date> <newline></newline> <image icon="user"></image> - <user user="var:published_user"></user> + <user user="${published_user}"></user> </part> </part> </group> diff --git a/modules/cms/ui/themes/default/html/views/include/validity.inc.xml b/modules/cms/ui/themes/default/html/views/include/validity.inc.xml @@ -1,4 +1,4 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> </output> diff --git a/modules/cms/ui/themes/default/html/views/language/add.php b/modules/cms/ui/themes/default/html/views/language/add.php @@ -1,29 +1,29 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="language" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form language"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="language" /> - <input type="hidden" name="subaction" value="add" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('LANGUAGE_ISOCODE'))) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('add') ?>" data-action="<?php echo escapeHtml('language') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('post') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form language') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('language') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('add') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('LANGUAGE_ISOCODE').'') ?> </span> </div> - <div class="input"> - <select name="isocode" size="1"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('isocode') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> <?php foreach($isocodes as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$isocode){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$isocode){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> </div> </div> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/language/add.tpl.src.xml b/modules/cms/ui/themes/default/html/views/language/add.tpl.src.xml @@ -3,7 +3,7 @@ <form method="post"> <part class="line"> <part class="label"> - <text text="LANGUAGE_ISOCODE"></text> + <text value="${message:LANGUAGE_ISOCODE}"></text> </part> <part class="input"> <selectbox list="isocodes" name="isocode"></selectbox> diff --git a/modules/cms/ui/themes/default/html/views/language/info.php b/modules/cms/ui/themes/default/html/views/language/info.php @@ -1,45 +1,45 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="info" data-action="language" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form language"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="language" /> - <input type="hidden" name="subaction" value="info" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <span class="headline"><?php echo encodeHtml(htmlentities(@$name)) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('info') ?>" data-action="<?php echo escapeHtml('language') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form language') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('language') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('info') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml(''.@$name.'') ?> </span> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_NAME').'') ?> </span> </div> - <div class="input clickable"> - <span class="name"><?php echo encodeHtml(htmlentities(@$name)) ?> + <div class="<?php echo escapeHtml('input clickable') ?>"><?php echo escapeHtml('') ?> + <span class="<?php echo escapeHtml('name') ?>"><?php echo escapeHtml(''.@$name.'') ?> </span> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('LANGUAGE_ISOCODE'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('LANGUAGE_ISOCODE').'') ?> </span> </div> - <div class="input clickable"> - <span><?php echo encodeHtml(htmlentities(@$isocode)) ?> + <div class="<?php echo escapeHtml('input clickable') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$isocode.'') ?> </span> </div> </div> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input clickable"> - <a target="_self" data-type="edit" data-action="language" data-method="prop" data-id="" data-extra="[]" href="/#/language/" class="or-link-btn"> - <span><?php echo encodeHtml(htmlentities(@lang('edit'))) ?> + <div class="<?php echo escapeHtml('input clickable') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('edit') ?>" data-action="<?php echo escapeHtml('language') ?>" data-method="<?php echo escapeHtml('prop') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/language/') ?>" class="<?php echo escapeHtml('or-link-btn') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('edit').'') ?> </span> </a> </div> </div> </div> - <div class="or-form-actionbar"> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/language/info.tpl.src.xml b/modules/cms/ui/themes/default/html/views/language/info.tpl.src.xml @@ -7,18 +7,18 @@ <part class="line"> <part class="label"> - <text text="GLOBAL_NAME"></text> + <text value="${message:GLOBAL_NAME}"></text> </part> <part class="input clickable"> - <text var="name" class="name"/> + <text value="${name}" class="name"/> </part> </part> <part class="line"> <part class="label"> - <text text="LANGUAGE_ISOCODE"></text> + <text value="${message:LANGUAGE_ISOCODE}"></text> </part> <part class="input clickable"> - <text var="isocode"/> + <text value="${isocode}"/> </part> </part> @@ -28,7 +28,7 @@ </part> <part class="input clickable"> <link class="or-link-btn" action="language" subaction="prop" type="edit"> - <text key="edit"/> + <text value="${message:edit}"/> </link> </part> </part> diff --git a/modules/cms/ui/themes/default/html/views/language/listing.php b/modules/cms/ui/themes/default/html/views/language/listing.php @@ -2,65 +2,65 @@ - <div class="or-table-wrapper"> - <div class="or-table-filter"> - <input type="search" name="filter" placeholder="<?php echo encodeHtml(htmlentities(@lang('SEARCH_FILTER'))) ?>" /> + <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> </div> - <div class="or-table-area"> - <table width="100%"> - <tr class="headline"> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('name'))) ?> + <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> + <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> + <tr class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('name').'') ?> </span> </td> - <td> - <span> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml('') ?> </span> </td> - <td> - <span> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml('') ?> </span> </td> - <td> - <span> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml('') ?> </span> </td> </tr> - <?php foreach($el as $list_key=>$list_value) { extract($list_value); ?> - <tr class="data"> - <td> - <img src="./modules/cms/ui/themes/default/images/icon/icon_language.png" /> - <span><?php echo encodeHtml(htmlentities(@$name)) ?> + <?php foreach((array)$el as $list_key=>$list_value) { extract($list_value); ?> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <img src="<?php echo escapeHtml('./modules/cms/ui/themes/default/images/icon/icon_language.png') ?>" /><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$name.'') ?> </span> </td> - <td> - <span><?php echo encodeHtml(htmlentities(@$isocode)) ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$isocode.'') ?> </span> </td> - <td> + <td><?php echo escapeHtml('') ?> <?php $if1=(isset($default_url)); if($if1) { ?> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_make_default'))) ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_make_default').'') ?> </span> <?php } ?> <?php if(!$if1) { ?> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_is_default'))) ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_is_default').'') ?> </span> <?php } ?> </td> - <td> + <td><?php echo escapeHtml('') ?> <?php $if1=(isset($select_url)); if($if1) { ?> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_select'))) ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_select').'') ?> </span> <?php } ?> <?php if(!$if1) { ?> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_selected'))) ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_selected').'') ?> </span> <?php } ?> </td> </tr> <?php { unset($select_url) ?> <?php } ?> - <?php { unset($default_url) ?> + <?php { unset($default_url}) ?> <?php } ?> <?php } ?> </table> diff --git a/modules/cms/ui/themes/default/html/views/language/listing.tpl.src.xml b/modules/cms/ui/themes/default/html/views/language/listing.tpl.src.xml @@ -1,3 +1,53 @@ <output xmlns="http://www.openrat.de/template" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"><dummy><window icon="language"><table><row class="headline"><column><text key="name"></text></column><column><text raw=""></text></column><column><text raw=""></text></column><column><text raw=""></text></column></row><list list="el" extract="true"><row class="data"><column url="${url}"><image file="icon_language"></image><text var="name" maxlength="25"></text></column><column><text var="isocode"></text></column><column url="${default_url}"><if present="default_url"><text text="GLOBAL_make_default"></text></if><else><text text="GLOBAL_is_default"></text></else></column><column url="${select_url}"><if present="select_url"><text text="GLOBAL_select"></text></if><else><text text="GLOBAL_selected"></text></else></column></row><set var="select_url"></set><set var="default_url"></set></list></table></window></dummy></output>- \ No newline at end of file + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd"> + <dummy> + <window icon="language"> + <table> + <row class="headline"> + <column> + <text value="${message:name}"></text> + </column> + <column> + <text raw=""></text> + </column> + <column> + <text raw=""></text> + </column> + <column> + <text raw=""></text> + </column> + </row> + <list list="${el}" extract="true"> + <row class="data"> + <column url="${url}"> + <image file="icon_language"></image> + <text value="${name}" maxlength="25"></text> + </column> + <column> + <text value="${isocode}"></text> + </column> + <column url="${default_url}"> + <if present="default_url"> + <text value="${message:GLOBAL_make_default}"></text> + </if> + <else> + <text value="${message:GLOBAL_is_default}"></text> + </else> + </column> + <column url="${select_url}"> + <if present="select_url"> + <text value="${message:GLOBAL_select}"></text> + </if> + <else> + <text value="${message:GLOBAL_selected}"></text> + </else> + </column> + </row> + <set var="select_url"></set> + <set var="default_url}"></set> + </list> + </table> + </window> + </dummy> +</output>+ \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/language/prop.php b/modules/cms/ui/themes/default/html/views/language/prop.php @@ -1,47 +1,47 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="language" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form language"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="language" /> - <input type="hidden" name="subaction" value="prop" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('prop') ?>" data-action="<?php echo escapeHtml('language') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('post') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form language') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('language') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('prop') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_NAME').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="name" type="text" maxlength="50" value="<?php echo encodeHtml(htmlentities(@$name)) ?>" class="focus" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('name') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('50') ?>" value="<?php echo escapeHtml(''.@$name.'') ?>" class="<?php echo escapeHtml('focus') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('LANGUAGE_ISOCODE'))) ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('LANGUAGE_ISOCODE').'') ?> </span> </div> - <div class="input"> - <div class="inputholder"> - <input name="isocode" type="text" maxlength="256" value="<?php echo encodeHtml(htmlentities(@$isocode)) ?>" /> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('inputholder') ?>"><?php echo escapeHtml('') ?> + <input name="<?php echo escapeHtml('isocode') ?>" type="<?php echo escapeHtml('text') ?>" maxlength="<?php echo escapeHtml('256') ?>" value="<?php echo escapeHtml(''.@$isocode.'') ?>" /><?php echo escapeHtml('') ?> </div> </div> </div> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <input type="checkbox" name="is_default" disabled="disabled" value="1" <?php if(@$is_default){ ?>checked="1"<?php } ?> /> - <label class="label"><?php echo encodeHtml(htmlentities(@lang('GLOBAL_is_default'))) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('is_default') ?>" disabled="<?php echo escapeHtml('disabled') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$is_default){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml(''.@lang('GLOBAL_is_default').'') ?> </label> </div> </div> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/language/prop.tpl.src.xml b/modules/cms/ui/themes/default/html/views/language/prop.tpl.src.xml @@ -5,7 +5,7 @@ <part class="line"> <part class="label"> - <text text="GLOBAL_NAME"></text> + <text value="${message:GLOBAL_NAME}"></text> </part> <part class="input"> <input name="name" class="focus" maxlength="50"></input> @@ -15,7 +15,7 @@ <part class="line"> <part class="label"> - <text text="LANGUAGE_ISOCODE"></text> + <text value="${message:LANGUAGE_ISOCODE}"></text> </part> <part class="input"> <input name="isocode"></input> diff --git a/modules/cms/ui/themes/default/html/views/language/remove.php b/modules/cms/ui/themes/default/html/views/language/remove.php @@ -1,42 +1,42 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="remove" data-action="language" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form language"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="language" /> - <input type="hidden" name="subaction" value="remove" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <fieldset class="or-group toggle-open-close open show"> - <div class="closable"> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_NAME'))) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('remove') ?>" data-action="<?php echo escapeHtml('language') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('post') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form language') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('language') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('remove') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_NAME').'') ?> </span> </div> - <div class="input"> - <span><?php echo encodeHtml(htmlentities(@$name)) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$name.'') ?> </span> </div> </div> </div> </fieldset> - <fieldset class="or-group toggle-open-close open show"> - <legend class="on-click-open-close"><?php echo encodeHtml(htmlentities(@lang('options'))) ?> - <img /> - <div class="arrow arrow-right on-closed"> + <fieldset class="<?php echo escapeHtml('or-group toggle-open-close open show') ?>"><?php echo escapeHtml('') ?> + <legend class="<?php echo escapeHtml('on-click-open-close') ?>"><?php echo escapeHtml(''.@lang('options').'') ?> + <img /><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('arrow arrow-right on-closed') ?>"><?php echo escapeHtml('') ?> </div> - <div class="arrow arrow-down on-open"> + <div class="<?php echo escapeHtml('arrow arrow-down on-open') ?>"><?php echo escapeHtml('') ?> </div> </legend> - <div class="closable"> - <div class="line"> - <div class="label"> + <div class="<?php echo escapeHtml('closable') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> </div> - <div class="input"> - <input type="checkbox" name="confirm" value="1" <?php if(@$confirm){ ?>checked="1"<?php } ?> required="required" /> - <label class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('CONFIRM_DELETE'))) ?> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('confirm') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$confirm){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> required="<?php echo escapeHtml('required') ?>" /><?php echo escapeHtml('') ?> + <label class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('CONFIRM_DELETE').'') ?> </span> </label> </div> @@ -44,9 +44,9 @@ </div> </fieldset> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/language/remove.tpl.src.xml b/modules/cms/ui/themes/default/html/views/language/remove.tpl.src.xml @@ -5,15 +5,15 @@ <group> <part class="line"> <part class="label"> - <text text="GLOBAL_NAME"></text> + <text value="${message:GLOBAL_NAME}"></text> </part> <part class="input"> - <text var="name"></text> + <text value="${name}"></text> </part> </part> </group> - <group title="#{options}"> + <group title="${message:options}"> <part class="line"> <part class="label"> @@ -21,7 +21,7 @@ <part class="input"> <checkbox name="confirm" required="true"></checkbox> <label for="confirm"> - <text text="CONFIRM_DELETE"></text> + <text value="${message:CONFIRM_DELETE}"></text> </label> </part> </part> diff --git a/modules/cms/ui/themes/default/html/views/language/structure.php b/modules/cms/ui/themes/default/html/views/language/structure.php @@ -1,6 +1,6 @@ <?php if (defined('OR_TITLE')) { ?> - <div class="structure tree"> - + <div class="<?php echo escapeHtml('structure tree') ?>"><?php echo escapeHtml('') ?> + <?php echo escapeHtml('') ?> </div> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/languagelist/add.php b/modules/cms/ui/themes/default/html/views/languagelist/add.php @@ -1,29 +1,29 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="languagelist" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form languagelist"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="languagelist" /> - <input type="hidden" name="subaction" value="add" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('LANGUAGE_ISOCODE'))) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('add') ?>" data-action="<?php echo escapeHtml('languagelist') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('post') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form languagelist') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('languagelist') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('add') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?> + <div><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('line') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('label') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('LANGUAGE_ISOCODE').'') ?> </span> </div> - <div class="input"> - <select name="isocode" size="1"> + <div class="<?php echo escapeHtml('input') ?>"><?php echo escapeHtml('') ?> + <select name="<?php echo escapeHtml('isocode') ?>" size="<?php echo escapeHtml('1') ?>"><?php echo escapeHtml('') ?> <?php foreach($isocodes as $_key=>$_value) { ?> - <option value="<?php echo encodeHtml(htmlentities(@$_key)) ?>" <?php if($_key==$isocode){ ?>selected="selected"<?php } ?>><?php echo encodeHtml(htmlentities(@$_value)) ?> + <option value="<?php echo escapeHtml(''.@$_key.'') ?>" <?php if($_key==$isocode){ ?>selected="<?php echo escapeHtml('selected') ?>"<?php } ?>><?php echo escapeHtml(''.@$_value.'') ?> </option> <?php } ?> </select> </div> </div> </div> - <div class="or-form-actionbar"> - <input type="button" value="<?php echo encodeHtml(htmlentities(@lang('CANCEL'))) ?>" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" /> - <input type="submit" value="<?php echo encodeHtml(htmlentities(@lang('button_ok'))) ?>" class="or-form-btn or-form-btn--primary or-form-btn--save" /> + <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?> </div> </form> <?php } ?> \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/languagelist/add.tpl.src.xml b/modules/cms/ui/themes/default/html/views/languagelist/add.tpl.src.xml @@ -3,7 +3,7 @@ <form method="post"> <part class="line"> <part class="label"> - <text text="LANGUAGE_ISOCODE"></text> + <text value="${message:LANGUAGE_ISOCODE}"></text> </part> <part class="input"> <selectbox list="isocodes" name="isocode"></selectbox> diff --git a/modules/cms/ui/themes/default/html/views/languagelist/show.php b/modules/cms/ui/themes/default/html/views/languagelist/show.php @@ -1,44 +1,44 @@ <?php if (defined('OR_TITLE')) { ?> - <div class="or-table-wrapper"> - <div class="or-table-filter"> - <input type="search" name="filter" placeholder="<?php echo encodeHtml(htmlentities(@lang('SEARCH_FILTER'))) ?>" /> + <div class="<?php echo escapeHtml('or-table-wrapper') ?>"><?php echo escapeHtml('') ?> + <div class="<?php echo escapeHtml('or-table-filter') ?>"><?php echo escapeHtml('') ?> + <input type="<?php echo escapeHtml('search') ?>" name="<?php echo escapeHtml('filter') ?>" placeholder="<?php echo escapeHtml(''.@lang('SEARCH_FILTER').'') ?>" /><?php echo escapeHtml('') ?> </div> - <div class="or-table-area"> - <table width="100%"> - <tr class="headline"> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('NAME'))) ?> + <div class="<?php echo escapeHtml('or-table-area') ?>"><?php echo escapeHtml('') ?> + <table width="<?php echo escapeHtml('100%') ?>"><?php echo escapeHtml('') ?> + <tr class="<?php echo escapeHtml('headline') ?>"><?php echo escapeHtml('') ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('NAME').'') ?> </span> </td> - <td> - <span><?php echo encodeHtml(htmlentities(@lang('LANGUAGE_ISOCODE'))) ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('LANGUAGE_ISOCODE').'') ?> </span> </td> - <td> - <span> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml('') ?> </span> </td> </tr> - <?php foreach($el as $list_key=>$list_value) { extract($list_value); ?> - <tr class="data"> - <td class="clickable"> - <i class="image-icon image-icon--action-language"> + <?php foreach((array)$el as $list_key=>$list_value) { extract($list_value); ?> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td class="<?php echo escapeHtml('clickable') ?>"><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--action-language') ?>"><?php echo escapeHtml('') ?> </i> - <a target="_self" date-name="<?php echo encodeHtml(htmlentities(@$name)) ?>" name="<?php echo encodeHtml(htmlentities(@$name)) ?>" data-type="open" data-action="language" data-method="" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" href="/#/language/<?php echo encodeHtml(htmlentities(@$id)) ?>"> - <span><?php echo encodeHtml(htmlentities(@$name)) ?> + <a target="<?php echo escapeHtml('_self') ?>" date-name="<?php echo escapeHtml(''.@$name.'') ?>" name="<?php echo escapeHtml(''.@$name.'') ?>" data-type="<?php echo escapeHtml('open') ?>" data-action="<?php echo escapeHtml('language') ?>" data-method="<?php echo escapeHtml('') ?>" data-id="<?php echo escapeHtml(''.@$id.'') ?>" data-extra="<?php echo escapeHtml('[]') ?>" href="<?php echo escapeHtml('/#/language/'.@$id.'') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$name.'') ?> </span> </a> </td> - <td> - <span><?php echo encodeHtml(htmlentities(@$isocode)) ?> + <td><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@$isocode.'') ?> </span> </td> <?php $if1=(!$is_default); if($if1) { ?> - <td class="clickable"> + <td class="<?php echo escapeHtml('clickable') ?>"><?php echo escapeHtml('') ?> <?php $if1=(isset($id)); if($if1) { ?> - <a target="_self" data-type="post" data-action="language" data-method="setdefault" data-id="<?php echo encodeHtml(htmlentities(@$id)) ?>" data-extra="[]" data-data="{"action":"language","subaction":"setdefault","id":"<?php echo encodeHtml(htmlentities(@$id)) ?>",\"token":"<?php echo token() ?>","none":"0"}""> - <span><?php echo encodeHtml(htmlentities(@lang('GLOBAL_make_default'))) ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('post') ?>" data-action="<?php echo escapeHtml('language') ?>" data-method="<?php echo escapeHtml('setdefault') ?>" data-id="<?php echo escapeHtml(''.@$id.'') ?>" data-extra="<?php echo escapeHtml('[]') ?>" data-data="<?php echo escapeHtml('{"action":"language","subaction":"setdefault","id":"'.@$id.'",\"token":"<?php echo token() ?>","none":"0"}"') ?>"><?php echo escapeHtml('') ?> + <span><?php echo escapeHtml(''.@lang('GLOBAL_make_default').'') ?> </span> </a> <?php } ?> @@ -47,8 +47,8 @@ </td> <?php } ?> <?php if(!$if1) { ?> - <td> - <em><?php echo encodeHtml(htmlentities(@lang('GLOBAL_is_default'))) ?> + <td><?php echo escapeHtml('') ?> + <em><?php echo escapeHtml(''.@lang('GLOBAL_is_default').'') ?> </em> </td> <?php } ?> @@ -58,12 +58,12 @@ <?php { unset($default_url) ?> <?php } ?> <?php } ?> - <tr class="data"> - <td colspan="3" class="clickable"> - <a target="_self" data-type="dialog" data-action="" data-method="add" data-id="" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="/#//"> - <i class="image-icon image-icon--method-add"> + <tr class="<?php echo escapeHtml('data') ?>"><?php echo escapeHtml('') ?> + <td colspan="<?php echo escapeHtml('3') ?>" class="<?php echo escapeHtml('clickable') ?>"><?php echo escapeHtml('') ?> + <a target="<?php echo escapeHtml('_self') ?>" data-type="<?php echo escapeHtml('dialog') ?>" data-action="<?php echo escapeHtml('') ?>" data-method="<?php echo escapeHtml('add') ?>" data-id="<?php echo escapeHtml('') ?>" data-extra="<?php echo escapeHtml('{\'dialogAction\':null,\'dialogMethod\':\'add\'}') ?>" href="<?php echo escapeHtml('/#//') ?>"><?php echo escapeHtml('') ?> + <i class="<?php echo escapeHtml('image-icon image-icon--method-add') ?>"><?php echo escapeHtml('') ?> </i> - <span><?php echo encodeHtml(htmlentities(@lang('new'))) ?> + <span><?php echo escapeHtml(''.@lang('new').'') ?> </span> </a> </td> diff --git a/modules/cms/ui/themes/default/html/views/languagelist/show.tpl.src.xml b/modules/cms/ui/themes/default/html/views/languagelist/show.tpl.src.xml @@ -3,32 +3,32 @@ <table> <row class="headline"> <column> - <text key="NAME"></text> + <text value="${message:NAME}"></text> </column> <column> - <text key="LANGUAGE_ISOCODE"></text> + <text value="${message:LANGUAGE_ISOCODE}"></text> </column> <column> <text raw=""></text> </column> </row> - <list list="el" extract="true"> + <list list="${el}" extract="true"> <row class="data"> <column class="clickable"> <image action="language"></image> <link type="open" name="${name}" action="language" id="${id}"> - <text var="name" maxlength="25"></text> + <text value="${name}" maxlength="25"></text> </link> </column> <column> - <text var="isocode"></text> + <text value="${isocode}"></text> </column> <if false="${is_default}"> <column class="clickable"> <if present="id"> <link type="post" action="language" subaction="setdefault" id="${id}"> - <text text="GLOBAL_make_default"></text> + <text value="${message:GLOBAL_make_default}"></text> </link> </if> <else> @@ -37,7 +37,7 @@ </if> <else> <column> - <text text="GLOBAL_is_default" type="emphatic" /> + <text value="${message:GLOBAL_is_default}" type="emphatic" /> </column> </else> </row> @@ -48,7 +48,7 @@ <column colspan="3" class="clickable"> <link type="dialog" subaction="add"> <image method="add"/> - <text text="new"/> + <text value="${message:new}"/> </link> </column> </row> diff --git a/modules/cms/ui/themes/default/html/views/link/edit.php b/modules/cms/ui/themes/default/html/views/link/edit.php @@ -1,28 +1,28 @@ <?php if (defined('OR_TITLE')) { ?> - <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="link" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" data-async="" data-autosave="" class="or-form link"> - <input type="hidden" name="token" value="<?php echo token();?>" /> - <input type="hidden" name="action" value="link" /> - <input type="hidden" name="subaction" value="edit" /> - <input type="hidden" name="id" value="<?php echo OR_ID ?>" /> - <div> - <fieldset class="or-group toggle-open-close open show"> - <div class="closable"> - <div class="line"> - <div class="label"> - <span><?php echo encodeHtml(htmlentities(@lang('link_target'))) ?> + <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo