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

// Small smarty escape fix

Browse Source
This commit is contained in:
Jerome Nadaud
2013-12-11 16:22:06 +01:00
parent 1056f295a3
commit 472742a42d
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blocklayered/blocklayered.php
+4 -1
View File
@@ -1458,7 +1458,10 @@ class BlockLayered extends Module
Configuration::updateValue('PS_LAYERED_FILTER_INDEX_MNF', (int)Tools::getValue('ps_layered_filter_index_manufacturer')); Configuration::updateValue('PS_LAYERED_FILTER_INDEX_MNF', (int)Tools::getValue('ps_layered_filter_index_manufacturer'));
Configuration::updateValue('PS_LAYERED_FILTER_INDEX_CAT', (int)Tools::getValue('ps_layered_filter_index_category')); Configuration::updateValue('PS_LAYERED_FILTER_INDEX_CAT', (int)Tools::getValue('ps_layered_filter_index_category'));
$message = '<div class="conf">'.$this->l('Settings saved successfully').'</div>'; if (version_compare(_PS_VERSION_, '1.6.0', '>=') === TRUE)
$message = '<div class="alert alert-success">'.$this->l('Settings saved successfully').'</div>';
else
$message = '<div class="conf">'.$this->l('Settings saved successfully').'</div>';
} }
else if (Tools::getValue('deleteFilterTemplate')) else if (Tools::getValue('deleteFilterTemplate'))
{ {
themes/default-bootstrap/modules/blocklayered/blocklayered.tpl
+9 -9
View File
@@ -51,9 +51,9 @@ param_product_url = '';
<li> <li>
<a href="#" rel="layered_{$filter.type}_slider" title="{l s='Cancel' mod='blocklayered'}"></a> <a href="#" rel="layered_{$filter.type}_slider" title="{l s='Cancel' mod='blocklayered'}"></a>
{if $filter.format == 1} {if $filter.format == 1}
{l s='%1$s: %2$s - %3$s'|sprintf:$filter.name:{displayPrice price=$filter.values[0]}:{displayPrice price=$filter.values[1]}|escape:html:'UTF-8' mod='blocklayered'} {l s='%1$s: %2$s - %3$s'|sprintf:$filter.name:{displayPrice price=$filter.values[0]}:{displayPrice price=$filter.values[1]}|escape:'html':'UTF-8' mod='blocklayered'}
{else} {else}
{l s='%1$s: %2$s %4$s - %3$s %4$s'|sprintf:$filter.name:$filter.values[0]:$filter.values[1]:$filter.unit|escape:html:'UTF-8' mod='blocklayered'} {l s='%1$s: %2$s %4$s - %3$s %4$s'|sprintf:$filter.name:$filter.values[0]:$filter.values[1]:$filter.unit|escape:'html':'UTF-8' mod='blocklayered'}
{/if} {/if}
</li> </li>
{/if} {/if}
@@ -62,7 +62,7 @@ param_product_url = '';
{if $id_value == $filter_key && !is_numeric($filter_value) && ($filter.type eq 'id_attribute_group' || $filter.type eq 'id_feature') || $id_value == $filter_value && $filter.type neq 'id_attribute_group' && $filter.type neq 'id_feature'} {if $id_value == $filter_key && !is_numeric($filter_value) && ($filter.type eq 'id_attribute_group' || $filter.type eq 'id_feature') || $id_value == $filter_value && $filter.type neq 'id_attribute_group' && $filter.type neq 'id_feature'}
<li> <li>
<a href="#" rel="layered_{$filter.type_lite}_{$id_value}" title="{l s='Cancel' mod='blocklayered'}"></a> <a href="#" rel="layered_{$filter.type_lite}_{$id_value}" title="{l s='Cancel' mod='blocklayered'}"></a>
{$filter.name|escape:html:'UTF-8'}{l s=':' mod='blocklayered'} {$value.name|escape:html:'UTF-8'} {$filter.name|escape:'html':'UTF-8'}{l s=':' mod='blocklayered'} {$value.name|escape:'html':'UTF-8'}
</li> </li>
{/if} {/if}
{/foreach} {/foreach}
@@ -82,7 +82,7 @@ param_product_url = '';
<div> <div>
{/if} {/if}
<div class="layered_subtitle_heading"> <div class="layered_subtitle_heading">
<span class="layered_subtitle">{$filter.name|escape:html:'UTF-8'}</span> <span class="layered_subtitle">{$filter.name|escape:'html':'UTF-8'}</span>
<span class="layered_close"><a href="#" rel="ul_layered_{$filter.type}_{$filter.id_key}"></a></span> <span class="layered_close"><a href="#" rel="ul_layered_{$filter.type}_{$filter.id_key}"></a></span>
</div> </div>
<ul id="ul_layered_{$filter.type}_{$filter.id_key}" class="layered_filter_ul{if isset($filter.is_color_group) && $filter.is_color_group} color-group{/if}"> <ul id="ul_layered_{$filter.type}_{$filter.id_key}" class="layered_filter_ul{if isset($filter.is_color_group) && $filter.is_color_group} color-group{/if}">
@@ -99,9 +99,9 @@ param_product_url = '';
{/if} {/if}
<label for="layered_{$filter.type_lite}_{$id_value}"{if !$value.nbr} class="disabled"{else}{if isset($filter.is_color_group) && $filter.is_color_group} name="layered_{$filter.type_lite}_{$id_value}" class="layered_color" rel="{$id_value}_{$filter.id_key}"{/if}{/if}> <label for="layered_{$filter.type_lite}_{$id_value}"{if !$value.nbr} class="disabled"{else}{if isset($filter.is_color_group) && $filter.is_color_group} name="layered_{$filter.type_lite}_{$id_value}" class="layered_color" rel="{$id_value}_{$filter.id_key}"{/if}{/if}>
{if !$value.nbr} {if !$value.nbr}
{$value.name|escape:html:'UTF-8'}{if $layered_show_qties}<span> ({$value.nbr})</span>{/if} {$value.name|escape:'html':'UTF-8'}{if $layered_show_qties}<span> ({$value.nbr})</span>{/if}
{else} {else}
<a href="{$value.link}" rel="{$value.rel}">{$value.name|escape:html:'UTF-8'}{if $layered_show_qties}<span> ({$value.nbr})</span>{/if}</a> <a href="{$value.link}" rel="{$value.rel}">{$value.name|escape:'html':'UTF-8'}{if $layered_show_qties}<span> ({$value.nbr})</span>{/if}</a>
{/if} {/if}
</label> </label>
</li> </li>
@@ -120,9 +120,9 @@ param_product_url = '';
{/if} {/if}
<label for="layered_{$filter.type_lite}_{$id_value}"{if !$value.nbr} class="disabled"{else}{if isset($filter.is_color_group) && $filter.is_color_group} name="layered_{$filter.type_lite}_{$id_value}" class="layered_color" rel="{$id_value}_{$filter.id_key}"{/if}{/if}> <label for="layered_{$filter.type_lite}_{$id_value}"{if !$value.nbr} class="disabled"{else}{if isset($filter.is_color_group) && $filter.is_color_group} name="layered_{$filter.type_lite}_{$id_value}" class="layered_color" rel="{$id_value}_{$filter.id_key}"{/if}{/if}>
{if !$value.nbr} {if !$value.nbr}
{$value.name|escape:html:'UTF-8'}{if $layered_show_qties}<span> ({$value.nbr})</span>{/if}</a> {$value.name|escape:'html':'UTF-8'}{if $layered_show_qties}<span> ({$value.nbr})</span>{/if}</a>
{else} {else}
<a href="{$value.link}" rel="{$value.rel}">{$value.name|escape:html:'UTF-8'}{if $layered_show_qties}<span> ({$value.nbr})</span>{/if}</a> <a href="{$value.link}" rel="{$value.rel}">{$value.name|escape:'html':'UTF-8'}{if $layered_show_qties}<span> ({$value.nbr})</span>{/if}</a>
{/if} {/if}
</label> </label>
</li> </li>
@@ -134,7 +134,7 @@ param_product_url = '';
{foreach from=$filter.values key=id_value item=value} {foreach from=$filter.values key=id_value item=value}
{if $value.nbr || !$hide_0_values} {if $value.nbr || !$hide_0_values}
<option style="color: {if isset($value.color)}{$value.color}{/if}" id="layered_{$filter.type_lite}{if $id_value || $filter.type == 'quantity'}_{$id_value}{/if}" value="{$id_value}_{$filter.id_key}" {if isset($value.checked) && $value.checked}selected="selected"{/if} {if !$value.nbr}disabled="disabled"{/if}> <option style="color: {if isset($value.color)}{$value.color}{/if}" id="layered_{$filter.type_lite}{if $id_value || $filter.type == 'quantity'}_{$id_value}{/if}" value="{$id_value}_{$filter.id_key}" {if isset($value.checked) && $value.checked}selected="selected"{/if} {if !$value.nbr}disabled="disabled"{/if}>
{$value.name|escape:html:'UTF-8'}{if $layered_show_qties}<span> ({$value.nbr})</span>{/if}</a> {$value.name|escape:'html':'UTF-8'}{if $layered_show_qties}<span> ({$value.nbr})</span>{/if}</a>
</option> </option>
{/if} {/if}
{/foreach} {/foreach}