diff --git a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
index d39859ba2..cd6448c17 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/conditions.tpl
@@ -7,9 +7,11 @@
 <label>{l s='Validity'}</label>
 <div class="margin-form">
 	<strong>{l s='from'}</strong>
-	<input type="text" class="datepicker" name="date_from" value="{if $currentTab->getFieldValue($currentObject, 'date_from')}{$currentTab->getFieldValue($currentObject, 'date_from')}{else}{$defaultDateFrom}{/if}" />
+	<input type="text" class="datepicker" name="date_from"
+		value="{if $currentTab->getFieldValue($currentObject, 'date_from')}{$currentTab->getFieldValue($currentObject, 'date_from')|escape}{else}{$defaultDateFrom}{/if}" />
 	<strong>{l s='to'}</strong>
-	<input type="text" class="datepicker" name="date_to" value="{if $currentTab->getFieldValue($currentObject, 'date_to')}{$currentTab->getFieldValue($currentObject, 'date_to')}{else}{$defaultDateTo}{/if}" />
+	<input type="text" class="datepicker" name="date_to"
+		value="{if $currentTab->getFieldValue($currentObject, 'date_to')}{$currentTab->getFieldValue($currentObject, 'date_to')|escape}{else}{$defaultDateTo}{/if}" />
 	<p class="preference_description">{l s='Default period is one month.'}</p>
 </div>
 <label>{l s='Minimum amount'}</label>
@@ -17,7 +19,14 @@
 	<input type="text" name="minimum_amount" value="{$currentTab->getFieldValue($currentObject, 'minimum_amount')|floatval}" />
 	<select name="minimum_amount_currency">
 	{foreach from=$currencies item='currency'}
-		<option value="{$currency.id_currency|intval}" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_currency') == $currency.id_currency || (!$currentTab->getFieldValue($currentObject, 'minimum_amount_currency') && $currency.id_currency == $defaultCurrency)}selected="selected"{/if}>{$currency.iso_code}</option>
+		<option value="{$currency.id_currency|intval}"
+		{if $currentTab->getFieldValue($currentObject, 'minimum_amount_currency') == $currency.id_currency
+			|| (!$currentTab->getFieldValue($currentObject, 'minimum_amount_currency') && $currency.id_currency == $defaultCurrency)}
+			selected="selected"
+		{/if}
+		>
+			{$currency.iso_code}
+		</option>
 	{/foreach}
 	</select>
 	<select name="minimum_amount_tax">
@@ -50,10 +59,13 @@
 				<p><strong>{l s='Selected countries'}</strong></p>
 				<select name="country_select[]" id="country_select_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
 					{foreach from=$countries.selected item='country'}
-						<option value="{$country.id_country|intval}">&nbsp;{$country.name}</option>
+						<option value="{$country.id_country|intval}">&nbsp;{$country.name|escape}</option>
 					{/foreach}
 				</select><br /><br />
-				<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="country_select_remove">
+				<a
+					id="country_select_remove"
+					style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+				>
 					{l s='Remove'} &gt;&gt;
 				</a>
 			</td>
@@ -61,10 +73,13 @@
 				<p><strong>{l s='Unselected countries'}</strong></p>
 				<select id="country_select_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
 					{foreach from=$countries.unselected item='country'}
-						<option value="{$country.id_country|intval}">&nbsp;{$country.name}</option>
+						<option value="{$country.id_country|intval}">&nbsp;{$country.name|escape}</option>
 					{/foreach}
 				</select><br /><br />
-				<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="country_select_add">
+				<a
+					id="country_select_add"
+					style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+				>
 					&lt;&lt; {l s='Add'}
 				</a>
 			</td>
@@ -82,10 +97,13 @@
 				<p><strong>{l s='Selected carriers'}</strong></p>
 				<select name="carrier_select[]" id="carrier_select_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
 					{foreach from=$carriers.selected item='carrier'}
-						<option value="{$carrier.id_carrier|intval}">&nbsp;{$carrier.name}</option>
+						<option value="{$carrier.id_carrier|intval}">&nbsp;{$carrier.name|escape}</option>
 					{/foreach}
 				</select><br /><br />
