dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] Core : fixed smarty escape htmlall > html

Browse Source
This commit is contained in:
Damien Metzger
2013-11-22 09:47:15 +01:00
parent 47531534fc
commit c095d8f1ca
209 changed files with 759 additions and 759 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/helpers/form/form.tpl
+12 -12
View File
@@ -25,7 +25,7 @@
{if isset($fields.title)}<h3>{$fields.title}</h3>{/if}
{block name="defaultForm"}
<form id="{if isset($fields.form.form.id_form)}{$fields.form.form.id_form|escape:'htmlall':'UTF-8'}{else}{if $table == null}configuration_form{else}{$table}_form{/if}{/if}" class="defaultForm {$name_controller} form-horizontal" action="{$current}&{if !empty($submit_action)}{$submit_action}=1{/if}&token={$token}" method="post" enctype="multipart/form-data" {if isset($style)}style="{$style}"{/if}>
<form id="{if isset($fields.form.form.id_form)}{$fields.form.form.id_form|escape:'html':'UTF-8'}{else}{if $table == null}configuration_form{else}{$table}_form{/if}{/if}" class="defaultForm {$name_controller} form-horizontal" action="{$current}&{if !empty($submit_action)}{$submit_action}=1{/if}&token={$token}" method="post" enctype="multipart/form-data" {if isset($style)}style="{$style}"{/if}>
{if $form_id}
<input type="hidden" name="{$identifier}" id="{$identifier}" value="{$form_id}" />
{/if}
@@ -35,7 +35,7 @@
{foreach $fieldset.form as $key => $field}
{if $key == 'legend'}
<h3>
{if isset($field.image)}<img src="{$field.image}" alt="{$field.title|escape:'htmlall':'UTF-8'}" />{/if}
{if isset($field.image)}<img src="{$field.image}" alt="{$field.title|escape:'html':'UTF-8'}" />{/if}
{if isset($field.icon)}<i class="{$field.icon}"></i>{/if}
{$field.title}
</h3>
@@ -46,7 +46,7 @@
{block name="input_row"}
<div class="form-group {if $input.type == 'hidden'}hide{/if}" {if $input.name == 'id_state'}id="contains_states"{if !$contains_states}style="display:none;"{/if}{/if}>
{if $input.type == 'hidden'}
<input type="hidden" name="{$input.name}" id="{$input.name}" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
<input type="hidden" name="{$input.name}" id="{$input.name}" value="{$fields_value[$input.name]|escape:'html':'UTF-8'}" />
{else}
{block name="label"}
{if isset($input.label)}
@@ -117,7 +117,7 @@
id="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}"
name="{$input.name}_{$language.id_lang}"
class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}"
value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'html':'UTF-8'}{else}{$value_text|escape:'html':'UTF-8'}{/if}"
onkeyup="if (isArrowKey(event)) return ;updateFriendlyURL();"
{if isset($input.size)} size="{$input.size}"{/if}
{if isset($input.maxchar)} data-maxchar="{$input.maxchar}"{/if}
@@ -199,7 +199,7 @@
<input type="text"
name="{$input.name}"
id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}"
value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'html':'UTF-8'}{else}{$value_text|escape:'html':'UTF-8'}{/if}"
class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}"
{if isset($input.size)} size="{$input.size}"{/if}
{if isset($input.maxchar)} data-maxchar="{$input.maxchar}"{/if}
@@ -247,7 +247,7 @@
<input type="text"
name="{$input.name}"
id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}"
value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'html':'UTF-8'}{else}{$value_text|escape:'html':'UTF-8'}{/if}"
class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}"
{if isset($input.size)} size="{$input.size}"{/if}
{if isset($input.maxchar)} data-maxchar="{$input.maxchar}"{/if}
@@ -359,7 +359,7 @@
{foreach $input.values as $value}
<div class="radio {if isset($input.class)}"{$input.class}"{/if}">
<label>
<input type="radio" name="{$input.name}" id="{$value.id}" value="{$value.value|escape:'htmlall':'UTF-8'}"
<input type="radio" name="{$input.name}" id="{$value.id}" value="{$value.value|escape:'html':'UTF-8'}"
{if $fields_value[$input.name] == $value.value}checked="checked"{/if}
{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if} />
{$value.label}
@@ -414,7 +414,7 @@
<div class="col-lg-9">
{/if}
<textarea name="{$input.name}_{$language.id_lang}" class="{if isset($input.autoload_rte) && $input.autoload_rte}rte autoload_rte {if isset($input.class)}{$input.class}{/if}{else}textarea-autosize{/if}" >{$fields_value[$input.name][$language.id_lang]|escape:'htmlall':'UTF-8'}</textarea>
<textarea name="{$input.name}_{$language.id_lang}" class="{if isset($input.autoload_rte) && $input.autoload_rte}rte autoload_rte {if isset($input.class)}{$input.class}{/if}{else}textarea-autosize{/if}" >{$fields_value[$input.name][$language.id_lang]|escape:'html':'UTF-8'}</textarea>
{if $languages|count > 1}
</div>
<div class="col-lg-2">
@@ -435,7 +435,7 @@
{/foreach}
{else}
<textarea name="{$input.name}" id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}" {if isset($input.cols)}cols="{$input.cols}"{/if} {if isset($input.rows)}rows="{$input.rows}"{/if} class="{if isset($input.autoload_rte) && $input.autoload_rte}rte autoload_rte {if isset($input.class)}{$input.class}{/if}{else}textarea-autosize{/if}">{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}</textarea>
<textarea name="{$input.name}" id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}" {if isset($input.cols)}cols="{$input.cols}"{/if} {if isset($input.rows)}rows="{$input.rows}"{/if} class="{if isset($input.autoload_rte) && $input.autoload_rte}rte autoload_rte {if isset($input.class)}{$input.class}{/if}{else}textarea-autosize{/if}">{$fields_value[$input.name]|escape:'html':'UTF-8'}</textarea>
{/if}
{elseif $input.type == 'checkbox'}
@@ -447,7 +447,7 @@
name="{$id_checkbox}"
id="{$id_checkbox}"
class="{if isset($input.class)}{$input.class}{/if}"
{if isset($value.val)}value="{$value.val|escape:'htmlall':'UTF-8'}"{/if}
{if isset($value.val)}value="{$value.val|escape:'html':'UTF-8'}"{/if}
{if isset($fields_value[$id_checkbox]) && $fields_value[$id_checkbox]}checked="checked"{/if} />
{$value[$input.values.name]}
</label>
@@ -516,7 +516,7 @@
{if isset($input.class)}class="{$input.class}"
{else}class="color mColorPickerInput"{/if}
name="{$input.name}"
value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
value="{$fields_value[$input.name]|escape:'html':'UTF-8'}" />
</div>
</div>
</div>
@@ -530,7 +530,7 @@
{if isset($input.class)}class="{$input.class}"
{else}class="datepicker"{/if}
name="{$input.name}"
value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
value="{$fields_value[$input.name]|escape:'html':'UTF-8'}" />
<span class="input-group-addon">
<i class="icon-calendar-empty"></i>
</span>
admin-dev/themes/default/template/helpers/help_access/button.tpl
+10 -10
View File
@@ -1,15 +1,15 @@
<li class="help-context-{$label|escape:'htmlall':'UTF-8'}">
<a id="desc-{$label|escape:'htmlall':'UTF-8'}-help"
<li class="help-context-{$label|escape:'html':'UTF-8'}">
<a id="desc-{$label|escape:'html':'UTF-8'}-help"
class="toolbar_btn"
href="#"
onclick="showHelp('{$help_base_url|escape:'htmlall':'UTF-8'}',
'{$label|escape:'htmlall':'UTF-8'}',
'{$iso_lang|escape:'htmlall':'UTF-8'}',
'{$version|escape:'htmlall':'UTF-8'}',
'{$doc_version|escape:'htmlall':'UTF-8'}',
'{$country|escape:'htmlall':'UTF-8'}');"
title="{$tooltip|escape:'htmlall':'UTF-8'}">
<span class="{$button_class|escape:'htmlall':'UTF-8'}"></span>
onclick="showHelp('{$help_base_url|escape:'html':'UTF-8'}',
'{$label|escape:'html':'UTF-8'}',
'{$iso_lang|escape:'html':'UTF-8'}',
'{$version|escape:'html':'UTF-8'}',
'{$doc_version|escape:'html':'UTF-8'}',
'{$country|escape:'html':'UTF-8'}');"
title="{$tooltip|escape:'html':'UTF-8'}">
<span class="{$button_class|escape:'html':'UTF-8'}"></span>
<div>{l s='Help'}</div>
</a>
</li>
admin-dev/themes/default/template/helpers/list/list_content.tpl
+3 -3
View File
@@ -110,15 +110,15 @@
{$tr.$key} {l s='%'}
{* If type is 'editable', an input is created *}
{elseif isset($params.type) && $params.type == 'editable' && isset($tr.id)}
<input type="text" name="{$key}_{$tr.id}" value="{$tr.$key|escape:'htmlall':'UTF-8'}" class="{$key}" />
<input type="text" name="{$key}_{$tr.id}" value="{$tr.$key|escape:'html':'UTF-8'}" class="{$key}" />
{elseif isset($params.callback)}
{$tr.$key}
{elseif $key == 'color'}
<div style="background-color: {$tr.$key};" class="attributes-color-container"></div>
{elseif isset($params.maxlength) && Tools::strlen($tr.$key) > $params.maxlength}
<span title="{$tr.$key|escape:'htmlall':'UTF-8'}">{$tr.$key|truncate:$params.maxlength:'...'|escape:'htmlall':'UTF-8'}</span>
<span title="{$tr.$key|escape:'html':'UTF-8'}">{$tr.$key|truncate:$params.maxlength:'...'|escape:'html':'UTF-8'}</span>
{else}
{$tr.$key|escape:'htmlall':'UTF-8'}
{$tr.$key|escape:'html':'UTF-8'}
{/if}
{else}
{block name="default_field"}--{/block}
admin-dev/themes/default/template/helpers/list/list_header.tpl
+1 -1
View File
@@ -287,7 +287,7 @@
</select>
{/if}
{else}
<input type="text" class="filter" name="{$list_id}Filter_{if isset($params.filter_key)}{$params.filter_key}{else}{$key}{/if}" value="{$params.value|escape:'htmlall':'UTF-8'}" {if isset($params.width) && $params.width != 'auto'} style="width:{$params.width}px"{/if} />
<input type="text" class="filter" name="{$list_id}Filter_{if isset($params.filter_key)}{$params.filter_key}{else}{$key}{/if}" value="{$params.value|escape:'html':'UTF-8'}" {if isset($params.width) && $params.width != 'auto'} style="width:{$params.width}px"{/if} />
{/if}
{/if}
</th>
admin-dev/themes/default/template/helpers/options/options.tpl
+5 -5
View File
@@ -179,7 +179,7 @@
</div>
{elseif $field['type'] == 'text'}
<div class="col-lg-9 {if isset($field['suffix'])}input-group{/if}">
<input type="{$field['type']}"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" {if isset($field['autocomplete']) && !$field['autocomplete']}autocomplete="off"{/if}/>
<input type="{$field['type']}"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="{$field['value']|escape:'html':'UTF-8'}" {if isset($field['autocomplete']) && !$field['autocomplete']}autocomplete="off"{/if}/>
{if isset($field['suffix'])}
<span class="input-group-addon">
{$field['suffix']|strval}
@@ -197,7 +197,7 @@
</div>
{elseif $field['type'] == 'textarea'}
<div class="col-lg-9">
<textarea class="textarea-autosize" name={$key} cols="{$field['cols']}" rows="{$field['rows']}">{$field['value']|escape:'htmlall':'UTF-8'}</textarea>
<textarea class="textarea-autosize" name={$key} cols="{$field['cols']}" rows="{$field['rows']}">{$field['value']|escape:'html':'UTF-8'}</textarea>
</div>
{elseif $field['type'] == 'file'}
<div class="col-lg-9">{$field['file']}</div>
@@ -205,14 +205,14 @@
<div class="col-lg-2">
<div class="row">
<div class="input-group">
<input type="color" size="{$field['size']}" data-hex="true" {if isset($input.class)}class="{$field['class']}" {else}class="color mColorPickerInput"{/if} name="{$field['name']}" class="{if isset($field['class'])}{$field['class']}{/if}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
<input type="color" size="{$field['size']}" data-hex="true" {if isset($input.class)}class="{$field['class']}" {else}class="color mColorPickerInput"{/if} name="{$field['name']}" class="{if isset($field['class'])}{$field['class']}{/if}" value="{$field['value']|escape:'html':'UTF-8'}" />
</div>
</div>
</div>
{elseif $field['type'] == 'price'}
<div class="input-group col-lg-9">
<span class="input-group-addon">{$currency_left_sign}{$currency_right_sign} {l s='(tax excl.)'}</span>
<input type="text" size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
<input type="text" size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}" value="{$field['value']|escape:'html':'UTF-8'}" />
</div>
{elseif $field['type'] == 'textLang' || $field['type'] == 'textareaLang' || $field['type'] == 'selectLang'}
@@ -228,7 +228,7 @@
{/if}
<input type="text"
name="{$key}_{$id_lang}"
value="{$value|escape:'htmlall':'UTF-8'}"
value="{$value|escape:'html':'UTF-8'}"
{if isset($input.class)}class="{$input.class}"{/if}
/>
{if $field['languages']|count > 1}