From f94d51181cf19eac89ee05229645a878c0be4b0d Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Fri, 9 Nov 2012 12:56:15 +0000
Subject: [PATCH] //added configuration to enable or disable accented char in
 URL

---
 .../controllers/products/informations.tpl     |  5 +++
 classes/Tools.php                             |  8 +++--
 classes/Validate.php                          | 19 +++++++++--
 controllers/admin/AdminMetaController.php     | 32 +++++++++++--------
 js/admin.js                                   |  6 ++--
 5 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/products/informations.tpl b/admin-dev/themes/default/template/controllers/products/informations.tpl
index d95bcf299..ad9aa9692 100644
--- a/admin-dev/themes/default/template/controllers/products/informations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/informations.tpl
@@ -33,6 +33,11 @@
 	<h4 class="tab">1. {l s='Info.'}</h4>
 	<h4>{l s='Product global information'}</h4>
 	<script type="text/javascript">
+		{if isset($PS_ALLOW_ACCENTED_CHARS_URL) && $PS_ALLOW_ACCENTED_CHARS_URL}
+			var PS_ALLOW_ACCENTED_CHARS_URL = 1;
+		{else}
+			var PS_ALLOW_ACCENTED_CHARS_URL = 0;
+		{/if}
 		{$combinationImagesJs}
 		{if $check_product_association_ajax}
 				var search_term = '';
diff --git a/classes/Tools.php b/classes/Tools.php
index ea657faa4..ed9bae394 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -975,11 +975,15 @@ class ToolsCore
 			$str = mb_strtolower($str, 'utf-8');
 
 		$str = trim($str);
-		if (!function_exists('mb_strtolower'))
+		if (!function_exists('mb_strtolower') || !Configuration::get('PS_ALLOW_ACCENTED_CHARS_URL'))
 			$str = Tools::replaceAccentedChars($str);
 
 		// Remove all non-whitelist chars.
-		$str = preg_replace('/[^a-zA-Z0-9\s\'\:\/\[\]-\pL]/u', '', $str);
+		if (Configuration::get('PS_ALLOW_ACCENTED_CHARS_URL'))
+			$str = preg_replace('/[^a-zA-Z0-9\s\'\:\/\[\]-\pL]/u', '', $str);	
+		else
+			$str = preg_replace('/[^a-zA-Z0-9\s\'\:\/\[\]-]/','', $str);
+		
 		$str = preg_replace('/[\s\'\:\/\[\]-]+/', ' ', $str);
 		$str = str_replace(array(' ', '/'), '-', $str);
 
diff --git a/classes/Validate.php b/classes/Validate.php
index 61e0b403f..43ba66921 100644
--- a/classes/Validate.php
+++ b/classes/Validate.php
@@ -322,9 +322,24 @@ class ValidateCore
 	 */
 	public static function isLinkRewrite($link)
 	{
-		return preg_match('/^[_a-zA-Z0-9\-\pL]+$/u', $link);
+		if (Configuration::get('PS_ALLOW_ACCENTED_CHARS_URL'))
+			return preg_match('/^[_a-zA-Z0-9\-\pL]+$/u', $link);
+		return preg_match('/^[_a-zA-Z0-9\-]+$/', $link);
 	}
-
+	
+	/**
+	 * Check for a route pattern validity
+	 *
+	 * @param string $pattern to validate
+	 * @return boolean Validity is ok or not
+	 */
+	public static function isRoutePattern($pattern)
+	{
+		if (Configuration::get('PS_ALLOW_ACCENTED_CHARS_URL'))
+			return preg_match('/^[_a-zA-Z0-9\(\)\.{}:\/\-\pL]+$/u', $pattern);
+		return preg_match('/^[_a-zA-Z0-9\(\)\.{}:\/\-]+$/', $pattern);
+	}
+	
 	/**
 	 * Check for a postal address validity
 	 *
diff --git a/controllers/admin/AdminMetaController.php b/controllers/admin/AdminMetaController.php
index 44636ffce..c33ac29bd 100644
--- a/controllers/admin/AdminMetaController.php
+++ b/controllers/admin/AdminMetaController.php
@@ -432,20 +432,26 @@ class AdminMetaControllerCore extends AdminController
 			return;
 
 		$rule = Tools::getValue('PS_ROUTE_'.$route_id);
-		if (!$rule || $rule == $default_routes[$route_id]['rule'])
-		{
-			Configuration::updateValue('PS_ROUTE_'.$route_id, '');
-			return;
-		}
-
-		$errors = array();
-		if (!Dispatcher::getInstance()->validateRoute($route_id, $rule, $errors))
-		{
-			foreach ($errors as $error)
-				$this->errors[] = sprintf('Keyword "{%1$s}" required for route "%2$s" (rule: "%3$s")', $error, $route_id, htmlspecialchars($rule));
-		}
+		if (!Validate::isRoutePattern($rule))
+			$this->errors[] = sprintf('The route %s is not valide', htmlspecialchars($rule));
 		else
-			Configuration::updateValue('PS_ROUTE_'.$route_id, $rule);
+		{
+			if (!$rule || $rule == $default_routes[$route_id]['rule'])
+			{
+				Configuration::updateValue('PS_ROUTE_'.$route_id, '');
+				return;
+			}
+	
+			$errors = array();
+			if (!Dispatcher::getInstance()->validateRoute($route_id, $rule, $errors))
+			{
+				foreach ($errors as $error)
+					$this->errors[] = sprintf('Keyword "{%1$s}" required for route "%2$s" (rule: "%3$s")', $error, $route_id, htmlspecialchars($rule));
+			}
+			else
+				Configuration::updateValue('PS_ROUTE_'.$route_id, $rule);
+		}
+		
 	}
 
 	/**
diff --git a/js/admin.js b/js/admin.js
index ca3893428..9a6dd22e5 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -32,8 +32,10 @@ function str2url(str,encoding,ucfirst)
 {
 	str = str.toUpperCase();
 	str = str.toLowerCase();
-
-	str = str.replace(/[^a-z0-9\s\'\:\/\[\]-]\\u00A1-\\uFFFF/g,'');
+	if (PS_ALLOW_ACCENTED_CHARS_URL)
+		str = str.replace(/[^a-z0-9\s\'\:\/\[\]-]\\u00A1-\\uFFFF/g,'');
+	else		
+		str = str.replace(/[^a-z0-9\s\'\:\/\[\]-]/g,'');
 	str = str.replace(/[\u0028\u0029\u0021\u003F\u002E\u0026\u005E\u007E\u002B\u002A\u002F\u003A\u003B\u003C\u003D\u003E]/g,'');
 	str = str.replace(/[\s\'\:\/\[\]-]+/g,' ');