-				<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="carrier_select_remove">
+				<a
+					id="carrier_select_remove"
+					style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+				>
 					{l s='Remove'} &gt;&gt;
 				</a>
 			</td>
@@ -93,10 +111,13 @@
 				<p><strong>{l s='Unselected carriers'}</strong></p>
 				<select id="carrier_select_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
 					{foreach from=$carriers.unselected item='carrier'}
-						<option value="{$carrier.id_carrier|intval}">&nbsp;{$carrier.name}</option>
+						<option value="{$carrier.id_carrier|intval}">&nbsp;{$carrier.name|escape}</option>
 					{/foreach}
 				</select><br /><br />
-				<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="carrier_select_add">
+				<a
+					id="carrier_select_add"
+					style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+				>
 					&lt;&lt; {l s='Add'}
 				</a>
 			</td>
@@ -106,7 +127,8 @@
 {/if}
 {if $groups.unselected|@count + $groups.selected|@count > 1}
 <br />
-<input type="checkbox" id="group_restriction" name="group_restriction" value="1" {if $groups.unselected|@count}checked="checked"{/if} /> <strong>{l s='Customer group selection'}</strong>
+<input type="checkbox" id="group_restriction" name="group_restriction" value="1" {if $groups.unselected|@count}checked="checked"{/if} />
+<strong>{l s='Customer group selection'}</strong>
 <div id="group_restriction_div" style="border:1px solid #AAAAAA;margin-top:10px;padding:0 10px 10px 10px;background-color:#FFF5D3">
 	<table>
 		<tr>
@@ -114,10 +136,13 @@
 				<p><strong>{l s='Selected groups'}</strong></p>
 				<select name="group_select[]" id="group_select_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
 					{foreach from=$groups.selected item='group'}
-						<option value="{$group.id_group|intval}">&nbsp;{$group.name}</option>
+						<option value="{$group.id_group|intval}">&nbsp;{$group.name|escape}</option>
 					{/foreach}
 				</select><br /><br />
-				<a style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="group_select_remove">
+				<a
+					id="group_select_remove"
+					style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+				>
 					{l s='Remove'} &gt;&gt;
 				</a>
 			</td>
@@ -125,10 +150,13 @@
 				<p><strong>{l s='Unselected groups'}</strong></p>
 				<select id="group_select_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
 					{foreach from=$groups.unselected item='group'}
-						<option value="{$group.id_group|intval}">&nbsp;{$group.name}</option>
+						<option value="{$group.id_group|intval}">&nbsp;{$group.name|escape}</option>
 					{/foreach}
 				</select><br /><br />
-				<a style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="group_select_add">
+				<a
+					id="group_select_add"
+					style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+				>
 					&lt;&lt; {l s='Add'}
 				</a>
 			</td>
@@ -138,7 +166,8 @@
 {/if}
 {if $cart_rules.unselected|@count + $cart_rules.selected|@count > 0}
 <br />
-<input type="checkbox" id="cart_rule_restriction" name="cart_rule_restriction" value="1" {if $cart_rules.unselected|@count}checked="checked"{/if} /> <strong>{l s='Compatibility with other cart rules'}</strong>
+<input type="checkbox" id="cart_rule_restriction" name="cart_rule_restriction" value="1" {if $cart_rules.unselected|@count}checked="checked"{/if} />
+<strong>{l s='Compatibility with other cart rules'}</strong>
 <div id="cart_rule_restriction_div" style="border:1px solid #AAAAAA;margin-top:10px;padding:0 10px 10px 10px;background-color:#FFF5D3">
 	<table>
 		<tr>
@@ -146,10 +175,13 @@
 				<p><strong>{l s='Combinable cart rules'}</strong></p>
 				<select name="cart_rule_select[]" id="cart_rule_select_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
 					{foreach from=$cart_rules.selected item='cart_rule'}
