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/controllers/addresses/helpers/form/form.tpl
+1 -1
View File
@@ -86,7 +86,7 @@
</script>
<div class="col-lg-4">
<input type="text" id="email" name="email" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}"/>
<input type="text" id="email" name="email" value="{$fields_value[$input.name]|escape:'html':'UTF-8'}"/>
</div>
{/if}
{else}
admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
+5 -5
View File
@@ -78,9 +78,9 @@
<select multiple name="attributes[]" id="attribute_group" style="height: 500px">
{foreach $attribute_groups as $k => $attribute_group}
{if isset($attribute_js[$attribute_group['id_attribute_group']])}
<optgroup name="{$attribute_group['id_attribute_group']}" id="{$attribute_group['id_attribute_group']}" label="{$attribute_group['name']|escape:'htmlall':'UTF-8'}">
<optgroup name="{$attribute_group['id_attribute_group']}" id="{$attribute_group['id_attribute_group']}" label="{$attribute_group['name']|escape:'html':'UTF-8'}">
{foreach $attribute_js[$attribute_group['id_attribute_group']] as $k => $v}
<option name="{$k}" id="attr_{$k}" value="{$v|escape:'htmlall':'UTF-8'}" title="{$v|escape:'htmlall':'UTF-8'}">{$v|escape:'htmlall':'UTF-8'}</option>
<option name="{$k}" id="attr_{$k}" value="{$v|escape:'html':'UTF-8'}" title="{$v|escape:'html':'UTF-8'}">{$v|escape:'html':'UTF-8'}</option>
{/foreach}
</optgroup>
{/if}
@@ -95,7 +95,7 @@
<div class="col-lg-8 col-lg-offset-1">
<div class="alert alert-info">{l s='The Combinations Generator is a tool that allows you to easily create a series of combinations by selecting the related attributes. For example, if you\'re selling t-shirts in three different sizes and two different colors, the generator will create six combinations for you.'}</div>
<div class="alert alert-info">{l s='You\'re currently generating combinations for the following product:'} <b>{$product_name|escape:'htmlall':'UTF-8'}</b></div>
<div class="alert alert-info">{l s='You\'re currently generating combinations for the following product:'} <b>{$product_name|escape:'html':'UTF-8'}</b></div>
<div class="alert alert-info"><strong>{l s='Step 1: On the left side, select the attributes you want to use (Hold down the "Ctrl" key on your keyboard and validate by clicking on "Add")'}</strong></div>
@@ -105,7 +105,7 @@
<table class="table" style="display: none;">
<thead>
<tr>
<th id="tab_h1" class="fixed-width-md"><span class="title_box">{$attribute_group['name']|escape:'htmlall':'UTF-8'}</span></th>
<th id="tab_h1" class="fixed-width-md"><span class="title_box">{$attribute_group['name']|escape:'html':'UTF-8'}</span></th>
<th id="tab_h2" colspan="2"><span class="title_box">{l s='Impact on the product price'} ({$currency_sign})</span></th>
<th><span class="title_box">{l s='Impact on the product weight'} ({$weight_unit})</span></th>
</tr>
@@ -134,7 +134,7 @@
</tr>
<tr>
<td>{l s='Default Reference:'}</td>
<td><input type="text" name="reference" value="{$product_reference|escape:'htmlall':'UTF-8'}" /></td>
<td><input type="text" name="reference" value="{$product_reference|escape:'html':'UTF-8'}" /></td>
</tr>
</tbody>
</table>
admin-dev/themes/default/template/controllers/attributes/helpers/list/list_content.tpl
+2 -2
View File
@@ -89,7 +89,7 @@
{$tr.$key}
{* 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 isset($tr.$key) && $key == 'color'}
@@ -99,7 +99,7 @@
<div style="float: left; width: 18px; height: 12px; border: 1px solid #996633; background-color: {$tr.$key}; margin-right: 4px;"></div>
{/if}
{elseif isset($tr.$key)}
{$tr.$key|escape:'htmlall':'UTF-8'}
{$tr.$key|escape:'html':'UTF-8'}
{else}
--
{/if}
admin-dev/themes/default/template/controllers/cart_rules/actions.tpl
+1 -1
View File
@@ -105,7 +105,7 @@
<div id="apply_discount_to_product_div" class="form-group">
<label class="control-label col-lg-3">{l s='Product'}</label>
<div class="input-group col-lg-5">
<input type="text" id="reductionProductFilter" name="reductionProductFilter" value="{$reductionProductFilter|escape:'htmlall':'UTF-8'}" />
<input type="text" id="reductionProductFilter" name="reductionProductFilter" value="{$reductionProductFilter|escape:'html':'UTF-8'}" />
<input type="hidden" id="reduction_product" name="reduction_product" value="{$currentTab->getFieldValue($currentObject, 'reduction_product')|intval}" />
<span class="input-group-addon"><i class="icon-search"></i></span>
</div>
admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
+1 -1
View File
@@ -8,7 +8,7 @@
<div class="input-group col-lg-9">
<span class="input-group-addon"><i class="icon-user"></i></i></span>
<input type="hidden" id="id_customer" name="id_customer" value="{$currentTab->getFieldValue($currentObject, 'id_customer')|intval}" />
<input type="text" id="customerFilter" class="input-xlarge" name="customerFilter" value="{$customerFilter|escape:'htmlall':'UTF-8'}" />
<input type="text" id="customerFilter" class="input-xlarge" name="customerFilter" value="{$customerFilter|escape:'html':'UTF-8'}" />
<span class="input-group-addon"><i class="icon-search"></i></span>
</div>
</div>
admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
+6 -6
View File
@@ -52,7 +52,7 @@
{else}
<i class="icon-question"></i>
{/if}
<a href="{$link->getAdminLink('AdminCustomers')|escape:'htmlall':'UTF-8'}&id_customer={$customer->id}&viewcustomer">{$customer->firstname} {$customer->lastname}</a></h2>
<a href="{$link->getAdminLink('AdminCustomers')|escape:'html':'UTF-8'}&id_customer={$customer->id}&viewcustomer">{$customer->firstname} {$customer->lastname}</a></h2>
<div class="form-horizontal">
<div class="form-group">
<label class="col-lg-3 control-label">{l s='Account registration date:'}</label>
@@ -76,12 +76,12 @@
<div class="panel">
<h3><i class="icon-shopping-cart"></i> {l s='Order information'}</h3>
{if $order->id}
<h2><a href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&id_order={$order->id}&vieworder"> {l s='Order #%d' sprintf=$order->id|string_format:"%06d"}</a></h2>
<h2><a href="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&id_order={$order->id}&vieworder"> {l s='Order #%d' sprintf=$order->id|string_format:"%06d"}</a></h2>
{l s='Made on:'} {dateFormat date=$order->date_add}
{else}
<h2>{l s='No order was created from this cart.'}</h2>
{if $customer->id}
<a class="btn btn-default" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&id_cart={$cart->id}&addorder"><i class="icon-shopping-cart"></i> {l s='Create an order from this cart.'}</a>
<a class="btn btn-default" href="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&id_cart={$cart->id}&addorder"><i class="icon-shopping-cart"></i> {l s='Create an order from this cart.'}</a>
{/if}
{/if}
</div>
@@ -105,7 +105,7 @@
{if isset($customized_datas[$product.id_product][$product.id_product_attribute][$product.id_address_delivery])}
<tr>
<td>{$product.image}</td>
<td><a href="{$link->getAdminLink('AdminProducts')|escape:'htmlall':'UTF-8'}&id_product={$product.id_product}&updateproduct">
<td><a href="{$link->getAdminLink('AdminProducts')|escape:'html':'UTF-8'}&id_product={$product.id_product}&updateproduct">
<span class="productName">{$product.name}</span>{if isset($product.attributes)}<br />{$product.attributes}{/if}<br />
{if $product.reference}{l s='Ref:'} {$product.reference}{/if}
{if $product.reference && $product.supplier_reference} / {$product.supplier_reference}{/if}
@@ -150,7 +150,7 @@
<tr>
<td>{$product.image}</td>
<td>
<a href="{$link->getAdminLink('AdminProducts')|escape:'htmlall':'UTF-8'}&id_product={$product.id_product}&updateproduct">
<a href="{$link->getAdminLink('AdminProducts')|escape:'html':'UTF-8'}&id_product={$product.id_product}&updateproduct">
<span class="productName">{$product.name}</span>{if isset($product.attributes)}<br />{$product.attributes}{/if}<br />
{if $product.reference}{l s='Ref:'} {$product.reference}{/if}
{if $product.reference && $product.supplier_reference} / {$product.supplier_reference}{/if}
@@ -200,7 +200,7 @@
</tr>
{foreach from=$discounts item='discount'}
<tr>
<td><a href="{$link->getAdminLink('AdminDiscounts')|escape:'htmlall':'UTF-8'}&id_discount={$discount.id_discount}&updatediscount">{$discount.name}</a></td>
<td><a href="{$link->getAdminLink('AdminDiscounts')|escape:'html':'UTF-8'}&id_discount={$discount.id_discount}&updatediscount">{$discount.name}</a></td>
<td align="center">- {displayWtPriceWithCurrency price=$discount.value_real currency=$currency}</td>
</tr>
{/foreach}
admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
+2 -2
View File
@@ -86,10 +86,10 @@
{if $key != 'deleteMode'}
{if is_array($value)}
{foreach $value as $val}
<input type="hidden" name="{$key|escape:'htmlall':'UTF-8'}[]" value="{$val|escape:'htmlall':'UTF-8'}" />
<input type="hidden" name="{$key|escape:'html':'UTF-8'}[]" value="{$val|escape:'html':'UTF-8'}" />
{/foreach}
{else}
<input type="hidden" name="{$key|escape:'htmlall':'UTF-8'}" value="{$value|escape:'htmlall':'UTF-8'}" />
<input type="hidden" name="{$key|escape:'html':'UTF-8'}" value="{$value|escape:'html':'UTF-8'}" />
{/if}
{/if}
{/foreach}
admin-dev/themes/default/template/controllers/customer_threads/message.tpl
+1 -1
View File
@@ -156,7 +156,7 @@
</dl>
<dl class="dl-horizontal">
<dt>{l s='Message:'}</dt>
<dd>{$message.message|escape:'htmlall':'UTF-8'|nl2br}</dd>
<dd>{$message.message|escape:'html':'UTF-8'|nl2br}</dd>
</dl>
</div>
</div>
admin-dev/themes/default/template/controllers/customers/helpers/list/list_header.tpl
+3 -3
View File
@@ -35,7 +35,7 @@
{/block}
{block name=leadin}
{if isset($delete_customer) && $delete_customer}
<form action="{$REQUEST_URI|escape:'htmlall':'UTF-8'}" method="post">
<form action="{$REQUEST_URI|escape:'html':'UTF-8'}" method="post">
<div class="alert alert-warning">
<h2>{l s='How do you want to delete these customer(s)?'}</h2>
<p>{l s='There are two ways of deleting a customer. Please choose your preferred method.'}</p>
@@ -52,10 +52,10 @@
{foreach $POST as $key => $value}
{if is_array($value)}
{foreach $value as $val}
<input type="hidden" name="{$key|escape:'htmlall':'UTF-8'}[]" value="{$val|escape:'htmlall':'UTF-8'}" />
<input type="hidden" name="{$key|escape:'html':'UTF-8'}[]" value="{$val|escape:'html':'UTF-8'}" />
{/foreach}
{else}
<input type="hidden" name="{$key|escape:'htmlall':'UTF-8'}" value="{$value|escape:'htmlall':'UTF-8'}" />
<input type="hidden" name="{$key|escape:'html':'UTF-8'}" value="{$value|escape:'html':'UTF-8'}" />
{/if}
{/foreach}
<br /><input type="submit" class="button" value="{l s='Delete'}" />
admin-dev/themes/default/template/controllers/employees/helpers/form/form.tpl
+4 -4
View File
@@ -37,19 +37,19 @@
{else}
{if $fields_value[$input.name] == $option}selected="selected"{/if}
{/if}
>{$option|escape:'htmlall':'UTF-8'}</option>
>{$option|escape:'html':'UTF-8'}</option>
{/foreach}
</select>
{elseif $input.type == 'default_tab'}
<select name="{$input.name}" id="{$input.name}">
{foreach $input.options AS $option}
{if isset($option.children) && $option.children|@count}
<optgroup label="{$option.name|escape:'htmlall':'UTF-8'}"></optgroup>
<optgroup label="{$option.name|escape:'html':'UTF-8'}"></optgroup>
{foreach $option.children AS $children}
<option value="{$children.id_tab}" {if $fields_value[$input.name] == $children.id_tab}selected="selected"{/if}>&nbsp;&nbsp;{$children.name|escape:'htmlall':'UTF-8'}</option>
<option value="{$children.id_tab}" {if $fields_value[$input.name] == $children.id_tab}selected="selected"{/if}>&nbsp;&nbsp;{$children.name|escape:'html':'UTF-8'}</option>
{/foreach}
{else}
<option value="{$option.id_tab}" {if $fields_value[$input.name] == $option.id_tab}selected="selected"{/if}>&nbsp;&nbsp;{$option.name|escape:'htmlall':'UTF-8'}</option>
<option value="{$option.id_tab}" {if $fields_value[$input.name] == $option.id_tab}selected="selected"{/if}>&nbsp;&nbsp;{$option.name|escape:'html':'UTF-8'}</option>
{/if}
{/foreach}
</select>
admin-dev/themes/default/template/controllers/geolocation/helpers/options/options.tpl
+2 -2
View File
@@ -39,7 +39,7 @@
{foreach $field['list'] as $country}
<tr>
<td><input type="checkbox" name="countries[]" value="{$country[$field['identifier']]}" {if in_array(strtoupper($country['iso_code']), $allowed_countries)}checked="checked"{/if} /></td>
<td>{$country['name']|escape:'htmlall':'UTF-8'}</td>
<td>{$country['name']|escape:'html':'UTF-8'}</td>
</tr>
{/foreach}
</tbody>
@@ -53,7 +53,7 @@
{block name="input"}
{if $field['type'] == 'textarea_newlines'}
<div class="col-lg-9">
<textarea name={$key} cols="{$field['cols']}" rows="{$field['rows']}">{$field['value']|replace:';':"\n"|escape:'htmlall':'UTF-8'}</textarea>
<textarea name={$key} cols="{$field['cols']}" rows="{$field['rows']}">{$field['value']|replace:';':"\n"|escape:'html':'UTF-8'}</textarea>
</div>
{else}
{$smarty.block.parent}
admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
+3 -3
View File
@@ -89,7 +89,7 @@
{if count($files_to_import)}
<select name="csv">
{foreach $files_to_import AS $filename}
<option value="{$filename}"{if $csv_selected == $filename} selected="selected"{/if}>{$filename|escape:'htmlall':'UTF-8'}</option>
<option value="{$filename}"{if $csv_selected == $filename} selected="selected"{/if}>{$filename|escape:'html':'UTF-8'}</option>
{/foreach}
</select>
<div class="clearfix">&nbsp;</div>
@@ -183,14 +183,14 @@
<label class="control-label col-lg-3">{l s='Field separator'} </label>
<div class="col-lg-6 input-group">
<span class="input-group-addon">{l s='e.g. '}"1; Ipod; 129.90; 5"</span>
<input type="text" size="2" value="{if isset($separator_selected)}{$separator_selected|escape:'htmlall':'UTF-8'}{else};{/if}" name="separator"/>
<input type="text" size="2" value="{if isset($separator_selected)}{$separator_selected|escape:'html':'UTF-8'}{else};{/if}" name="separator"/>
</div>
</div>
<div class="form-group">
<label class="control-label col-lg-3">{l s='Multiple value separator'} </label>
<div class="col-lg-6 input-group">
<span class="input-group-addon">{l s='e.g. '}"Ipod; red.jpg, blue.jpg, green.jpg; 129.90"</span>
<input type="text" size="2" value="{if isset($multiple_value_separator_selected)}{$multiple_value_separator_selected|escape:'htmlall':'UTF-8'}{else},{/if}" name="multiple_value_separator"/>
<input type="text" size="2" value="{if isset($multiple_value_separator_selected)}{$multiple_value_separator_selected|escape:'html':'UTF-8'}{else},{/if}" name="multiple_value_separator"/>
</div>
</div>
<div class="form-group">
admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
+15 -15
View File
@@ -87,20 +87,20 @@
</h3>
{if count($uname)}
<p>
<strong>{l s='Server information'}:</strong> {$uname|escape:'htmlall':'UTF-8'}
<strong>{l s='Server information'}:</strong> {$uname|escape:'html':'UTF-8'}
</p>
{/if}
<p>
<strong>{l s='Server software version'}:</strong> {$version.server|escape:'htmlall':'UTF-8'}
<strong>{l s='Server software version'}:</strong> {$version.server|escape:'html':'UTF-8'}
</p>
<p>
<strong>{l s='PHP version'}:</strong> {$version.php|escape:'htmlall':'UTF-8'}
<strong>{l s='PHP version'}:</strong> {$version.php|escape:'html':'UTF-8'}
</p>
<p>
<strong>{l s='Memory limit'}:</strong> {$version.memory_limit|escape:'htmlall':'UTF-8'}
<strong>{l s='Memory limit'}:</strong> {$version.memory_limit|escape:'html':'UTF-8'}
</p>
<p>
<strong>{l s='Max execution time'}:</strong> {$version.max_execution_time|escape:'htmlall':'UTF-8'}
<strong>{l s='Max execution time'}:</strong> {$version.max_execution_time|escape:'html':'UTF-8'}
</p>
{if $apache_instaweb}
<p>{l s='PageSpeed module for Apache installed (mod_instaweb)'}</p>
@@ -113,13 +113,13 @@
{l s='Database information'}
</h3>
<p>
<strong>{l s='MySQL version'}:</strong> {$database.version|escape:'htmlall':'UTF-8'}
<strong>{l s='MySQL version'}:</strong> {$database.version|escape:'html':'UTF-8'}
</p>
<p>
<strong>{l s='MySQL engine'}:</strong> {$database.engine|escape:'htmlall':'UTF-8'}
<strong>{l s='MySQL engine'}:</strong> {$database.engine|escape:'html':'UTF-8'}
</p>
<p>
<strong>{l s='Tables prefix'}:</strong> {$database.prefix|escape:'htmlall':'UTF-8'}
<strong>{l s='Tables prefix'}:</strong> {$database.prefix|escape:'html':'UTF-8'}
</p>
</div>
</div>
@@ -131,13 +131,13 @@
{l s='Store information'}
</h3>
<p>
<strong>{l s='PrestaShop version'}:</strong> {$shop.ps|escape:'htmlall':'UTF-8'}
<strong>{l s='PrestaShop version'}:</strong> {$shop.ps|escape:'html':'UTF-8'}
</p>
<p>
<strong>{l s='Shop URL'}:</strong> {$shop.url|escape:'htmlall':'UTF-8'}
<strong>{l s='Shop URL'}:</strong> {$shop.url|escape:'html':'UTF-8'}
</p>
<p>
<strong>{l s='Current theme in use'}:</strong> {$shop.theme|escape:'htmlall':'UTF-8'}
<strong>{l s='Current theme in use'}:</strong> {$shop.theme|escape:'html':'UTF-8'}
</p>
</div>
@@ -154,7 +154,7 @@
{else}
{l s='You are using your own SMTP parameters.'}</p>
<p>
<strong>{l s='SMTP server'}:</strong> {$smtp.server|escape:'htmlall':'UTF-8'}
<strong>{l s='SMTP server'}:</strong> {$smtp.server|escape:'html':'UTF-8'}
</p>
<p>
<strong>{l s='SMTP user'}:</strong>
@@ -173,10 +173,10 @@
{/if}
</p>
<p>
<strong>{l s='Encryption'}:</strong> {$smtp.encryption|escape:'htmlall':'UTF-8'}
<strong>{l s='Encryption'}:</strong> {$smtp.encryption|escape:'html':'UTF-8'}
</p>
<p>
<strong>{l s='Port'}:</strong> {$smtp.port|escape:'htmlall':'UTF-8'}
<strong>{l s='Port'}:</strong> {$smtp.port|escape:'html':'UTF-8'}
</p>
{/if}
</div>
@@ -187,7 +187,7 @@
{l s='Your information'}
</h3>
<p>
<strong>{l s='Your web browser'}:</strong> {$user_agent|escape:'htmlall':'UTF-8'}
<strong>{l s='Your web browser'}:</strong> {$user_agent|escape:'html':'UTF-8'}
</p>
</div>
admin-dev/themes/default/template/controllers/login/content.tpl
+2 -2
View File
@@ -71,7 +71,7 @@
type="text"
id="email"
class="form-control"
value="{if isset($email)}{$email|escape:'htmlall':'UTF-8'}{/if}"
value="{if isset($email)}{$email|escape:'html':'UTF-8'}{/if}"
autofocus="autofocus"
tabindex="1"
placeholder="test@example.com" />
@@ -167,7 +167,7 @@
{/if}
</ul>
<p>
<a href="{$adminUrl|escape:'htmlall':'UTF-8'}">
<a href="{$adminUrl|escape:'html':'UTF-8'}">
{l s='Please then access this page by the new URL (e.g. %s)' sprintf=$adminUrl}
</a>
</p>
admin-dev/themes/default/template/controllers/login/header.tpl
+1 -1
View File
@@ -34,7 +34,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="robots" content="NOFOLLOW, NOINDEX">
<title>
{$shop_name} {if $meta_title != ''}{if isset($navigationPipe)}{$navigationPipe|escape:'htmlall':'UTF-8'}{else}&gt;{/if} {$meta_title}{/if} (PrestaShop&trade;)
{$shop_name} {if $meta_title != ''}{if isset($navigationPipe)}{$navigationPipe|escape:'html':'UTF-8'}{else}&gt;{/if} {$meta_title}{/if} (PrestaShop&trade;)
</title>
{foreach from=$css_files key=css_uri item=media}
<link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" />
admin-dev/themes/default/template/controllers/maintenance/helpers/options/options.tpl
+1 -1
View File
@@ -30,7 +30,7 @@
<div class="col-lg-9 ">
<div class="row">
<div class="col-lg-8">
<input type="text"{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'}" />
<input type="text"{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'}" />
</div>
<div class="col-lg-1">
{$field['link_remove_ip']}
admin-dev/themes/default/template/controllers/modules/favorites.tpl
+1 -1
View File
@@ -84,7 +84,7 @@
{foreach from=$t.sub_tabs item=t2}
{if $t2.active}
{assign var="id_tab" value=$t.id_tab}
<option {if isset($tab_modules_preferences.$module_name) && in_array($t2.id_tab, $tab_modules_preferences.$module_name)} selected="selected" {/if} value="{$t2.id_tab}">&nbsp;&nbsp;&nbsp;{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'htmlall':'UTF-8'}{/if}</option>
<option {if isset($tab_modules_preferences.$module_name) && in_array($t2.id_tab, $tab_modules_preferences.$module_name)} selected="selected" {/if} value="{$t2.id_tab}">&nbsp;&nbsp;&nbsp;{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'html':'UTF-8'}{/if}</option>
{/if}
{/foreach}
{/if}
admin-dev/themes/default/template/controllers/orders/_documents.tpl
+6 -6
View File
@@ -69,13 +69,13 @@
{if get_class($document) eq 'OrderInvoice'}
{if isset($document->is_delivery)}
<a target="_blank" title="{l s='See the document'}" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order_invoice={$document->id}">
<a target="_blank" title="{l s='See the document'}" href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order_invoice={$document->id}">
{else}
<a target="_blank" title="{l s='See the document'}" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order_invoice={$document->id}">
<a target="_blank" title="{l s='See the document'}" href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&submitAction=generateInvoicePDF&id_order_invoice={$document->id}">
{/if}
{elseif get_class($document) eq 'OrderSlip'}
<a target="_blank" title="{l s='See the document'}" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateOrderSlipPDF&id_order_slip={$document->id}">
<a target="_blank" title="{l s='See the document'}" href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&submitAction=generateOrderSlipPDF&id_order_slip={$document->id}">
{/if}
{if get_class($document) eq 'OrderInvoice'}
@@ -142,11 +142,11 @@
{if !isset($document->is_delivery)}
<tr id="invoiceNote{$document->id}" style="display:none">
<td colspan="5">
<form action="{$current_index}&viewOrder&id_order={$order->id}{if isset($smarty.get.token)}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}{/if}" method="post">
<form action="{$current_index}&viewOrder&id_order={$order->id}{if isset($smarty.get.token)}&token={$smarty.get.token|escape:'html':'UTF-8'}{/if}" method="post">
<p>
<label for="editNote{$document->id}" class="t">{l s='Note'}</label>
<input type="hidden" name="id_order_invoice" value="{$document->id}" />
<textarea name="note" id="editNote{$document->id}" class="edit-note textarea-autosize">{$document->note|escape:'htmlall':'UTF-8'}</textarea>
<textarea name="note" id="editNote{$document->id}" class="edit-note textarea-autosize">{$document->note|escape:'html':'UTF-8'}</textarea>
</p>
<p>
<button type="submit" name="submitEditNote" class="btn btn-default">
@@ -168,7 +168,7 @@
<td colspan="5" class="text-center">
<i class="icon-warning-sign"></i> {l s='No documents are available'}
{if isset($invoice_management_active) && $invoice_management_active}
<a class="btn btn-link" href="{$current_index}&viewOrder&submitGenerateInvoice&id_order={$order->id}{if isset($smarty.get.token)}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}{/if}">
<a class="btn btn-link" href="{$current_index}&viewOrder&submitGenerateInvoice&id_order={$order->id}{if isset($smarty.get.token)}&token={$smarty.get.token|escape:'html':'UTF-8'}{/if}">
<i class="icon-repeat"></i>
{l s='Generate invoice'}
</a>
admin-dev/themes/default/template/controllers/orders/_print_pdf_icon.tpl
+2 -2
View File
@@ -26,7 +26,7 @@
{* Generate HTML code for printing Invoice Icon with link *}
<span>
{if ($order_state->invoice || $order->invoice_number)}
<a class="btn btn-default" target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}">
<a class="btn btn-default" target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}">
<i class="icon-file-text"></i>
</a>
{/if}
@@ -35,7 +35,7 @@
{* Generate HTML code for printing Delivery Icon with link *}
<span>
{if ($order_state->delivery || $order->delivery_number)}
<a class="btn btn-default" target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}">
<a class="btn btn-default" target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}">
<i class="icon-truck"></i>
</a>
{/if}
admin-dev/themes/default/template/controllers/orders/_product_line.tpl
+1 -1
View File
@@ -64,7 +64,7 @@
</span>
{/if}
</td>
{if $display_warehouse}<td align="center">{$product.warehouse_name|escape:'htmlall':'UTF-8'}</td>{/if}
{if $display_warehouse}<td align="center">{$product.warehouse_name|escape:'html':'UTF-8'}</td>{/if}
{if ($order->hasBeenPaid())}
<td class="productQuantity">
{$product['product_quantity_refunded']}
admin-dev/themes/default/template/controllers/orders/_shipping.tpl
+1 -1
View File
@@ -62,7 +62,7 @@
<td class="right">
<span id="shipping_number_show">{if $line.url && $line.tracking_number}<a target="_blank" href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{else}{$line.tracking_number}{/if}</span>
{if $line.can_edit}
<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id|escape:'htmlall':'UTF-8'}">
<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&vieworder&id_order={$order->id|escape:'html':'UTF-8'}">
<span class="shipping_number_edit" style="display:none;">
<input type="hidden" name="id_order_carrier" value="{$line.id_order_carrier|htmlentities}" />
<input type="text" name="tracking_number" value="{$line.tracking_number|htmlentities}" />
admin-dev/themes/default/template/controllers/orders/form.tpl
+4 -4
View File
@@ -1075,7 +1075,7 @@
</div>
<div class="col-lg-6">
<span class="form-control-static">{l s='Or'}&nbsp;</span>
<a class="fancybox btn btn-default" href="{$link->getAdminLink('AdminCustomers')|escape:'htmlall':'UTF-8'}&addcustomer&liteDisplaying=1&submitFormAjax=1#">
<a class="fancybox btn btn-default" href="{$link->getAdminLink('AdminCustomers')|escape:'html':'UTF-8'}&addcustomer&liteDisplaying=1&submitFormAjax=1#">
<i class="icon-plus-sign-alt"></i>
{l s='Add new customer'}
</a>
@@ -1144,7 +1144,7 @@
</div>
<form class="form-horizontal" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&submitAdd{$table}=1" method="post" autocomplete="off">
<form class="form-horizontal" action="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&submitAdd{$table}=1" method="post" autocomplete="off">
<div class="panel" id="products_part" style="display:none;">
<h3>
<i class="icon-shopping-cart"></i>
@@ -1287,7 +1287,7 @@
</div>
<div class="col-lg-6">
<span class="form-control-static">{l s='Or'}&nbsp;</span>
<a class="fancybox btn btn-default" href="{$link->getAdminLink('AdminCartRules')|escape:'htmlall':'UTF-8'}&addcart_rule&liteDisplaying=1&submitFormAjax=1#">
<a class="fancybox btn btn-default" href="{$link->getAdminLink('AdminCartRules')|escape:'html':'UTF-8'}&addcart_rule&liteDisplaying=1&submitFormAjax=1#">
<i class="icon-plus-sign-alt"></i>
{l s='Add new voucher'}
</a>
@@ -1347,7 +1347,7 @@
</div>
<div class="row">
<div class="col-lg-12">
<a class="fancybox btn btn-default" id="new_address" href="{$link->getAdminLink('AdminAddresses')|escape:'htmlall':'UTF-8'}&addaddress&id_customer=42&liteDisplaying=1&submitFormAjax=1#">
<a class="fancybox btn btn-default" id="new_address" href="{$link->getAdminLink('AdminAddresses')|escape:'html':'UTF-8'}&addaddress&id_customer=42&liteDisplaying=1&submitFormAjax=1#">
<i class="icon-plus-sign-alt"></i>
{l s='Add a new address'}
</a>
admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
+21 -21
View File
@@ -39,7 +39,7 @@
var currency_blank = "{$currency->blank}";
var priceDisplayPrecision = 2;
var use_taxes = {if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_INC}true{else}false{/if};
var token = "{$smarty.get.token|escape:'htmlall':'UTF-8'}";
var token = "{$smarty.get.token|escape:'html':'UTF-8'}";
var stock_management = {$stock_management|intval};
var txt_add_product_stock_issue = "{l s='Are you sure you want to add this quantity?' js=1}";
var txt_add_product_new_invoice = "{l s='Are you sure you want to create a new invoice?' js=1}";
@@ -71,7 +71,7 @@
<div class="col-lg-3 box-stats color2" >
<i class="icon-comments"></i>
<span class="title">{l s='Messages'}<br /><small>&nbsp;</small></span>
<span class="value"><a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}">{sizeof($customer_thread_message)}</a></span>
<span class="value"><a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'html':'UTF-8'}">{sizeof($customer_thread_message)}</a></span>
</div>
<div class="col-lg-3 box-stats color1" >
<i class="icon-ok"></i>
@@ -92,12 +92,12 @@
<div class="col-lg-6">
<div class="panel">
<h3 class="text-center">
<a class="btn btn-default pull-left" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$previousOrder}" {if !$previousOrder}disabled{/if}>
<a class="btn btn-default pull-left" href="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&vieworder&id_order={$previousOrder}" {if !$previousOrder}disabled{/if}>
<i class="icon-chevron-left"></i>
{l s='Prev'}
</a>
{l s='Order'} : <strong>#{$order->id} - {$order->reference}</strong>
<a class="btn btn-default pull-right" href="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$nextOrder}" {if !$nextOrder}disabled{/if}>
<a class="btn btn-default pull-right" href="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&vieworder&id_order={$nextOrder}" {if !$nextOrder}disabled{/if}>
{l s='Next'}
<i class="icon-chevron-right"></i>
</a>
@@ -106,7 +106,7 @@
<div class="well">
<div class="row row-margin-bottom">
{if (count($invoices_collection))}
<a class="btn btn-default" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}" target="_blank">
<a class="btn btn-default" href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&submitAction=generateInvoicePDF&id_order={$order->id}" target="_blank">
<i class="icon-file"></i>
{l s='View invoice'}
</a>
@@ -118,7 +118,7 @@
{l s='No invoice'}
{/if}
{if (($currentState && $currentState->delivery) || $order->delivery_number)}
<a class="btn btn-default" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}" target="_blank">
<a class="btn btn-default" href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&submitAction=generateDeliverySlipPDF&id_order={$order->id}" target="_blank">
<i class="icon-truck"></i>
{l s='View delivery slip'}
</a>
@@ -325,7 +325,7 @@
<td>
<span id="shipping_number_show">{if isset($line.url) && isset($line.tracking_number)}<a href="{$line.url|replace:'@':$line.tracking_number}">{$line.tracking_number}</a>{elseif isset($line.tracking_number)}{$line.tracking_number}{/if}</span>
{if $line.can_edit}
<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}&id_order_invoice={if $line.id_order_invoice}{$line.id_order_invoice|escape:'htmlall':'UTF-8'}{else}0{/if}&id_carrier={if $line.id_carrier}{$line.id_carrier|escape:'htmlall':'UTF-8'}{else}0{/if}">
<form method="post" action="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&vieworder&id_order={$order->id}&id_order_invoice={if $line.id_order_invoice}{$line.id_order_invoice|escape:'html':'UTF-8'}{else}0{/if}&id_carrier={if $line.id_carrier}{$line.id_carrier|escape:'html':'UTF-8'}{else}0{/if}">
<span class="shipping_number_edit" style="display:none;">
<button type="button" name="tracking_number">
{$line.tracking_number|htmlentities}
@@ -376,7 +376,7 @@
<i class="icon-user"></i>
{l s='Customer'} :
<a href="?tab=AdminCustomers&id_customer={$customer->id}&viewcustomer&token={getAdminToken tab='AdminCustomers'}">
{$gender->name|escape:'htmlall':'UTF-8'}
{$gender->name|escape:'html':'UTF-8'}
{$customer->firstname}
{$customer->lastname}
</a>
@@ -432,7 +432,7 @@
{if !$order->isVirtual()}
<!-- Shipping address -->
{if $can_edit}
<form class="form-horizontal" method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
<form class="form-horizontal" method="post" action="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&vieworder&id_order={$order->id}">
<div class="form-group">
<div class="col-lg-9">
<select name="id_address">
@@ -475,7 +475,7 @@
<div class="tab-pane" id="addressInvoice">
<!-- Invoice address -->
{if $can_edit}
<form class="form-horizontal" method="post" action="{$link->getAdminLink('AdminOrders')|escape:'htmlall':'UTF-8'}&vieworder&id_order={$order->id}">
<form class="form-horizontal" method="post" action="{$link->getAdminLink('AdminOrders')|escape:'html':'UTF-8'}&vieworder&id_order={$order->id}">
<div class="form-group">
<div class="col-lg-9">
<select name="id_address">
@@ -534,7 +534,7 @@
<select name="order_message" id="order_message" onchange="orderOverwriteMessage(this, '{l s='Do you want to overwrite your existing message?'}')">
<option value="0" selected="selected">-</option>
{foreach from=$orderMessages item=orderMessage}
<option value="{$orderMessage['message']|escape:'htmlall':'UTF-8'}">{$orderMessage['name']}</option>
<option value="{$orderMessage['message']|escape:'html':'UTF-8'}">{$orderMessage['name']}</option>
{/foreach}
</select>
</div>
@@ -566,7 +566,7 @@
<div class="form-group">
<label class="control-label col-lg-3">{l s='Message'}</label>
<div class="col-lg-9">
<textarea id="txt_msg" class="textarea-autosize" name="message">{Tools::getValue('message')|escape:'htmlall':'UTF-8'}</textarea>
<textarea id="txt_msg" class="textarea-autosize" name="message">{Tools::getValue('message')|escape:'html':'UTF-8'}</textarea>
<p id="nbchars"></p>
</div>
</div>
@@ -591,7 +591,7 @@
<i class="icon-envelope"></i>
{l s='New message'}
</button>
<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'htmlall':'UTF-8'}">
<a href="{$link->getAdminLink('AdminCustomerThreads')|escape:'html':'UTF-8'}">
<b>{l s='Click here'}</b> {l s='to see all messages.'}
<i class="icon-external-link"></i>
</a>
@@ -624,14 +624,14 @@
<br />{l s='This warning also concerns the next orders:'}
{/if}
{/if}
<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'html':'UTF-8'}">
#{'%06d'|sprintf:$brother_order->id}
</a>
{/foreach}
</p>
{/if}
<form id="formAddPayment" method="post" action="{$current_index}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<form id="formAddPayment" method="post" action="{$current_index}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'html':'UTF-8'}">
<table class="table">
<thead>
<tr>
@@ -756,7 +756,7 @@
</table>
</form>
{if (!$order->valid && sizeof($currencies) > 1)}
<form class="form-horizontal well" method="post" action="{$currentIndex}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<form class="form-horizontal well" method="post" action="{$currentIndex}&vieworder&id_order={$order->id}&token={$smarty.get.token|escape:'html':'UTF-8'}">
<div class="row">
<label class="control-label col-lg-3">{l s='Change currency'}</label>
<div class="col-lg-6">
@@ -827,7 +827,7 @@
{foreach $order->getBrother() as $brother_order}
<tr>
<td>
<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">#{'%06d'|sprintf:$brother_order->id}</a>
<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'html':'UTF-8'}">#{'%06d'|sprintf:$brother_order->id}</a>
</td>
<td>
{$brother_order->getCurrentOrderState()->name[$current_id_lang]}
@@ -836,7 +836,7 @@
{displayPrice price=$brother_order->total_paid_tax_incl currency=$currency->id}
</td>
<td>
<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<a href="{$current_index}&vieworder&id_order={$brother_order->id}&token={$smarty.get.token|escape:'html':'UTF-8'}">
<i class="icon-eye-open"></i>
{l s='See the order'}
</a>
@@ -988,7 +988,7 @@
</td>
{if $can_edit}
<td>
<a href="{$current_index}&submitDeleteVoucher&id_order_cart_rule={$discount['id_order_cart_rule']}&id_order={$order->id}&token={$smarty.get.token|escape:'htmlall':'UTF-8'}">
<a href="{$current_index}&submitDeleteVoucher&id_order_cart_rule={$discount['id_order_cart_rule']}&id_order={$order->id}&token={$smarty.get.token|escape:'html':'UTF-8'}">
<i class="icon-minus-sign"></i>
{l s='Delete voucher'}
</a>
@@ -1122,11 +1122,11 @@
</a>
{/if}
{l s='At'} <i>{dateFormat date=$message['date_add']}</i>
{l s='from'} <b>{if ($message['elastname']|escape:'htmlall':'UTF-8')}{$message['efirstname']|escape:'htmlall':'UTF-8'} {$message['elastname']|escape:'htmlall':'UTF-8'}{else}{$message['cfirstname']|escape:'htmlall':'UTF-8'} {$message['clastname']|escape:'htmlall':'UTF-8'}{/if}</b>
{l s='from'} <b>{if ($message['elastname']|escape:'html':'UTF-8')}{$message['efirstname']|escape:'html':'UTF-8'} {$message['elastname']|escape:'html':'UTF-8'}{else}{$message['cfirstname']|escape:'html':'UTF-8'} {$message['clastname']|escape:'html':'UTF-8'}{/if}</b>
{if ($message['private'] == 1)}
<span style="color:red; font-weight:bold;">{l s='Private'}</span>
{/if}
<p>{$message['message']|escape:'htmlall':'UTF-8'|nl2br}</p>
<p>{$message['message']|escape:'html':'UTF-8'|nl2br}</p>
</div>
{/foreach}
</div>
admin-dev/themes/default/template/controllers/outstanding/_print_pdf_icon.tpl
+1 -1
View File
@@ -25,5 +25,5 @@
{* Generate HTML code for printing Invoice Icon with link *}
<span style="width:20px; margin-right:5px;">
<a href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateInvoicePDF&id_order_invoice={$id_invoice}"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>
<a href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&submitAction=generateInvoicePDF&id_order_invoice={$id_invoice}"><img src="../img/admin/tab-invoice.gif" alt="invoice" /></a>
</span>
admin-dev/themes/default/template/controllers/products/associations.tpl
+4 -4
View File
@@ -38,7 +38,7 @@
<div id="category_block">
{$category_tree}
</div>
<a class="btn btn-link bt-icon confirm_leave" href="{$link->getAdminLink('AdminCategories')|escape:'htmlall':'UTF-8'}&addcategory">
<a class="btn btn-link bt-icon confirm_leave" href="{$link->getAdminLink('AdminCategories')|escape:'html':'UTF-8'}&addcategory">
<i class="icon-plus-sign"></i> {l s='Create new category'} <i class="icon-external-link-sign"></i>
</a>
</div>
@@ -68,7 +68,7 @@
</label>
<div class="col-lg-5">
<input type="hidden" name="inputAccessories" id="inputAccessories" value="{foreach from=$accessories item=accessory}{$accessory.id_product}-{/foreach}" />
<input type="hidden" name="nameAccessories" id="nameAccessories" value="{foreach from=$accessories item=accessory}{$accessory.name|escape:'htmlall':'UTF-8'}¤{/foreach}" />
<input type="hidden" name="nameAccessories" id="nameAccessories" value="{foreach from=$accessories item=accessory}{$accessory.name|escape:'html':'UTF-8'}¤{/foreach}" />
<div id="ajax_choose_product">
<div class="input-group">
<input type="text" value="" id="product_autocomplete_input" />
@@ -82,7 +82,7 @@
<button type="button" class="btn btn-default delAccessory" name="{$accessory.id_product}">
<i class="icon-remove text-danger"></i>
</button>
{$accessory.name|escape:'htmlall':'UTF-8'}{if !empty($accessory.reference)}{$accessory.reference}{/if}
{$accessory.name|escape:'html':'UTF-8'}{if !empty($accessory.reference)}{$accessory.reference}{/if}
</div>
{/foreach}
</div>
@@ -100,7 +100,7 @@
</select>
</div>
<div class="col-lg-4">
<a class="btn btn-link bt-icon confirm_leave" style="margin-bottom:0" href="{$link->getAdminLink('AdminManufacturers')|escape:'htmlall':'UTF-8'}&addmanufacturer">
<a class="btn btn-link bt-icon confirm_leave" style="margin-bottom:0" href="{$link->getAdminLink('AdminManufacturers')|escape:'html':'UTF-8'}&addmanufacturer">
<i class="icon-plus-sign"></i> {l s='Create new manufacturer'} <i class="icon-external-link-sign"></i>
</a>
</div>
admin-dev/themes/default/template/controllers/products/combinations.tpl
+2 -2
View File
@@ -73,7 +73,7 @@
<select name="attribute_group" id="attribute_group" onchange="populate_attrs();">
{if isset($attributes_groups)}
{foreach from=$attributes_groups key=k item=attribute_group}
<option value="{$attribute_group.id_attribute_group}">{$attribute_group.name|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option>
<option value="{$attribute_group.id_attribute_group}">{$attribute_group.name|escape:'html':'UTF-8'}&nbsp;&nbsp;</option>
{/foreach}
{/if}
</select>
@@ -318,7 +318,7 @@
<li>
<input type="checkbox" name="id_image_attr[]" value="{$image.id_image}" id="id_image_attr_{$image.id_image}" />
<label for="id_image_attr_{$image.id_image}">
<img src="{$smarty.const._THEME_PROD_DIR_}{$image.obj->getExistingImgPath()}-{$imageType}.jpg" alt="{$image.legend|escape:'htmlall':'UTF-8'}" title="{$image.legend|escape:'htmlall':'UTF-8'}" />
<img src="{$smarty.const._THEME_PROD_DIR_}{$image.obj->getExistingImgPath()}-{$imageType}.jpg" alt="{$image.legend|escape:'html':'UTF-8'}" title="{$image.legend|escape:'html':'UTF-8'}" />
</label>
</li>
{/foreach}
admin-dev/themes/default/template/controllers/products/features.tpl
+3 -3
View File
@@ -61,7 +61,7 @@
{else}
<input type="hidden" name="feature_{$available_feature.id_feature}_value" value="0" />
<span>{l s='N/A'} -
<a href="{$link->getAdminLink('AdminFeatures')|escape:'htmlall':'UTF-8'}&amp;addfeature_value&id_feature={$available_feature.id_feature}"
<a href="{$link->getAdminLink('AdminFeatures')|escape:'html':'UTF-8'}&amp;addfeature_value&id_feature={$available_feature.id_feature}"
class="confirm_leave btn btn-link"><i class="icon-plus-sign"></i> {l s='Add pre-defined values first'} <i class="icon-external-link-sign"></i></a>
</span>
{/if}
@@ -77,7 +77,7 @@
name="custom_{$available_feature.id_feature}_{$language.id_lang}"
cols="40"
rows="1"
onkeyup="if (isArrowKey(event)) return ;$('#feature_{$available_feature.id_feature}_value').val(0);" >{$available_feature.val[$k].value|escape:'htmlall':'UTF-8'|default:""}</textarea>
onkeyup="if (isArrowKey(event)) return ;$('#feature_{$available_feature.id_feature}_value').val(0);" >{$available_feature.val[$k].value|escape:'html':'UTF-8'|default:""}</textarea>
{if $languages|count > 1}
</div>
<div class="col-lg-3">
@@ -107,7 +107,7 @@
</tbody>
</table>
<a href="{$link->getAdminLink('AdminFeatures')|escape:'htmlall':'UTF-8'}&amp;addfeature" class="btn btn-link confirm_leave button">
<a href="{$link->getAdminLink('AdminFeatures')|escape:'html':'UTF-8'}&amp;addfeature" class="btn btn-link confirm_leave button">
<i class="icon-plus-sign"></i> {l s='Add a new feature'} <i class="icon-external-link-sign"></i>
</a>
</div>
admin-dev/themes/default/template/controllers/products/images.tpl
+1 -1
View File
@@ -62,7 +62,7 @@
id="legend_{$language.id_lang}"
{if isset($input_class)}class="{$input_class}"{/if}
name="legend_{$language.id_lang}"
value="{$product->name[$language.id_lang]|escape:'htmlall':'UTF-8'}"
value="{$product->name[$language.id_lang]|escape:'html':'UTF-8'}"
{if !$product->id}disabled="disabled"{/if} />
{if $languages|count > 1}
</div>
admin-dev/themes/default/template/controllers/products/prices.tpl
+2 -2
View File
@@ -173,7 +173,7 @@ $(document).ready(function () {
</select>
</div>
<div class="col-lg-2">
<a class="btn btn-link confirm_leave" href="{$link->getAdminLink('AdminTaxRulesGroup')|escape:'htmlall':'UTF-8'}&addtax_rules_group&id_product={$product->id}" {if $tax_exclude_taxe_option}disabled="disabled"{/if}>
<a class="btn btn-link confirm_leave" href="{$link->getAdminLink('AdminTaxRulesGroup')|escape:'html':'UTF-8'}&addtax_rules_group&id_product={$product->id}" {if $tax_exclude_taxe_option}disabled="disabled"{/if}>
<i class="icon-plus-sign"></i> {l s='Create new tax'} <i class="icon-external-link-sign"></i>
</a>
</div>
@@ -186,7 +186,7 @@ $(document).ready(function () {
<div class="col-lg-9 col-lg-offset-3">
<div class="alert">
{l s='Taxes are currently disabled'} :
<a href="{$link->getAdminLink('AdminTaxes')|escape:'htmlall':'UTF-8'}">{l s='Tax options'}</a>
<a href="{$link->getAdminLink('AdminTaxes')|escape:'html':'UTF-8'}">{l s='Tax options'}</a>
<input type="hidden" value="{$product->getIdTaxRulesGroup()}" name="id_tax_rules_group" />
</div>
</div>
admin-dev/themes/default/template/controllers/products/seo.tpl
+1 -1
View File
@@ -104,7 +104,7 @@
{foreach from=$languages item=language}
<div class="alert alert-warning translatable-field lang-{$language.id_lang}">
<i class="icon-link"></i> {l s='The product link will look like this:'}<br/>
<strong>{$curent_shop_url|escape:'htmlall':'UTF-8'}lang/{if isset($product->id)}{$product->id}{else}id_product{/if}-<span id="friendly-url_{$language.id_lang}">{$product->link_rewrite[$default_language]}</span>.html</strong>
<strong>{$curent_shop_url|escape:'html':'UTF-8'}lang/{if isset($product->id)}{$product->id}{else}id_product{/if}-<span id="friendly-url_{$language.id_lang}">{$product->link_rewrite[$default_language]}</span>.html</strong>
</div>
{/foreach}
</div>
admin-dev/themes/default/template/controllers/products/specific_prices_shop_update.tpl
+1 -1
View File
@@ -23,5 +23,5 @@
* International Registered Trademark & Property of PrestaShop SA
*}
{foreach from=$option_list item='row'}
<option value="{$row[$key_id]|intval}">{$row[$key_value]|escape:'htmlall':'UTF-8'}</option>
<option value="{$row[$key_id]|intval}">{$row[$key_value]|escape:'html':'UTF-8'}</option>
{/foreach}
admin-dev/themes/default/template/controllers/products/suppliers.tpl
+2 -2
View File
@@ -53,7 +53,7 @@
{/foreach}
</tbody>
</table>
<a class="btn btn-link bt-icon confirm_leave" href="{$link->getAdminLink('AdminSuppliers')|escape:'htmlall':'UTF-8'}&addsupplier">
<a class="btn btn-link bt-icon confirm_leave" href="{$link->getAdminLink('AdminSuppliers')|escape:'html':'UTF-8'}&addsupplier">
<i class="icon-plus"></i> {l s='Create a new supplier'} <i class="icon-external-link-sign"></i>
</a>
</div>
@@ -103,7 +103,7 @@
<tr {if $index is odd}class="alt_row"{/if}>
<td>{$product_designation[$attribute['id_product_attribute']]}</td>
<td>
<input type="text" value="{$reference|escape:'htmlall':'UTF-8'}" name="supplier_reference_{$attribute['id_product']}_{$attribute['id_product_attribute']}_{$supplier->id_supplier}" />
<input type="text" value="{$reference|escape:'html':'UTF-8'}" name="supplier_reference_{$attribute['id_product']}_{$attribute['id_product_attribute']}_{$supplier->id_supplier}" />
</td>
<td>
<input type="text" value="{$price_te|htmlentities}" name="product_price_{$attribute['id_product']}_{$attribute['id_product_attribute']}_{$supplier->id_supplier}" />
admin-dev/themes/default/template/controllers/products/virtualproduct.tpl
+1 -1
View File
@@ -188,7 +188,7 @@
<label for="virtual_product_name" class="t">{l s='Filename'}</label>
</td>
<td class="col-right">
<input type="text" id="virtual_product_name" name="virtual_product_name" style="width:200px" value="{$product->productDownload->display_filename|escape:'htmlall':'UTF-8'}" />
<input type="text" id="virtual_product_name" name="virtual_product_name" style="width:200px" value="{$product->productDownload->display_filename|escape:'html':'UTF-8'}" />
<p class="preference_description" name="help_box">{l s='The full filename with its extension (e.g. Book.pdf)'}</p>
</td>
</tr>
admin-dev/themes/default/template/controllers/products/warehouses.tpl
+2 -2
View File
@@ -36,7 +36,7 @@
<p>{l s='Please choose the warehouses associated with this product. You must also select a default warehouse. '}</p>
</div>
<div class="row">
<a class="btn btn-link confirm_leave" href="{$link->getAdminLink('AdminWarehouses')|escape:'htmlall':'UTF-8'}&addwarehouse">{l s='Create a new warehouse'} <i class="icon-external-link-sign"></i></a>
<a class="btn btn-link confirm_leave" href="{$link->getAdminLink('AdminWarehouses')|escape:'html':'UTF-8'}&addwarehouse">{l s='Create a new warehouse'} <i class="icon-external-link-sign"></i></a>
</div>
<div class="row">
<div class="panel-group" id="warehouse-accordion">
@@ -76,7 +76,7 @@
<td>{$product_designation[$attribute['id_product_attribute']]}</td>
<td><input type="text"
name="location_warehouse_{$warehouse['id_warehouse']}_{$attribute['id_product']}_{$attribute['id_product_attribute']}"
value="{$location|escape:'htmlall':'UTF-8'}"
value="{$location|escape:'html':'UTF-8'}"
size="20" />
</td>
</tr>
admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
+4 -4
View File
@@ -77,8 +77,8 @@ $(function() {
<tbody>
{foreach $modules key=key item=module}
<tr>
<td><a href="{$module->linkto|escape:'htmlall':'UTF-8'}"><strong>{$module->displayName}</strong></a></td>
<td><a href="{$module->linkto|escape:'htmlall':'UTF-8'}">{$module->description}</a></td>
<td><a href="{$module->linkto|escape:'html':'UTF-8'}"><strong>{$module->displayName}</strong></a></td>
<td><a href="{$module->linkto|escape:'html':'UTF-8'}">{$module->description}</a></td>
</tr>
{/foreach}
</tbody>
@@ -157,8 +157,8 @@ $(function() {
<tbody>
{foreach $addons key=key item=addon}
<tr>
<td><a href="{$addon.href|escape:'htmlall':'UTF-8'}" target="_blank"><strong><i class="icon-external-link-sign"></i> {$addon.title|escape:'htmlall':'UTF-8'}</strong></a></td>
<td><a href="{$addon.href|escape:'htmlall':'UTF-8'}" target="_blank">{$addon.description|truncate:256:'...'|escape:'htmlall':'UTF-8'}</a></td>
<td><a href="{$addon.href|escape:'html':'UTF-8'}" target="_blank"><strong><i class="icon-external-link-sign"></i> {$addon.title|escape:'html':'UTF-8'}</strong></a></td>
<td><a href="{$addon.href|escape:'html':'UTF-8'}" target="_blank">{$addon.description|truncate:256:'...'|escape:'html':'UTF-8'}</a></td>
</tr>
{/foreach}
</tbody>
admin-dev/themes/default/template/controllers/shop/helpers/list/list_content.tpl
+1 -1
View File
@@ -30,7 +30,7 @@
{if isset($tr.$key)}
<a href="{$tr.$key}" onmouseover="$(this).css('text-decoration', 'underline')" onmouseout="$(this).css('text-decoration', 'none')" target="_blank">{$tr.$key}</a>
{else}
<a href="{$link->getAdminLink('AdminShopUrl')|escape:'htmlall':'UTF-8'}&id_shop={$tr.$identifier}&addshop_url" class="multishop_warning">{l s='Click here to set a URL for this shop.'}</a>
<a href="{$link->getAdminLink('AdminShopUrl')|escape:'html':'UTF-8'}&id_shop={$tr.$identifier}&addshop_url" class="multishop_warning">{l s='Click here to set a URL for this shop.'}</a>
{/if}
{else}
{$smarty.block.parent}
admin-dev/themes/default/template/controllers/slip/_print_pdf_icon.tpl
+1 -1
View File
@@ -25,7 +25,7 @@
{* Generate HTML code for printing OrderSlip Icon with link *}
<a class="btn btn-default" target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateOrderSlipPDF&id_order_slip={$order_slip->id}">
<a class="btn btn-default" target="_blank" href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&submitAction=generateOrderSlipPDF&id_order_slip={$order_slip->id}">
<i class="icon-file-text"></i>
{l s='Download credit slip'}
</a>
admin-dev/themes/default/template/controllers/statuses/helpers/form/form.tpl
+1 -1
View File
@@ -53,7 +53,7 @@
{else}
{if isset($fields_value[$input.name][$language.id_lang]) && ($fields_value[$input.name][$language.id_lang] == $option[$input.options.id])}selected="selected"{/if}
{/if}
>{$option[$input.options.name]|escape:'htmlall':'UTF-8'}</option>
>{$option[$input.options.name]|escape:'html':'UTF-8'}</option>
{/foreach}
</select>
</div>
admin-dev/themes/default/template/controllers/stores/helpers/form/form.tpl
+3 -3
View File
@@ -41,7 +41,7 @@
{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
name="latitude"
id="latitude"
value="{$fields_value[$input.name]|escape:'htmlall'}" />
value="{$fields_value[$input.name]|escape:'html'}" />
</div>
<div class="col-lg-1">
<div class="form-control-static text-center"> / </div>
@@ -52,7 +52,7 @@
{if isset($input.maxlength)}maxlength="{$input.maxlength}"{/if}
name="longitude"
id="longitude"
value="{$fields_value['longitude']|escape:'htmlall'}" />
value="{$fields_value['longitude']|escape:'html'}" />
</div>
</div>
{else}
@@ -69,7 +69,7 @@
{foreach $fields_value.days as $k => $value}
<div class="form-group">
<label class="control-label col-lg-3">{$value}</label>
<div class="col-lg-9"><input type="text" size="25" name="hours_{$k}" value="{if isset($fields_value.hours[$k-1])}{$fields_value.hours[$k-1]|escape:'htmlall'}{/if}" /></div>
<div class="col-lg-9"><input type="text" size="25" name="hours_{$k}" value="{if isset($fields_value.hours[$k-1])}{$fields_value.hours[$k-1]|escape:'html'}{/if}" /></div>
</div>
{/foreach}
{/if}
admin-dev/themes/default/template/controllers/supply_orders_change_state/helpers/form/form.tpl
+1 -1
View File
@@ -65,7 +65,7 @@ $(document).ready(function() {
{if isset($supply_order_state) && $supply_order_state->editable == false && isset($supply_order)}
<div class="panel">
<h3><i class="icon-download-alt"></i> {l s='Print the supply order form'}</h3>
<a href="{$link->getAdminLink('AdminPdf')|escape:'htmlall':'UTF-8'}&submitAction=generateSupplyOrderFormPDF&id_supply_order={$supply_order->id}" onclick="return !window.open(this.href);" title="Export as PDF" class="btn btn-default"><i class="icon-download-alt"></i> {l s='Click here to download the supply order form.'}.</a>
<a href="{$link->getAdminLink('AdminPdf')|escape:'html':'UTF-8'}&submitAction=generateSupplyOrderFormPDF&id_supply_order={$supply_order->id}" onclick="return !window.open(this.href);" title="Export as PDF" class="btn btn-default"><i class="icon-download-alt"></i> {l s='Click here to download the supply order form.'}.</a>
</div>
{/if}
admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_content.tpl
+2 -2
View File
@@ -101,10 +101,10 @@
{if $tr.$key == '0 - 0'}
--
{else}
{$tr.$key|escape:'htmlall':'UTF-8'}
{$tr.$key|escape:'html':'UTF-8'}
{/if}
{else}
{$tr.$key|escape:'htmlall':'UTF-8'}
{$tr.$key|escape:'html':'UTF-8'}
{/if}
{else}
--
admin-dev/themes/default/template/header.tpl
+4 -4
View File
@@ -33,7 +33,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="robots" content="NOFOLLOW, NOINDEX">
<title>{$shop_name} {if $meta_title != ''}{if isset($navigationPipe)}{$navigationPipe|escape:'htmlall':'UTF-8'}{else}&gt;{/if} {$meta_title}{/if}</title>
<title>{$shop_name} {if $meta_title != ''}{if isset($navigationPipe)}{$navigationPipe|escape:'html':'UTF-8'}{else}&gt;{/if} {$meta_title}{/if}</title>
{if $display_header}
<script type="text/javascript">
@@ -113,7 +113,7 @@
<i class="icon-reorder"></i>
</button>
<a id="header_shopname" href="{$default_tab_link|escape:'htmlall':'UTF-8'}">
<a id="header_shopname" href="{$default_tab_link|escape:'html':'UTF-8'}">
<img src="{$img_dir}prestashop-avatar.png" height="15" width="15" />
{$shop_name}
</a>
@@ -298,7 +298,7 @@
<a href="#" id="quick_select" class="dropdown-toggle" data-toggle="dropdown">{l s='Quick Access'} <b class="caret"></b></a>
<ul class="dropdown-menu">
{foreach $quick_access as $quick}
<li><a href="{$quick.link|escape:'htmlall':'UTF-8'}" {if $quick.new_window} target="_blank"{/if}><i class="icon-chevron-right"></i> {$quick.name}</a></li>
<li><a href="{$quick.link|escape:'html':'UTF-8'}" {if $quick.new_window} target="_blank"{/if}><i class="icon-chevron-right"></i> {$quick.name}</a></li>
{/foreach}
</ul>
</li>
@@ -322,7 +322,7 @@
<ul id="employee_links" class="dropdown-menu">
<li><span class="employee_avatar">{$employee_avatar}</span></li>
<li class="divider"></li>
<li><a href="{$link->getAdminLink('AdminEmployees')|escape:'htmlall':'UTF-8'}&id_employee={$employee->id}&amp;updateemployee"><i class="icon-wrench"></i> {l s='My preferences'}</a></li>
<li><a href="{$link->getAdminLink('AdminEmployees')|escape:'html':'UTF-8'}&id_employee={$employee->id}&amp;updateemployee"><i class="icon-wrench"></i> {l s='My preferences'}</a></li>
<li class="divider"></li>
<li><a id="header_logout" href="index.php?logout"><i class="icon-signout"></i> {l s='Log out'}</a></li>
</ul>
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}
admin-dev/themes/default/template/nav.tpl
+2 -2
View File
@@ -20,8 +20,8 @@
{foreach from=$t.sub_tabs item=t2}
{if $t2.active}
<li {if $t2.current} class="active"{/if}>
<a href="{$t2.href|escape:'htmlall':'UTF-8'}">
{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'htmlall':'UTF-8'}{/if}
<a href="{$t2.href|escape:'html':'UTF-8'}">
{if $t2.name eq ''}{$t2.class_name}{else}{$t2.name|escape:'html':'UTF-8'}{/if}
</a>
</li>
{/if}