From 9e3b82e8ed23a73fb582ab8c080801c1e9a54235 Mon Sep 17 00:00:00 2001
From: Fabio Chelly <fabio.chelly@prestashop.com>
Date: Fri, 11 Oct 2013 16:37:26 +0200
Subject: [PATCH] [*] BO Module productcomments: JS variables are correctly
 escaped. Padding in error message has also been pushed to theme tpl

---
 .../productcomments/controllers/front/default.php  |  2 +-
 modules/productcomments/productcomments.tpl        | 12 ++++++------
 .../modules/productcomments/productcomments.tpl    | 14 +++++++-------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/productcomments/controllers/front/default.php b/modules/productcomments/controllers/front/default.php
index ccc3d732a..bca7304f5 100644
--- a/modules/productcomments/controllers/front/default.php
+++ b/modules/productcomments/controllers/front/default.php
@@ -92,7 +92,7 @@ class ProductCommentsDefaultModuleFrontController extends ModuleFrontController
 		if (!count($errors))
 		{
 			$customer_comment = ProductComment::getByCustomer(Tools::getValue('id_product'), $id_customer, true, $id_guest);
-			if (!$customer_comment || ($customer_comment && (strtotime($customer_comment['date_add']) + Configuration::get('PRODUCT_COMMENTS_MINIMAL_TIME')) < time()))
+			if (!$customer_comment || ($customer_comment && (strtotime($customer_comment['date_add']) + (int)Configuration::get('PRODUCT_COMMENTS_MINIMAL_TIME')) < time()))
 			{
 
 				$comment = new ProductComment();
diff --git a/modules/productcomments/productcomments.tpl b/modules/productcomments/productcomments.tpl
index 0c5c3aecb..710b6665c 100644
--- a/modules/productcomments/productcomments.tpl
+++ b/modules/productcomments/productcomments.tpl
@@ -24,13 +24,13 @@
 *}
 <script type="text/javascript">
 var productcomments_controller_url = '{$productcomments_controller_url}';
-var confirm_report_message = "{l s='Are you sure you want report this comment?' mod='productcomments'}";
-var secure_key = "{$secure_key}";
+var confirm_report_message = '{l s='Are you sure you want report this comment?' mod='productcomments' js=1}';
+var secure_key = '{$secure_key}';
 var productcomments_url_rewrite = '{$productcomments_url_rewriting_activated}';
-var productcomment_added = '{l s='Your comment has been added!' mod='productcomments'}';
-var productcomment_added_moderation = '{l s='Your comment has been added and will be available once approved by a moderator' mod='productcomments'}';
-var productcomment_title = '{l s='New comment' mod='productcomments'}';
-var productcomment_ok = '{l s='OK' mod='productcomments'}';
+var productcomment_added = '{l s='Your comment has been added!' mod='productcomments' js=1}';
+var productcomment_added_moderation = '{l s='Your comment has been added and will be available once approved by a moderator' mod='productcomments' js=1}';
+var productcomment_title = '{l s='New comment' mod='productcomments' js=1}';
+var productcomment_ok = '{l s='OK' mod='productcomments' js=1}';
 var moderation_active = {$moderation_active};
 </script>
 
diff --git a/themes/default/modules/productcomments/productcomments.tpl b/themes/default/modules/productcomments/productcomments.tpl
index bbd737670..493a4317d 100644
--- a/themes/default/modules/productcomments/productcomments.tpl
+++ b/themes/default/modules/productcomments/productcomments.tpl
@@ -24,13 +24,13 @@
 *}
 <script type="text/javascript">
 var productcomments_controller_url = '{$productcomments_controller_url}';
-var confirm_report_message = "{l s='Are you sure you want report this comment?' mod='productcomments'}";
-var secure_key = "{$secure_key}";
+var confirm_report_message = '{l s='Are you sure you want report this comment?' mod='productcomments' js=1}';
+var secure_key = '{$secure_key}';
 var productcomments_url_rewrite = '{$productcomments_url_rewriting_activated}';
-var productcomment_added = '{l s='Your comment has been added!' mod='productcomments'}';
-var productcomment_added_moderation = '{l s='Your comment has been added and will be available once approved by a moderator' mod='productcomments'}';
-var productcomment_title = '{l s='New comment' mod='productcomments'}';
-var productcomment_ok = '{l s='OK' mod='productcomments'}';
+var productcomment_added = '{l s='Your comment has been added!' mod='productcomments' js=1}';
+var productcomment_added_moderation = '{l s='Your comment has been added and will be available once approved by a moderator' mod='productcomments' js=1}';
+var productcomment_title = '{l s='New comment' mod='productcomments' js=1}';
+var productcomment_ok = '{l s='OK' mod='productcomments' js=1}';
 var moderation_active = {$moderation_active};
 </script>
 
@@ -109,7 +109,7 @@ var moderation_active = {$moderation_active};
 			<div class="new_comment_form_content">
 				<h2>{l s='Write your review' mod='productcomments'}</h2>
 
-				<div id="new_comment_form_error" class="error" style="display: none;">
+				<div id="new_comment_form_error" class="error" style="display: none; padding: 15px 25px">
 					<ul></ul>
 				</div>