-						<option value="{$cart_rule.id_cart_rule|intval}">&nbsp;{$cart_rule.name}</option>
+						<option value="{$cart_rule.id_cart_rule|intval}">&nbsp;{$cart_rule.name|escape}</option>
 					{/foreach}
 				</select><br /><br />
-				<a style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="cart_rule_select_remove">
+				<a
+					id="cart_rule_select_remove"
+					style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+				>
 					{l s='Remove'} &gt;&gt;
 				</a>
 			</td>
@@ -157,10 +189,13 @@
 				<p><strong>{l s='Uncombinable cart rules'}</strong></p>
 				<select id="cart_rule_select_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple="">
 					{foreach from=$cart_rules.unselected item='cart_rule'}
-						<option value="{$cart_rule.id_cart_rule|intval}">&nbsp;{$cart_rule.name}</option>
+						<option value="{$cart_rule.id_cart_rule|intval}">&nbsp;{$cart_rule.name|escape}</option>
 					{/foreach}
 				</select><br /><br />
-				<a style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="cart_rule_select_add">
+				<a
+					id="cart_rule_select_add"
+					style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+				>
 					&lt;&lt; {l s='Add'}
 				</a>
 			</td>
@@ -190,10 +225,13 @@
 				<p><strong>{l s='Selected shops'}</strong></p>
 				<select name="shop_select[]" id="shop_select_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
 					{foreach from=$shops.selected item='shop'}
-						<option value="{$shop.id_shop|intval}">&nbsp;{$shop.name}</option>
+						<option value="{$shop.id_shop|intval}">&nbsp;{$shop.name|escape}</option>
 					{/foreach}
 				</select><br /><br />
-				<a style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="shop_select_remove">
+				<a
+					id="shop_select_remove"
+					style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+				>
 					{l s='Remove'} &gt;&gt;
 				</a>
 			</td>
@@ -201,10 +239,13 @@
 				<p><strong>{l s='Unselected shops'}</strong></p>
 				<select id="shop_select_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
 					{foreach from=$shops.unselected item='shop'}
-						<option value="{$shop.id_shop|intval}">&nbsp;{$shop.name}</option>
+						<option value="{$shop.id_shop|intval}">&nbsp;{$shop.name|escape}</option>
 					{/foreach}
 				</select><br /><br />
-				<a style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="shop_select_add">
+				<a
+					id="shop_select_add"
+					style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+				>
 					&lt;&lt; {l s='Add'}
 				</a>
 			</td>
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl
index 654c53790..8962eeefa 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/form.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/form.tpl
@@ -16,7 +16,7 @@
 		</ul>
 	</div>
 </div>
-<form action="{$currentIndex}&token={$currentToken}&addcart_rule" id="cart_rule_form" method="post">
+<form action="{$currentIndex|escape}&token={$currentToken|escape}&addcart_rule" id="cart_rule_form" method="post">
 	{if $currentObject->id}<input type="hidden" name="id_cart_rule" value="{$currentObject->id|intval}" />{/if}
 	<input type="hidden" id="currentFormTab" name="currentFormTab" value="informations" />
 	<div id="cart_rule_informations" class="cart_rule_tab">
@@ -36,22 +36,22 @@
 	</div>
 	<div class="separation"></div>
 	<div style="text-align:center">
-		<input type="submit" value="{l s='Save'}" class="button" name="submitAddcart_rule" id="{$table}_form_submit_btn" />
+		<input type="submit" value="{l s='Save'}" class="button" name="submitAddcart_rule" id="{$table|escape}_form_submit_btn" />
 		<!--<input type="submit" value="{l s='Save and stay'}" class="button" name="submitAddcart_ruleAndStay" id="" />-->
 	</div>
 </form>
 <script type="text/javascript">
-	var product_rule_groups_counter = {if isset($product_rule_groups_counter)}{$product_rule_groups_counter}{else}0{/if};
+	var product_rule_groups_counter = {if isset($product_rule_groups_counter)}{$product_rule_groups_counter|intval}{else}0{/if};
 	var product_rule_counters = new Array();
-	var currentToken = '{$currentToken}';
-	var currentFormTab = '{if isset($smarty.post.currentFormTab)}{$smarty.post.currentFormTab|escape}{else}informations{/if}';
+	var currentToken = '{$currentToken|escape:'quotes'}';
+	var currentFormTab = '{if isset($smarty.post.currentFormTab)}{$smarty.post.currentFormTab|escape:'quotes'}{else}informations{/if}';
 	
 	var languages = new Array();
 	{foreach from=$languages item=language key=k}
 		languages[{$k}] = {
 			id_lang: {$language.id_lang},
-			iso_code: '{$language.iso_code}',
-			name: '{$language.name}'
+			iso_code: '{$language.iso_code|escape:'quotes'}',
+			name: '{$language.name|escape:'quotes'}'
 		};
 	{/foreach}
 	displayFlags(languages, {$defaultLanguage});
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl b/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
index 1ea31aa77..7c93fd4a6 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/informations.tpl
@@ -5,8 +5,8 @@
 			<div class="margin-form">
 				<div class="translatable">
 				{foreach from=$languages item=language}
-					<div class="lang_{$language.id_lang}" style="display:{if $language.id_lang == $defaultLanguage}block{else}none{/if};float:left">
-						<input type="text" id="name_{$language.id_lang}" name="name_{$language.id_lang}" value="{$currentTab->getFieldValue($currentObject, 'name', $language.id_lang)}" style="width:400px" />
+					<div class="lang_{$language.id_lang|intval}" style="display:{if $language.id_lang == $defaultLanguage}block{else}none{/if};float:left">
+						<input type="text" id="name_{$language.id_lang|intval}" name="name_{$language.id_lang|intval}" value="{$currentTab->getFieldValue($currentObject, 'name', $language.id_lang|intval)}" style="width:400px" />
 						<sup>*</sup>
 					</div>
 				{/foreach}
@@ -15,12 +15,12 @@
 			</div>
 			<label>{l s='Description'}</label>
 			<div class="margin-form">
-				<textarea name="description" style="width:80%;height:100px">{$currentTab->getFieldValue($currentObject, 'description')}</textarea>
+				<textarea name="description" style="width:80%;height:100px">{$currentTab->getFieldValue($currentObject, 'description')|escape}</textarea>
 				<p class="preference_description">{l s='For you only, never displayed to the customer.'}</p>
 			</div>
 			<label>{l s='Code'}</label>
 			<div class="margin-form">
-				<input type="text" id="code" name="code" value="{$currentTab->getFieldValue($currentObject, 'code')}" />
+				<input type="text" id="code" name="code" value="{$currentTab->getFieldValue($currentObject, 'code')|escape}" />
 				<a href="javascript:gencode(8);" class="button">{l s='(Click to generate random code)'}</a>
 				<p class="preference_description">{l s='Caution! The rule will automatically be applied if you leave this field blank.'}</p>
 			</div>
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/product_rule.tpl b/admin-dev/themes/default/template/controllers/cart_rules/product_rule.tpl
index fe9bd0076..fbc351835 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/product_rule.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/product_rule.tpl
@@ -1,12 +1,12 @@
-<tr id="product_rule_{$product_rule_group_id}_{$product_rule_id}_tr">
+<tr id="product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_tr">
 	<td>
-		<a href="javascript:removeProductRule({$product_rule_group_id}, {$product_rule_id});">
+		<a href="javascript:removeProductRule({$product_rule_group_id|intval}, {$product_rule_id|intval});">
 			<img src="../img/admin/disabled.gif" alt="{l s='Remove'}" title="{l s='Remove'}" />
 		</a>
 	</td>
 	<td>
-		<input type="hidden" name="product_rule_{$product_rule_group_id}[]" value="{$product_rule_id}" />
-		<input type="hidden" name="product_rule_{$product_rule_group_id}_{$product_rule_id}_type" value="{$product_rule_type}" />
+		<input type="hidden" name="product_rule_{$product_rule_group_id|intval}[]" value="{$product_rule_id}" />
+		<input type="hidden" name="product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_type" value="{$product_rule_type|escape}" />
 		{* Everything is on a single line in order to avoid a empty space between the [ ] and the word *}
 		[{if $product_rule_type == 'products'}{l s='Products'}{elseif $product_rule_type == 'categories'}{l s='Categories'}{elseif $product_rule_type == 'manufacturers'}{l s='Manufacturers'}{elseif $product_rule_type == 'suppliers'}{l s='Suppliers'}{elseif $product_rule_type == 'attributes'}{l s='Attributes'}{/if}]
 	</td>
@@ -14,14 +14,14 @@
 		{l s='The product(s) are matching on of these'}
 	</td>
 	<td>
-		<input type="text" id="product_rule_{$product_rule_group_id}_{$product_rule_id}_match" value="" disabled="disabled" />
+		<input type="text" id="product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_match" value="" disabled="disabled" />
 	</td>
 	<td>
-		<a id="product_rule_{$product_rule_group_id}_{$product_rule_id}_choose_link" href="#product_rule_{$product_rule_group_id}_{$product_rule_id}_choose_content">
+		<a id="product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_choose_link" href="#product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_choose_content">
 			<img src="../img/admin/choose.gif" alt="{l s='Choose'}" title="{l s='Choose'}" /> {l s='Choose'}
 		</a>
 		<div>
-			<div id="product_rule_{$product_rule_group_id}_{$product_rule_id}_choose_content">
+			<div id="product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_choose_content">
 				{$product_rule_choose_content}
 			</div>
 		</div>
@@ -29,7 +29,7 @@
 </tr>
 
 <script type="text/javascript">
-	$('#product_rule_{$product_rule_group_id}_{$product_rule_id}_choose_content').parent().hide();
-	$("#product_rule_{$product_rule_group_id}_{$product_rule_id}_choose_link").fancybox();
-	$(document).ready(function() { updateProductRuleShortDescription($('#product_rule_select_{$product_rule_group_id}_{$product_rule_id}_add')); });
+	$('#product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_choose_content').parent().hide();
+	$("#product_rule_{$product_rule_group_id|intval}_{$product_rule_id|intval}_choose_link").fancybox();
+	$(document).ready(function() { updateProductRuleShortDescription($('#product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_add')); });
 </script>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl b/admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl
index b82e9c8ad..c7eec816d 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/product_rule_group.tpl
@@ -1,20 +1,20 @@
-<tr id="product_rule_group_{$product_rule_group_id}_tr">
+<tr id="product_rule_group_{$product_rule_group_id|intval}_tr">
 	<td style="vertical-align:center;padding-right:10px">
-		<a href="javascript:removeProductRuleGroup({$product_rule_group_id});">
+		<a href="javascript:removeProductRuleGroup({$product_rule_group_id|intval});">
 			<img src="../img/admin/disabled.gif" alt="{l s='Remove'}" title="{l s='Remove'}" />
 		</a>
 	</td>
 	<td style="padding-bottom:15px">
-		<input type="hidden" name="product_rule_group[]" value="{$product_rule_group_id}" />
+		<input type="hidden" name="product_rule_group[]" value="{$product_rule_group_id|intval}" />
 		{l s='The cart must contain at least'}
-		<input type="text" name="product_rule_group_{$product_rule_group_id}_quantity" value="{$product_rule_group_quantity|intval}" style="width:30px" />
+		<input type="text" name="product_rule_group_{$product_rule_group_id|intval}_quantity" value="{$product_rule_group_quantity|intval}" style="width:30px" />
 		{l s='product(s) matching the following rules:'}
 		<br />
-		<a href="javascript:addProductRule({$product_rule_group_id});">
+		<a href="javascript:addProductRule({$product_rule_group_id|intval});">
 			<img src="../img/admin/add.gif" alt="{l s='Add'}" title="{l s='Add'}" />
 			{l s='Add a rule concerning'}
 		</a>
-		<select id="product_rule_type_{$product_rule_group_id}">
+		<select id="product_rule_type_{$product_rule_group_id|intval}">
 			<option value="">{l s='-- Choose --'}</option>
 			<option value="products">{l s='Products'}</option>
 			<option value="attributes">{l s='Attributes'}</option>
@@ -22,10 +22,10 @@
 			<option value="manufacturers">{l s='Manufacturers'}</option>
 			<option value="suppliers">{l s='Suppliers'}</option>
 		</select>
-		<a href="javascript:addProductRule({$product_rule_group_id});">
+		<a href="javascript:addProductRule({$product_rule_group_id|intval});">
 			<input type="button" class="button" value="OK" />
 		</a>
-		<table id="product_rule_table_{$product_rule_group_id}" class="table" cellpadding="0" cellspacing="0">
+		<table id="product_rule_table_{$product_rule_group_id|intval}" class="table" cellpadding="0" cellspacing="0">
 			{if isset($product_rules) && $product_rules|@count}
 				{foreach from=$product_rules item='product_rule'}
 					{$product_rule}
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/product_rule_itemlist.tpl b/admin-dev/themes/default/template/controllers/cart_rules/product_rule_itemlist.tpl
index 5f2825158..6d6372f06 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/product_rule_itemlist.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/product_rule_itemlist.tpl
@@ -2,23 +2,39 @@
 	<tr>
 		<td>
 			<p><strong>{l s='Selected'}</strong></p>
-			<select name="product_rule_select_{$product_rule_group_id}_{$product_rule_id}[]" class="product_rule_toselect" id="product_rule_select_{$product_rule_group_id}_{$product_rule_id}_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
+			<select
+				name="product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}[]"
+				id="product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_2"
+				class="product_rule_toselect"
+				style="border:1px solid #AAAAAA;width:400px;height:160px"
+				multiple
+			>
 				{foreach from=$product_rule_itemlist.selected item='item'}
 					<option value="{$item.id|intval}">&nbsp;{$item.name}</option>
 				{/foreach}
 			</select><br /><br />
-			<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="product_rule_select_{$product_rule_group_id}_{$product_rule_id}_remove">
+			<a
+				id="product_rule_select_{$product_rule_group_id}_{$product_rule_id}_remove"
+				style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+			>
 				{l s='Remove'} &gt;&gt;
 			</a>
 		</td>
-		<td style="padding-left:20px;">
+		<td style="padding-left:20px">
 			<p><strong>{l s='Unselected'}</strong></p>
-			<select id="product_rule_select_{$product_rule_group_id}_{$product_rule_id}_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
+			<select
+				id="product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_1"
+				style="border:1px solid #AAAAAA;width:400px;height:160px"
+				multiple
+			>
 				{foreach from=$product_rule_itemlist.unselected item='item'}
 					<option value="{$item.id|intval}">&nbsp;{$item.name}</option>
 				{/foreach}
 			</select><br /><br />
-			<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="product_rule_select_{$product_rule_group_id}_{$product_rule_id}_add">
+			<a
+				id="product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_add"
+				style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px"
+			>
 				&lt;&lt; {l s='Add'}
 			</a>
 		</td>
@@ -26,7 +42,7 @@
 </table>
 
 <script type="text/javascript">
-	$('#product_rule_select_{$product_rule_group_id}_{$product_rule_id}_remove').click(function() { removeCartRuleOption(this); updateProductRuleShortDescription(this); });
-	$('#product_rule_select_{$product_rule_group_id}_{$product_rule_id}_add').click(function() { addCartRuleOption(this); updateProductRuleShortDescription(this); });
-	$(document).ready(function() { updateProductRuleShortDescription($('#product_rule_select_{$product_rule_group_id}_{$product_rule_id}_add')); });
+	$('#product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_remove').click(function() { removeCartRuleOption(this); updateProductRuleShortDescription(this); });
+	$('#product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_add').click(function() { addCartRuleOption(this); updateProductRuleShortDescription(this); });
+	$(document).ready(function() { updateProductRuleShortDescription($('#product_rule_select_{$product_rule_group_id|intval}_{$product_rule_id|intval}_add')); });
 </script>
\ No newline at end of file