[+] Dispatcher

2011-06-15 16:32:06 +00:00
parent 5f0fb35a1d
commit 1bb4a61a42
140 changed files with 936 additions and 534 deletions
--- a/address.php
+++ b/address.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,4 +26,15 @@
 */

 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('AddressController')->run();
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/address'.$params);
+
--- a/addresses.php
+++ b/addresses.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,4 +26,15 @@
 */

 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('AddressesController')->run();
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/addresses'.$params);
+
--- a/authentication.php
+++ b/authentication.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,4 +26,15 @@
 */

 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('AuthController')->run();
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/authentication'.$params);
+
--- a/best-sales.php
+++ b/best-sales.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -25,5 +25,16 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */

-require_once(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('BestSalesController')->run();
+require(dirname(__FILE__).'/config/config.inc.php');
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/best-sales'.$params);
+
--- a/cart.php
+++ b/cart.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -25,5 +25,16 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */

-require_once(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('CartController')->run();
+require(dirname(__FILE__).'/config/config.inc.php');
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/cart'.$params);
+
--- a/category.php
+++ b/category.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -25,5 +25,16 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */

-include(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('CategoryController')->run();
+require(dirname(__FILE__).'/config/config.inc.php');
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/category'.$params);
+
--- a/classes/FrontController.php
+++ b/classes/FrontController.php
@@ -92,7 +92,7 @@ class FrontControllerCore
 		$link = new Link();

 		if ($this->auth AND !$cookie->isLogged($this->guestAllowed))
-			Tools::redirect('authentication.php'.($this->authRedirection ? '?back='.$this->authRedirection : ''));
+			Tools::redirect('index.php/authentication'.($this->authRedirection ? '?back='.$this->authRedirection : ''));

 		/* Theme is missing or maintenance */
 		if (!is_dir(_PS_THEME_DIR_))
--- a/classes/Link.php
+++ b/classes/Link.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -43,17 +43,17 @@ class LinkCore

 	/**
 	 * This function returns a link to delete a customization picture file
-	 * 
-	 * @param mixed $product 
-	 * @param mixed $id_picture 
+	 *
+	 * @param mixed $product
+	 * @param mixed $id_picture
 	 * @return void
 	 */
 	public function getProductDeletePictureLink($product, $id_picture){
 		if (is_object($product))
 			return ($this->allow == 1)?(_PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink().((isset($product->category) AND !empty($product->category) AND $product->category != 'home') ? $product->category.'/' : '').(int)$product->id.'-'.$product->link_rewrite.($product->ean13 ? '-'.$product->ean13 : '').'.html?deletePicture='.$id_picture) :
-			(_PS_BASE_URL_.__PS_BASE_URI__.'product.php?id_product='.(int)$product->id).'&amp;deletePicture='.$id_picture;
+			(_PS_BASE_URL_.__PS_BASE_URI__.'index.php?controller=product&id_product='.(int)$product->id).'&amp;deletePicture='.$id_picture;
 		else
-			return _PS_BASE_URL_.__PS_BASE_URI__.'product.php?id_product='.(int)$product.'&amp;deletePicture='.$id_picture;
+			return _PS_BASE_URL_.__PS_BASE_URI__.'index.php?controller=product&id_product='.(int)$product.'&amp;deletePicture='.$id_picture;
 	}

 	/**
@@ -67,73 +67,73 @@ class LinkCore
 	{
 		if (is_object($id_product))
 			return ($this->allow == 1)?(_PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink((int)$id_lang).((isset($id_product->category) AND !empty($id_product->category) AND $id_product->category != 'home') ? $id_product->category.'/' : '').(int)$id_product->id.'-'.$id_product->link_rewrite.($id_product->ean13 ? '-'.$id_product->ean13 : '').'.html') :
-			(_PS_BASE_URL_.__PS_BASE_URI__.'product.php?id_product='.(int)$id_product->id);
+			(_PS_BASE_URL_.__PS_BASE_URI__.'index.php?controller=product&id_product='.(int)$id_product->id);
 		elseif ($alias)
 			return ($this->allow == 1)?(_PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink((int)$id_lang).(($category AND $category != 'home') ? ($category.'/') : '').(int)$id_product.'-'.$alias.($ean13 ? '-'.$ean13 : '').'.html') :
-			(_PS_BASE_URL_.__PS_BASE_URI__.'product.php?id_product='.(int)$id_product);
+			(_PS_BASE_URL_.__PS_BASE_URI__.'index.php?controller=product&id_product='.(int)$id_product);
 		else
-			return _PS_BASE_URL_.__PS_BASE_URI__.'product.php?id_product='.(int)$id_product;
+			return _PS_BASE_URL_.__PS_BASE_URI__.'index.php?controller=product&id_product='.(int)$id_product;
 	}

 	public function getCategoryLink($id_category, $alias = NULL, $id_lang = NULL)
 	{
 		if (is_object($id_category))
 			return ($this->allow == 1) ? (_PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink((int)($id_lang)).(int)($id_category->id).'-'.$id_category->link_rewrite) :
-			(_PS_BASE_URL_.__PS_BASE_URI__.'category.php?id_category='.(int)($id_category->id));
+			(_PS_BASE_URL_.__PS_BASE_URI__.'index.php?controller=category&id_category='.(int)($id_category->id));
 		if ($alias)
 			return ($this->allow == 1) ? (_PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink((int)($id_lang)).(int)($id_category).'-'.$alias) :
-			(_PS_BASE_URL_.__PS_BASE_URI__.'category.php?id_category='.(int)($id_category));
-		return _PS_BASE_URL_.__PS_BASE_URI__.'category.php?id_category='.(int)($id_category);
+			(_PS_BASE_URL_.__PS_BASE_URI__.'index.php?controller=category&id_category='.(int)($id_category));
+		return _PS_BASE_URL_.__PS_BASE_URI__.'index.php?controller=category&id_category='.(int)($id_category);
 	}

 	public function getCMSCategoryLink($id_category, $alias = NULL, $id_lang = NULL)
 	{
 		if (is_object($id_category))
 			return ($this->allow == 1) ? (_PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink((int)($id_lang)).'content/category/'.(int)($id_category->id).'-'.$id_category->link_rewrite) :
-			(_PS_BASE_URL_.__PS_BASE_URI__.'cms.php?id_cms_category='.(int)($id_category->id));
+			(_PS_BASE_URL_.__PS_BASE_URI__.'index.php?controller=cms&id_cms_category='.(int)($id_category->id));
 		if ($alias)
 			return ($this->allow == 1) ? (_PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink((int)($id_lang)).'content/category/'.(int)($id_category).'-'.$alias) :
-			(_PS_BASE_URL_.__PS_BASE_URI__.'cms.php?id_cms_category='.(int)($id_category));
-		return _PS_BASE_URL_.__PS_BASE_URI__.'cms.php?id_cms_category='.(int)($id_category);
+			(_PS_BASE_URL_.__PS_BASE_URI__.'index.php?controller=cms&id_cms_category='.(int)($id_category));
+		return _PS_BASE_URL_.__PS_BASE_URI__.'index.php?controller=cms&id_cms_category='.(int)($id_category);
 	}

 	public function getCMSLink($cms, $alias = null, $ssl = false, $id_lang = NULL)
 	{
 		$base = (($ssl AND Configuration::get('PS_SSL_ENABLED')) ? Tools::getShopDomainSsl(true) : Tools::getShopDomain(true));
-	
+
 		if (is_object($cms))
 		{
-			return ($this->allow == 1) ? 
+			return ($this->allow == 1) ?
 				($base.__PS_BASE_URI__.$this->getLangLink((int)($id_lang)).'content/'.(int)($cms->id).'-'.$cms->link_rewrite) :
-				($base.__PS_BASE_URI__.'cms.php?id_cms='.(int)($cms->id));
+				($base.__PS_BASE_URI__.'index.php?controller=cms&id_cms='.(int)($cms->id));
 		}
-		
+
 		if ($alias)
 			return ($this->allow == 1) ? ($base.__PS_BASE_URI__.$this->getLangLink((int)($id_lang)).'content/'.(int)($cms).'-'.$alias) :
-			($base.__PS_BASE_URI__.'cms.php?id_cms='.(int)($cms));
-		return $base.__PS_BASE_URI__.'cms.php?id_cms='.(int)($cms);
+			($base.__PS_BASE_URI__.'index.php?controller=cms&id_cms='.(int)($cms));
+		return $base.__PS_BASE_URI__.'index.php?controller=cms&id_cms='.(int)($cms);
 	}

 	public function getSupplierLink($id_supplier, $alias = NULL, $id_lang = NULL)
 	{
 		if (is_object($id_supplier))
 			return ($this->allow == 1) ? (_PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink((int)($id_lang)).(int)($id_supplier->id).'__'.$id_supplier->link_rewrite) :
-			(_PS_BASE_URL_.__PS_BASE_URI__.'supplier.php?id_supplier='.(int)($id_supplier->id));
+			(_PS_BASE_URL_.__PS_BASE_URI__.'index.php?controller=supplier&id_supplier='.(int)($id_supplier->id));
 		if ($alias)
 			return ($this->allow == 1) ? (_PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink((int)($id_lang)).(int)($id_supplier).'__'.$alias) :
-			(_PS_BASE_URL_.__PS_BASE_URI__.'supplier.php?id_supplier='.(int)($id_supplier));
-		return _PS_BASE_URL_.__PS_BASE_URI__.'supplier.php?id_supplier='.(int)($id_supplier);
+			(_PS_BASE_URL_.__PS_BASE_URI__.'index.php?controller=supplier&id_supplier='.(int)($id_supplier));
+		return _PS_BASE_URL_.__PS_BASE_URI__.'index.php?controller=supplier&id_supplier='.(int)($id_supplier);
 	}

 	public function getManufacturerLink($id_manufacturer, $alias = NULL, $id_lang = NULL)
 	{
 		if (is_object($id_manufacturer))
 			return ($this->allow == 1) ? (_PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink((int)($id_lang)).(int)($id_manufacturer->id).'_'.$id_manufacturer->link_rewrite) :
-			(_PS_BASE_URL_.__PS_BASE_URI__.'manufacturer.php?id_manufacturer='.(int)($id_manufacturer->id));
+			(_PS_BASE_URL_.__PS_BASE_URI__.'index.php?controller=manufacturer&id_manufacturer='.(int)($id_manufacturer->id));
 		if ($alias)
 			return ($this->allow == 1) ? (_PS_BASE_URL_.__PS_BASE_URI__.$this->getLangLink((int)($id_lang)).(int)($id_manufacturer).'_'.$alias) :
-			(_PS_BASE_URL_.__PS_BASE_URI__.'manufacturer.php?id_manufacturer='.(int)($id_manufacturer));
-		return _PS_BASE_URL_.__PS_BASE_URI__.'manufacturer.php?id_manufacturer='.(int)($id_manufacturer);
+			(_PS_BASE_URL_.__PS_BASE_URI__.'index.php?controller=manufacturer&id_manufacturer='.(int)($id_manufacturer));
+		return _PS_BASE_URL_.__PS_BASE_URI__.'index.php?controller=manufacturer&id_manufacturer='.(int)($id_manufacturer);
 	}

 	public function getImageLink($name, $ids, $type = NULL)
@@ -145,7 +145,7 @@ class LinkCore
 			$uri_path = _THEME_PROD_DIR_.$ids.($type ? '-'.$type : '').'.jpg';
 		return $protocol_content.Tools::getMediaServer($uri_path).$uri_path;
 	}
-	
+
 	public function getMediaLink($filepath)
 	{
 		return Tools::getProtocol().Tools::getMediaServer($filepath).$filepath;
@@ -165,7 +165,7 @@ class LinkCore
 		foreach ($result as $row)
 			self::$cache['page'][$row['page'].'.php_'.$cookie->id_lang] = $this->getLangLink((int)$cookie->id_lang).$row['url_rewrite'];
 	}
-	
+
 	public function getPageLink($filename, $ssl = false, $id_lang = NULL)
 	{
 		global $cookie;
@@ -196,7 +196,7 @@ class LinkCore
 			{
 				$uri_path = '';
 				if ($filename != 'index.php')
-					$uri_path = $filename;
+					$uri_path = 'index.php?controller='.$filename;
 			}
 			self::$cache['page'][$filename.'_'.$id_lang] = $uri_path;
 		}
@@ -232,7 +232,7 @@ class LinkCore
 		parse_str($_SERVER['QUERY_STRING'], $queryTab);
 		unset($queryTab['isolang']);
 		$query = http_build_query($queryTab);
-		
+
 		if (!empty($query) OR !$this->allow)
 			$query = '?'.$query;

@@ -292,16 +292,17 @@ class LinkCore
 	{
 		return $url.(!strstr($url, '?') ? '?' : '&').'orderby='.urlencode($orderby).'&orderway='.urlencode($orderway);
 	}
-	
+
 	protected function getLangLink($id_lang = NULL)
 	{
 		if (!$this->allow OR Language::countActiveLanguages() <= 1)
 			return '';
-			
+
 		global $cookie;
 		if (!$id_lang)
 			$id_lang = (int)$cookie->id_lang;
-		
+
 		return Language::getIsoById((int)$id_lang).'/';
 	}
 }
+
--- a/classes/Order.php
+++ b/classes/Order.php
@@ -398,47 +398,68 @@ class OrderCore extends ObjectModel
 		return $result['message'];
 	}

+
+	/**
+	 * Add breakdown prices in an order detail row
+	 *
+	 * @param array &$row
+	 */
 	public function setProductPrices(&$row)
 	{
 		if ($this->_taxCalculationMethod == PS_TAX_EXC)
-			$row['product_price'] = Tools::ps_round($row['product_price'], 2);
+			$row = $this->setProductPricesTaxExcl($row);
 		else
-			$row['product_price_wt'] = Tools::ps_round($row['product_price'] * (1 + $row['tax_rate'] / 100), 2);
+			$row = $this->setProductPricesTaxIncl($row);
+	}
+
+
+	/**
+	 * Compute tax excl prices for an order detail
+	 *
+	 * @param array $row
+	 */
+	protected function getProductsPricesTaxExcl($row)
+	{
+		$row['product_price'] = Tools::ps_round($row['product_price'], 2);

 		if ($row['reduction_percent'])
-		{
-			if ($this->_taxCalculationMethod == PS_TAX_EXC)
 				$row['product_price'] = $row['product_price'] - $row['product_price'] * ($row['reduction_percent'] * 0.01);
-			else
-				$row['product_price_wt'] = Tools::ps_round($row['product_price_wt'] - $row['product_price_wt'] * ($row['reduction_percent'] * 0.01), 2);
-		}

 		if ($row['reduction_amount'])
-		{
-			if ($this->_taxCalculationMethod == PS_TAX_EXC)
 				$row['product_price'] = $row['product_price'] - $row['reduction_amount'] / (1 + $row['tax_rate'] / 100);
-			else
-				$row['product_price_wt'] = Tools::ps_round($row['product_price_wt'] - $row['reduction_amount'], 2);
-		}

 		if ($row['group_reduction'])
-		{
-			if ($this->_taxCalculationMethod == PS_TAX_EXC)
 				$row['product_price'] = $row['product_price'] - $row['product_price'] * ($row['group_reduction'] * 0.01);
-			else
+
+		$row['product_price'] = Tools::ps_round($row['product_price'], 2); // rounding in case of reduction
+
+		$row['product_price_wt'] = Tools::ps_round($row['product_price'] * (1 + ($row['tax_rate'] * 0.01)), 2) + Tools::ps_round($row['ecotax'] * (1 + $row['ecotax_tax_rate'] / 100), 2);
+
+		$row['total_wt'] = $row['product_quantity'] * $row['product_price_wt'];
+		$row['total_price'] = $row['product_quantity'] * $row['product_price'];
+	}
+
+
+	/**
+	 * Compute tax incl prices for an order detail
+	 *
+	 * @param array $row
+	 */
+	protected function getProductsPricesTaxIncl($row)
+	{
+		$row['product_price_wt'] = Tools::ps_round($row['product_price'] * (1 + $row['tax_rate'] / 100), 2);
+
+		if ($row['reduction_percent'])
+				$row['product_price_wt'] = Tools::ps_round($row['product_price_wt'] - $row['product_price_wt'] * ($row['reduction_percent'] * 0.01), 2);
+
+		if ($row['reduction_amount'])
+				$row['product_price_wt'] = Tools::ps_round($row['product_price_wt'] - $row['reduction_amount'], 2);
+
+		if ($row['group_reduction'])
 				$row['product_price_wt'] = Tools::ps_round($row['product_price_wt'] - $row['product_price_wt'] * ($row['group_reduction'] * 0.01), 2);
-		}

-		if (($row['reduction_percent'] OR $row['reduction_amount'] OR $row['group_reduction']) AND $this->_taxCalculationMethod == PS_TAX_EXC)
-			$row['product_price'] = Tools::ps_round($row['product_price'], 2);
-
-		if ($this->_taxCalculationMethod == PS_TAX_EXC)
-			$row['product_price_wt'] = Tools::ps_round($row['product_price'] * (1 + ($row['tax_rate'] * 0.01)), 2) + Tools::ps_round($row['ecotax'] * (1 + $row['ecotax_tax_rate'] / 100), 2);
-		else
-		{
-			$row['product_price_wt_but_ecotax'] = $row['product_price_wt'];
-			$row['product_price_wt'] = Tools::ps_round($row['product_price_wt'] + $row['ecotax'] * (1 + $row['ecotax_tax_rate'] / 100), 2);
-		}
+		$row['product_price_wt_but_ecotax'] = $row['product_price_wt'];
+		$row['product_price_wt'] = Tools::ps_round($row['product_price_wt'] + $row['ecotax'] * (1 + $row['ecotax_tax_rate'] / 100), 2);

 		$row['total_wt'] = $row['product_quantity'] * $row['product_price_wt'];
 		$row['total_price'] = $row['product_quantity'] * $row['product_price'];
@@ -980,3 +1001,4 @@ class OrderCore extends ObjectModel
 				WHERE `id_order` = '.(int)($this->id)) !== false);
 	}
 }
+
--- a/classes/SubDomain.php
+++ b/classes/SubDomain.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -47,10 +47,11 @@ class SubDomainCore extends ObjectModel
 	{
 		if (!$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT `name` FROM `'._DB_PREFIX_.'subdomain`'))
 			return false;
-		$subDomains = array();
+
+		$sub_domains = array();
 		foreach ($result AS $row)
-			$subDomains[] = $row['name'];
-		return $subDomains;
+			$sub_domains[] = $row['name'];
+		return $sub_domains;
 	}
 }

--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -58,6 +58,9 @@ class ToolsCore
 			global $link;
 			if (strpos($url, $baseUri) !== FALSE && strpos($url, $baseUri) == 0)
 				$url = substr($url, strlen($baseUri));
+			if (strpos($url, 'index.php/') !== FALSE && strpos($url, 'index.php/') == 0)
+				$url = substr($url, strlen('index.php/'));
+
 			$explode = explode('?', $url);
 			$url = $link->getPageLink($explode[0], true);
 			if (isset($explode[1]))
@@ -84,6 +87,8 @@ class ToolsCore
 			global $link;
 			if (strpos($url, __PS_BASE_URI__) !== FALSE && strpos($url, __PS_BASE_URI__) == 0)
 				$url = substr($url, strlen(__PS_BASE_URI__));
+			if (strpos($url, 'index.php/') !== FALSE && strpos($url, 'index.php/') == 0)
+				$url = substr($url, strlen('index.php/'));
 			$explode = explode('?', $url);
 			$url = $link->getPageLink($explode[0]);
 			if (isset($explode[1]))
@@ -1302,7 +1307,7 @@ class ToolsCore
 				Tools::addCSS($file, $media_type);
 			return true;
 		}
-		
+
 		//overriding of modules css files
 		$different = 0;
 		$override_path = str_replace(__PS_BASE_URI__.'modules/', _PS_ROOT_DIR_.'/themes/'._THEME_NAME_.'/css/modules/', $css_uri, $different);
@@ -1411,7 +1416,7 @@ class ToolsCore
 		}
 	}

-	
+
 	/**
 	* Combine Compress and Cache (ccc) JS calls
 	*/
@@ -1429,17 +1434,17 @@ class ToolsCore
 		foreach ($js_files as $filename)
 		{
 			$expr = explode(':', $filename);
-			
+
 			if ($expr[0] == 'http')
-				$js_external_files[] = $filename;	
-			else 
+				$js_external_files[] = $filename;
+			else
 			{
 				$infos = array();
 				$infos['uri'] = $filename;
 				$url_data = parse_url($filename);
 				$infos['path'] =_PS_ROOT_DIR_.Tools::str_replace_once(__PS_BASE_URI__, '/', $url_data['path']);
 				$js_files_infos[] = $infos;
-	
+
 				$js_files_date = max(
 					file_exists($infos['path']) ? filemtime($infos['path']) : 0,
 					$js_files_date
@@ -1479,7 +1484,7 @@ class ToolsCore
 		// rebuild the original js_files array
 		$url = str_replace(_PS_ROOT_DIR_.'/', __PS_BASE_URI__, $compressed_js_path);
 		$js_files = array_merge(array($protocol_link.Tools::getMediaServer($url).$url), $js_external_files);
-		
+
 	}

 	public static function getMediaServer($filename)
@@ -1711,31 +1716,43 @@ FileETag INode MTime Size
 	 */
 	public static function displayAsDeprecated()
 	{
-		if (_PS_DISPLAY_COMPATIBILITY_WARNING_)
-		{
-			$backtrace = debug_backtrace();
-			$callee = next($backtrace);
-			trigger_error('Function <strong>'.$callee['function'].'()</strong> is deprecated in <strong>'.$callee['file'].'</strong> on line <strong>'.$callee['line'].'</strong><br />', E_USER_WARNING);
+		$backtrace = debug_backtrace();
+		$callee = next($backtrace);
+		$error = 'Function <strong>'.$callee['function'].'()</strong> is deprecated in <strong>'.$callee['file'].'</strong> on line <strong>'.$callee['line'].'</strong><br />';
+		$message = Tools::displayError('The function').' '.$callee['function'].' ('.Tools::displayError('Line').' '.$callee['line'].') '.Tools::displayError('is deprecated and will be removed in the next major version.');

-			$message = Tools::displayError('The function').' '.$callee['function'].' ('.Tools::displayError('Line').' '.$callee['line'].') '.Tools::displayError('is deprecated and will be removed in the next major version.');
-
-			Logger::addLog($message, 3, $callee['class']);
-		}
+		self::throwDeprecated($error, $message, $callee['class']);
 	}

 	/**
 	 * Display a warning message indicating that the parameter is deprecated
 	 */
 	public static function displayParameterAsDeprecated($parameter)
+	{
+		$backtrace = debug_backtrace();
+		$callee = next($backtrace);
+		$error = 'Parameter <strong>'.$parameter.'</strong> in function <strong>'.$callee['function'].'()</strong> is deprecated in <strong>'.$callee['file'].'</strong> on line <strong>'.$callee['Line'].'</strong><br />';
+		$message = Tools::displayError('The parameter').' '.$parameter.' '.Tools::displayError(' in function ').' '.$callee['function'].' ('.Tools::displayError('Line').' '.$callee['Line'].') '.Tools::displayError('is deprecated and will be removed in the next major version.');
+
+		self::throwDeprecated($error, $message, $callee['class']);
+	}
+
+	public static function displayFileAsDeprecated()
+	{
+		$backtrace = debug_backtrace();
+		$callee = current($backtrace);
+		$error = 'File <strong>'.$callee['file'].'</strong> is deprecated<br />';
+		$message = Tools::displayError('The file').' '.$callee['file'].' '.Tools::displayError('is deprecated and will be removed in the next major version.');
+
+		self::throwDeprecated($error, $message, $callee['class']);
+	}
+
+	protected static function throwDeprecated($error, $message, $class)
 	{
 		if (_PS_DISPLAY_COMPATIBILITY_WARNING_)
 		{
-			$backtrace = debug_backtrace();
-			$callee = next($backtrace);
-			trigger_error('Parameter <strong>'.$parameter.'</strong> in function <strong>'.$callee['function'].'()</strong> is deprecated in <strong>'.$callee['file'].'</strong> on line <strong>'.$callee['Line'].'</strong><br />', E_USER_WARNING);
-
-			$message = Tools::displayError('The parameter').' '.$parameter.' '.Tools::displayError(' in function ').' '.$callee['function'].' ('.Tools::displayError('Line').' '.$callee['Line'].') '.Tools::displayError('is deprecated and will be removed in the next major version.');
-			Logger::addLog($message, 3, $callee['class']);
+			trigger_error($error, E_USER_WARNING);
+			Logger::addLog($message, 3, $class);
 		}
 	}

@@ -1776,7 +1793,7 @@ FileETag INode MTime Size
 			$s = str_replace($char, '\\'.$char, $s);
 		return $s;
 	}
-	
+
 	public static function str_replace_once($needle , $replace , $haystack)
 	{
 		$pos = strpos($haystack, $needle);
--- a/cms.php
+++ b/cms.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,4 +26,15 @@
 */

 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('CMSController')->run();
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/cms'.$params);
+
--- a/contact-form.php
+++ b/contact-form.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,4 +26,15 @@
 */

 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('ContactController')->run();
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/contact-form'.$params);
+
--- a/controllers/AddressController.php
+++ b/controllers/AddressController.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -38,19 +38,19 @@ class AddressControllerCore extends FrontController
 		$this->php_self = 'address.php';
 		$this->authRedirection = 'addresses.php';
 		$this->ssl = true;
-	
+
 		parent::__construct();
 	}
-	
+
 	public function preProcess()
 	{
 		parent::preProcess();
-		
+
 		if ($back = Tools::getValue('back'))
 			self::$smarty->assign('back', Tools::safeOutput($back));
 		if ($mod = Tools::getValue('mod'))
 			self::$smarty->assign('mod', Tools::safeOutput($mod));
-		
+
 		if (Tools::isSubmit('ajax') AND Tools::isSubmit('type'))
 		{
 			if (Tools::getValue('type') == 'delivery')
@@ -62,7 +62,7 @@ class AddressControllerCore extends FrontController
 		}
 		else
 			$id_address = (int)Tools::getValue('id_address', 0);
-		
+
 		if ($id_address)
 		{
 			$this->_address = new Address((int)$id_address);
@@ -75,7 +75,7 @@ class AddressControllerCore extends FrontController
 					if (self::$cart->id_address_delivery == $this->_address->id)
 						unset(self::$cart->id_address_delivery);
 					if ($this->_address->delete())
-						Tools::redirect('addresses.php');
+						Tools::redirect('index.php?controller=addresses');
 					$this->errors[] = Tools::displayError('This address cannot be deleted.');
 				}
 				self::$smarty->assign(array('address' => $this->_address, 'id_address' => (int)$id_address));
@@ -83,7 +83,7 @@ class AddressControllerCore extends FrontController
 			elseif (Tools::isSubmit('ajax'))
 				exit;
 			else
-				Tools::redirect('addresses.php');
+				Tools::redirect('index.php?controller=addresses');
 		}
 		if (Tools::isSubmit('submitAddress'))
 		{
@@ -135,7 +135,7 @@ class AddressControllerCore extends FrontController

 			if ((int)($country->contains_states) AND !(int)($address->id_state))
 				$this->errors[] = Tools::displayError('This country requires a state selection.');
-			
+
 			if (!sizeof($this->errors))
 			{
 				if (isset($id_address))
@@ -153,7 +153,7 @@ class AddressControllerCore extends FrontController
 							if (self::$cart->id_address_delivery == $address_old->id)
 								unset(self::$cart->id_address_delivery);
 						}
-						
+
 						if ($address_old->isUsed())
 							$address_old->delete();
 						else
@@ -164,8 +164,8 @@ class AddressControllerCore extends FrontController
 					}
 				}
 				elseif (self::$cookie->is_guest)
-					Tools::redirect('addresses.php');
-				
+					Tools::redirect('index.php?controller=addresses');
+
 				if ($result = $address->save())
 				{
 					if ((bool)(Tools::getValue('select_address', false)) == true OR (Tools::isSubmit('ajax') AND Tools::getValue('type') == 'invoice'))
@@ -177,7 +177,7 @@ class AddressControllerCore extends FrontController
 					if (Tools::isSubmit('ajax'))
 					{
 						$return = array(
-							'hasError' => !empty($this->errors), 
+							'hasError' => !empty($this->errors),
 							'errors' => $this->errors,
 							'id_address_delivery' => self::$cart->id_address_delivery,
 							'id_address_invoice' => self::$cart->id_address_invoice
@@ -201,26 +201,26 @@ class AddressControllerCore extends FrontController
 		if (Tools::isSubmit('ajax') AND sizeof($this->errors))
 		{
 			$return = array(
-				'hasError' => !empty($this->errors), 
+				'hasError' => !empty($this->errors),
 				'errors' => $this->errors
 			);
 			die(Tools::jsonEncode($return));
 		}
 	}
-	
+
 	public function setMedia()
 	{
 		parent::setMedia();
 		Tools::addJS(_THEME_JS_DIR_.'tools/statesManagement.js');
 	}
-	
+
 	public function process()
 	{
 		parent::process();

 		/* Secure restriction for guest */
 		if (self::$cookie->is_guest)
-			Tools::redirect('addresses.php');
+			Tools::redirect('index.php?controller=addresses');

 		if (Tools::isSubmit('id_country') AND Tools::getValue('id_country') != NULL AND is_numeric(Tools::getValue('id_country')))
 			$selectedCountry = (int)Tools::getValue('id_country');
@@ -234,7 +234,7 @@ class AddressControllerCore extends FrontController
 		}
 		else
 			$selectedCountry = (int)Configuration::get('PS_COUNTRY_DEFAULT');
-			
+
 		$countries = Country::getCountries((int)self::$cookie->id_lang, true);
 		$countriesList = '';
 		foreach ($countries AS $country)
@@ -257,21 +257,12 @@ class AddressControllerCore extends FrontController
 		));
 	}

-	protected function _processAddressFormat()
-	{
-
-		$id_country = is_null($this->_address)? 0 : (int)$this->_address->id_country;
-
-		$dlv_adr_fields = AddressFormat::getOrderedAddressFields($id_country, $split_all = true);
-		self::$smarty->assign('ordered_adr_fields', $dlv_adr_fields);
-	}
-	
 	public function displayHeader()
 	{
 		if (Tools::getValue('ajax') != 'true')
 			parent::displayHeader();
 	}
-	
+
 	public function displayContent()
 	{
 		parent::displayContent();
@@ -279,7 +270,7 @@ class AddressControllerCore extends FrontController
 		$this->_processAddressFormat();
 		self::$smarty->display(_PS_THEME_DIR_.'address.tpl');
 	}
-	
+
 	public function displayFooter()
 	{
 		if (Tools::getValue('ajax') != 'true')
--- a/controllers/AuthController.php
+++ b/controllers/AuthController.php
@@ -40,7 +40,7 @@ class AuthControllerCore extends FrontController
 		parent::preProcess();

 		if (self::$cookie->isLogged() AND !Tools::isSubmit('ajax'))
-			Tools::redirect('my-account.php');
+			Tools::redirect('index.php?controller=my-account');

 		if (Tools::getValue('create_account'))
 		{
@@ -203,7 +203,7 @@ class AuthControllerCore extends FrontController
 								}
 								if ($back = Tools::getValue('back'))
 									Tools::redirect($back);
-								Tools::redirect('my-account.php');
+								Tools::redirect('index.php?controller=my-account');
 							}
 						}
 					}
@@ -272,7 +272,7 @@ class AuthControllerCore extends FrontController
 					{
 						if ($back = Tools::getValue('back'))
 							Tools::redirect($back);
-						Tools::redirect('my-account.php');
+						Tools::redirect('index.php?controller=my-account');
 					}
 				}
 			}
--- a/controllers/CMSController.php
+++ b/controllers/CMSController.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -30,14 +30,14 @@ class CmsControllerCore extends FrontController
 	public $assignCase;
 	public $cms;
 	public $cms_category;
-	
+
 	public function preProcess()
 	{
 		if ($id_cms = (int)Tools::getValue('id_cms'))
-		    $this->cms = new CMS($id_cms, self::$cookie->id_lang); 
+		    $this->cms = new CMS($id_cms, self::$cookie->id_lang);
 		elseif ($id_cms_category = (int)Tools::getValue('id_cms_category'))
-		    $this->cms_category = new CMSCategory($id_cms_category, self::$cookie->id_lang); 
-			
+		    $this->cms_category = new CMSCategory($id_cms_category, self::$cookie->id_lang);
+
 		// Automatically redirect to the canonical URL if the current in is the right one
 		// $_SERVER['HTTP_HOST'] must be replaced by the real canonical domain
 		if ($this->cms AND $canonicalURL = self::$link->getCMSLink($this->cms))
@@ -56,17 +56,17 @@ class CmsControllerCore extends FrontController
 					die('[Debug] This page has moved<br />Please use the following URL instead: <a href="'.$canonicalURL.'">'.$canonicalURL.'</a>');
 				Tools::redirectLink($canonicalURL);
 			}
-		
+
 		parent::preProcess();
-		
+
 		/* assignCase (1 = CMS page, 2 = CMS category) */
 		if (Validate::isLoadedObject($this->cms) AND ($this->cms->active OR (Tools::getValue('adtoken') == Tools::encrypt('PreviewCMS'.$this->cms->id) AND file_exists(dirname(__FILE__).'/../'.Tools::getValue('ad').'/ajax.php'))))
 			$this->assignCase = 1;
 		elseif (Validate::isLoadedObject($this->cms_category))
 			$this->assignCase = 2;
 		else
-			Tools::redirect('404.php');
-		
+			Tools::redirect('index.php?controller=404');
+
 		if((int)(Configuration::get('PS_REWRITING_SETTINGS')))
 		{
    	    $rewrite_infos = (isset($id_cms) AND !isset($id_cms_category)) ? CMS::getUrlRewriteInformations($id_cms) : CMSCategory::getUrlRewriteInformations($id_cms_category);
@@ -81,17 +81,17 @@ class CmsControllerCore extends FrontController
 		    self::$smarty->assign('lang_rewrite_urls', $default_rewrite);
 		}
 	}
-	
+
 	public function setMedia()
 	{
 		parent::setMedia();
-		
+
 		if ($this->assignCase == 1)
 			Tools::addJS(_THEME_JS_DIR_.'cms.js');
-		
+
 		Tools::addCSS(_THEME_CSS_DIR_.'cms.css');
 	}
-	
+
 	public function process()
 	{
 		parent::process();
@@ -117,10 +117,11 @@ class CmsControllerCore extends FrontController
 			));
 		}
 	}
-	
+
 	public function displayContent()
 	{
 		parent::displayContent();
 		self::$smarty->display(_PS_THEME_DIR_.'cms.tpl');
 	}
 }
+
--- a/controllers/CartController.php
+++ b/controllers/CartController.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -70,7 +70,7 @@ class CartControllerCore extends FrontController

 	public function includeCartModule()
 	{
-		require_once(_PS_MODULE_DIR_.'/blockcart/blockcart-ajax.php'); 
+		require_once(_PS_MODULE_DIR_.'/blockcart/blockcart-ajax.php');
 	}

 	public function preProcess()
@@ -216,7 +216,7 @@ class CartControllerCore extends FrontController
 					{
 						$queryString = Tools::safeOutput(Tools::getValue('query', NULL));
 						if ($queryString AND !Configuration::get('PS_CART_REDIRECT'))
-							Tools::redirect('search.php?search='.$queryString);
+							Tools::redirect('index.php?controller=search&search='.$queryString);
 						if (isset($_SERVER['HTTP_REFERER']))
 						{
 							// Redirect to previous page
@@ -227,7 +227,7 @@ class CartControllerCore extends FrontController
 					}
 				}
 				if (Tools::getValue('ajax') != 'true' AND !sizeof($this->errors))
-					Tools::redirect('order.php?'.(isset($idProduct) ? 'ipa='.(int)($idProduct) : ''));
+					Tools::redirect('index.php?controller=order&'.(isset($idProduct) ? 'ipa='.(int)($idProduct) : ''));

 			}
 		}
@@ -239,3 +239,4 @@ class CartControllerCore extends FrontController
 		self::$smarty->display(_PS_THEME_DIR_.'errors.tpl');
 	}
 }
+
--- a/controllers/CompareController.php
+++ b/controllers/CompareController.php
@@ -42,7 +42,7 @@ class CompareControllerCore extends FrontController
 		$postProducts = isset($product_list) ? rtrim($product_list,'|') : '';

 		if (!Configuration::get('PS_COMPARATOR_MAX_ITEM'))
-				return Tools::redirect('404.php');
+				return Tools::redirect('index.php?controller=404');

 		if ($postProducts)
 		{
--- a/controllers/GuestTrackingController.php
+++ b/controllers/GuestTrackingController.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -30,15 +30,15 @@ class GuestTrackingControllerCore extends FrontController
 	public function preProcess()
 	{
 		parent::preProcess();
-		
+
 		if (self::$cookie->isLogged())
-			Tools::redirect('history.php');
+			Tools::redirect('index.php?controller=history');
 	}
-	
+
 	public function process()
 	{
 		parent::process();
-		
+
 		if ($id_order = Tools::getValue('id_order') AND $email = Tools::getValue('email'))
 		{
 			$order = new Order((int)$id_order);
@@ -58,8 +58,7 @@ class GuestTrackingControllerCore extends FrontController
 			    $products = $order->getProducts();
 			    $customizedDatas = Product::getAllCustomizedDatas((int)($order->id_cart));
 			    Product::addCustomizationPrice($products, $customizedDatas);
-	
-			    $this->processAddressFormat($addressDelivery, $addressInvoice);	
+
 			    self::$smarty->assign(array(
 			    	'shop_name' => Configuration::get('PS_SHOP_NAME'),
 			    	'order' => $order,
@@ -86,7 +85,7 @@ class GuestTrackingControllerCore extends FrontController
 			    	self::$smarty->assign('followup', str_replace('@', $order->shipping_number, $carrier->url));
 			    self::$smarty->assign('HOOK_ORDERDETAILDISPLAYED', Module::hookExec('orderDetailDisplayed', array('order' => $order)));
 			    Module::hookExec('OrderDetail', array('carrier' => $carrier, 'order' => $order));
-				
+
 				if (Tools::isSubmit('submitTransformGuestToCustomer'))
 				{
 					if (!Validate::isPasswd(Tools::getValue('password')))
@@ -104,25 +103,25 @@ class GuestTrackingControllerCore extends FrontController
 				/* Handle brute force attacks */
 				sleep(1);
 		}
-		
+
 		self::$smarty->assign(array(
 			'action' => 'guest-tracking.php',
 			'errors' => $this->errors
 		));
 	}
-	
+
 	public function setMedia()
 	{
 		parent::setMedia();
-		
+
 		Tools::addCSS(_THEME_CSS_DIR_.'history.css');
 		Tools::addCSS(_THEME_CSS_DIR_.'addresses.css');
 	}
-	
+
 	public function displayContent()
 	{
 		parent::displayContent();
-		
+
 		self::$smarty->display(_PS_THEME_DIR_.'guest-tracking.tpl');
 	}

@@ -137,3 +136,4 @@ class GuestTrackingControllerCore extends FrontController

 	}
 }
+
--- a/controllers/OrderController.php
+++ b/controllers/OrderController.php
@@ -67,7 +67,7 @@ class OrderControllerCore extends ParentOrderController
 		}

 		if (!self::$cookie->isLogged(true) AND in_array($this->step, array(1, 2, 3)))
-			Tools::redirect('authentication.php?back='.urlencode('order.php?step='.$this->step));
+			Tools::redirect('index.php?controller=authentication&back=order.php?step='.$this->step);

 		if ($this->nbProducts)
 			self::$smarty->assign('virtual_cart', $isVirtualCart);
@@ -109,10 +109,10 @@ class OrderControllerCore extends ParentOrderController
 					{
 						$email = self::$cookie->email;
 						self::$cookie->logout(); // If guest we clear the cookie for security reason
-						Tools::redirect('guest-tracking.php?id_order='.(int)$id_order.'&email='.urlencode($email));
+						Tools::redirect('index.php?controller=guest-tracking&id_order='.(int)$id_order.'&email='.urlencode($email));
 					}
 					else
-						Tools::redirect('history.php');
+						Tools::redirect('index.php?controller=history');
 				}
 				$this->_assignPayment();
 				break;
@@ -172,7 +172,7 @@ class OrderControllerCore extends ParentOrderController
 		global $isVirtualCart;

 		if ($this->step >= 2 AND (!self::$cart->id_address_delivery OR !self::$cart->id_address_invoice))
-			Tools::redirect('order.php?step=1');
+			Tools::redirect('index.php?controller=order&step=1');
 		$delivery = new Address((int)(self::$cart->id_address_delivery));
 		$invoice = new Address((int)(self::$cart->id_address_invoice));

@@ -182,10 +182,10 @@ class OrderControllerCore extends ParentOrderController
 				unset(self::$cart->id_address_delivery);
 			if ($invoice->deleted)
 				unset(self::$cart->id_address_invoice);
-			Tools::redirect('order.php?step=1');
+			Tools::redirect('index.php?controller=order&step=1');
 		}
 		elseif ($this->step >= 3 AND !self::$cart->id_carrier AND !$isVirtualCart)
-			Tools::redirect('order.php?step=2');
+			Tools::redirect('index.php?controller=order&step=2');
 	}

 	/*
@@ -241,7 +241,7 @@ class OrderControllerCore extends ParentOrderController

 		self::$smarty->assign('cart', self::$cart);
 		if (self::$cookie->is_guest)
-			Tools::redirect('order.php?step=2');
+			Tools::redirect('index.php?controller=order?step=2');
 	}

 	/* Carrier step */
@@ -268,7 +268,7 @@ class OrderControllerCore extends ParentOrderController

 		// Redirect instead of displaying payment modules if any module are grefted on
 		Hook::backBeforePayment('order.php?step=3');
-		
+
 		/* We may need to display an order summary */
 		self::$smarty->assign(self::$cart->getSummaryDetails());
 		self::$smarty->assign(array(
@@ -276,7 +276,7 @@ class OrderControllerCore extends ParentOrderController
 			'taxes_enabled' => (int)(Configuration::get('PS_TAX'))
 		));
 		self::$cookie->checkedTOS = '1';
-		
+
 		parent::_assignPayment();
 	}
 }
--- a/controllers/OrderDetailController.php
+++ b/controllers/OrderDetailController.php
@@ -84,7 +84,7 @@ class OrderDetailControllerCore extends FrontController
 						'{message}' => $message->message),
 						$to, $toName, $customer->email, $customer->firstname.' '.$customer->lastname);
 					if (Tools::getValue('ajax') != 'true')
-						Tools::redirect('order-detail.php?id_order='.(int)($idOrder));
+						Tools::redirect('index.php?controller=order-detail&id_order='.(int)($idOrder));
 				}
 				else
 				{
--- a/controllers/OrderFollowController.php
+++ b/controllers/OrderFollowController.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -33,29 +33,29 @@ class OrderFollowControllerCore extends FrontController
 		$this->php_self = 'order-follow.php';
 		$this->authRedirection = 'order-follow.php';
 		$this->ssl = true;
-	
+
 		parent::__construct();
 	}
-	
+
 	public function preProcess()
 	{
 		parent::preProcess();
-		
+
 		if (Tools::isSubmit('submitReturnMerchandise'))
 		{
 			$customizationQtyInput = Tools::getValue('customization_qty_input');

 			if (!$id_order = (int)(Tools::getValue('id_order')))
-				Tools::redirect('history.php');
+				Tools::redirect('index.php?controller=history');
 			if (!$order_qte_input = Tools::getValue('order_qte_input'))
-				Tools::redirect('order-follow.php?errorDetail1');
+				Tools::redirect('index.php?controller=order-follow&errorDetail1');
 			if ($customizationIds = Tools::getValue('customization_ids') AND !$customizationQtyInput)
-				Tools::redirect('order-follow.php?errorDetail1');
+				Tools::redirect('index.php?controller=order-follow&errorDetail1');
 			if (!$ids_order_detail = Tools::getValue('ids_order_detail') AND !$customizationIds)
-				Tools::redirect('order-follow.php?errorDetail2');
+				Tools::redirect('index.php?controller=order-follow&errorDetail2');

 			$order = new Order((int)($id_order));
-			if (!$order->isReturnable()) Tools::redirect('order-follow.php?errorNotReturnable');
+			if (!$order->isReturnable()) Tools::redirect('index.php?controller=order-follow&errorNotReturnable');
 			if ($order->id_customer != self::$cookie->id_customer)
 				die(Tools::displayError());
 			$orderReturn = new OrderReturn();
@@ -63,15 +63,15 @@ class OrderFollowControllerCore extends FrontController
 			$orderReturn->id_order = $id_order;
 			$orderReturn->question = strval(Tools::getValue('returnText'));
 			if (empty($orderReturn->question))
-				Tools::redirect('order-follow.php?errorMsg');
+				Tools::redirect('index.php?controller=order-follow&errorMsg');
 			if (!$orderReturn->checkEnoughProduct($ids_order_detail, $order_qte_input, $customizationIds, $customizationQtyInput))
-				Tools::redirect('order-follow.php?errorQuantity');
+				Tools::redirect('index.php?controller=order-follow&errorQuantity');

 			$orderReturn->state = 1;
 			$orderReturn->add();
 			$orderReturn->addReturnDetail($ids_order_detail, $order_qte_input, $customizationIds, $customizationQtyInput);
 			Module::hookExec('orderReturn', array('orderReturn' => $orderReturn));
-			Tools::redirect('order-follow.php');
+			Tools::redirect('index.php?controller=order-follow');
 		}

 		$ordersReturn = OrderReturn::getOrdersReturn((int)(self::$cookie->id_customer));
@@ -88,7 +88,7 @@ class OrderFollowControllerCore extends FrontController

 		self::$smarty->assign('ordersReturn', $ordersReturn);
 	}
-	
+
 	public function setMedia()
 	{
 		parent::setMedia();
--- a/controllers/ParentOrderController.php
+++ b/controllers/ParentOrderController.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -31,42 +31,42 @@ class FreeOrder extends PaymentModule {}
 class ParentOrderControllerCore extends FrontController
 {
 	public $nbProducts;
-	
+
 	public function __construct()
 	{
 		$this->ssl = true;
 		parent::__construct();
-		
+
 		/* Disable some cache related bugs on the cart/order */
 		header('Cache-Control: no-cache, must-revalidate');
 		header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
 	}
-	
+
 	public function init()
 	{
 		parent::init();
 		$this->nbProducts = self::$cart->nbProducts();
 	}
-	
+
 	public function preProcess()
 	{
 		global $isVirtualCart;
-		
+
 		parent::preProcess();
-		
+
 		// Redirect to the good order process
-		if (Configuration::get('PS_ORDER_PROCESS_TYPE') == 0 AND strpos($_SERVER['PHP_SELF'], 'order.php') === false)
-			Tools::redirect('order.php');
-		if (Configuration::get('PS_ORDER_PROCESS_TYPE') == 1 AND strpos($_SERVER['PHP_SELF'], 'order-opc.php') === false)
+		if (Configuration::get('PS_ORDER_PROCESS_TYPE') == 0 AND Tools::getValue('controller') != 'order')
+			Tools::redirect('index.php?controller=order');
+		if (Configuration::get('PS_ORDER_PROCESS_TYPE') == 1 AND Tools::getValue('controller') != 'order-opc')
 		{
 			if (isset($_GET['step']) AND $_GET['step'] == 3)
-				Tools::redirect('order-opc.php?isPaymentStep=true');
-			Tools::redirect('order-opc.php');
+				Tools::redirect('index.php?controller=order-opc&isPaymentStep=true');
+			Tools::redirect('index.php?controller=order-opc');
 		}
-		
+
 		if (Configuration::get('PS_CATALOG_MODE'))
 			$this->errors[] = Tools::displayError('This store has not accepted your new order.');
-		
+
 		if (Tools::isSubmit('submitReorder') AND $id_order = (int)Tools::getValue('id_order'))
 		{
 			$oldCart = new Cart(Order::getCartIdStatic((int)$id_order, (int)self::$cookie->id_customer));
@@ -80,11 +80,11 @@ class ParentOrderControllerCore extends FrontController
 				self::$cookie->id_cart = $duplication['cart']->id;
 				self::$cookie->write();
 				if (Configuration::get('PS_ORDER_PROCESS_TYPE') == 1)
-					Tools::redirect('order-opc.php');
-				Tools::redirect('order.php');
+					Tools::redirect('index.php?controller=order-opc');
+				Tools::redirect('index.php?controller=order');
 			}
 		}
-		
+
 		if ($this->nbProducts)
 		{
 			if (Tools::isSubmit('submitAddDiscount') AND Tools::getValue('discount_name'))
@@ -105,7 +105,7 @@ class ParentOrderControllerCore extends FrontController
 					if (!sizeof($this->errors))
 					{
 						self::$cart->addDiscount((int)($discount->id));
-						Tools::redirect('order-opc.php');
+						Tools::redirect('index.php?controller=order-opc');
 					}
 				}
 				self::$smarty->assign(array(
@@ -116,21 +116,21 @@ class ParentOrderControllerCore extends FrontController
 			elseif (isset($_GET['deleteDiscount']) AND Validate::isUnsignedId($_GET['deleteDiscount']))
 			{
 				self::$cart->deleteDiscount((int)($_GET['deleteDiscount']));
-				Tools::redirect('order-opc.php');
+				Tools::redirect('index.php?controller=order-opc');
 			}
-			
+
 			/* Is there only virtual product in cart */
 			if ($isVirtualCart = self::$cart->isVirtualCart())
 				$this->_setNoCarrier();
 		}
-		
+
 		self::$smarty->assign('back', Tools::safeOutput(Tools::getValue('back')));
 	}
-	
+
 	public function setMedia()
 	{
 		parent::setMedia();
-		
+
 		// Adding CSS style sheet
 		Tools::addCSS(_THEME_CSS_DIR_.'addresses.css');
 		Tools::addCSS(_PS_CSS_DIR_.'jquery.fancybox-1.3.4.css', 'screen');
@@ -145,9 +145,9 @@ class ParentOrderControllerCore extends FrontController
 			Tools::addJS(_THEME_JS_DIR_.'cart-summary.js');
 			Tools::addJS(_PS_JS_DIR_.'jquery/jquery-typewatch.pack.js');
 		}
-		
+
 	}
-	
+
 	/**
 	 * @return boolean
 	 */
@@ -162,7 +162,7 @@ class ParentOrderControllerCore extends FrontController
 		}
 		return false;
 	}
-	
+
 	protected function _updateMessage($messageContent)
 	{
 		if ($messageContent)
@@ -194,7 +194,7 @@ class ParentOrderControllerCore extends FrontController
    	}
 		return true;
 	}
-	
+
 	protected function _processCarrier()
 	{
 		self::$cart->recyclable = (int)(Tools::getValue('recyclable'));
@@ -206,7 +206,7 @@ class ParentOrderControllerCore extends FrontController
 			else
 				self::$cart->gift_message = strip_tags($_POST['gift_message']);
 		}
-		
+
 		if (isset(self::$cookie->id_customer) AND self::$cookie->id_customer)
 		{
 			$address = new Address((int)(self::$cart->id_address_delivery));
@@ -215,21 +215,21 @@ class ParentOrderControllerCore extends FrontController
 		}
 		else
 			$id_zone = Country::getIdZone((int)Configuration::get('PS_COUNTRY_DEFAULT'));
-			
+
 		if (Validate::isInt(Tools::getValue('id_carrier')) AND sizeof(Carrier::checkCarrierZone((int)(Tools::getValue('id_carrier')), (int)($id_zone))))
 			self::$cart->id_carrier = (int)(Tools::getValue('id_carrier'));
 		elseif (!self::$cart->isVirtualCart() AND (int)(Tools::getValue('id_carrier')) == 0)
 			$this->errors[] = Tools::displayError('Invalid carrier or no carrier selected');
-		
+
 		Module::hookExec('processCarrier', array('cart' => self::$cart));
-		
+
 		return self::$cart->update();
 	}
-	
+
 	protected function _assignSummaryInformations()
 	{
 		global $currency;
-		
+
 		if (file_exists(_PS_SHIP_IMG_DIR_.(int)(self::$cart->id_carrier).'.jpg'))
 			self::$smarty->assign('carrierPicture', 1);
 		$summary = self::$cart->getSummaryDetails();
@@ -273,11 +273,11 @@ class ParentOrderControllerCore extends FrontController
 			'HOOK_SHOPPING_CART_EXTRA' => Module::hookExec('shoppingCartExtra', $summary)
 		));
 	}
-	
+
 	protected function _assignAddress()
 	{
 		if (!Customer::getAddressesTotalById((int)(self::$cookie->id_customer)))
-			Tools::redirect('address.php?back=order.php?step=1');
+			Tools::redirect('index.php?controller=address&back=order.php&step=1');
 		$customer = new Customer((int)(self::$cookie->id_customer));
 		if (Validate::isLoadedObject($customer))
 		{
@@ -319,14 +319,14 @@ class ParentOrderControllerCore extends FrontController
 		if ($oldMessage = Message::getMessageByCartId((int)(self::$cart->id)))
 			self::$smarty->assign('oldMessage', $oldMessage['message']);
 	}
-	
+
 	protected function _assignCarrier()
 	{
 		$customer = new Customer((int)(self::$cookie->id_customer));
 		$address = new Address((int)(self::$cart->id_address_delivery));
 		$id_zone = Address::getZoneById((int)($address->id));
 		$carriers = Carrier::getCarriersForOrder($id_zone, $customer->getGroups());
-		
+
 		$checked = 0;
 		if (Validate::isUnsignedInt(self::$cart->id_carrier) AND self::$cart->id_carrier)
 		{
@@ -342,14 +342,14 @@ class ParentOrderControllerCore extends FrontController
 			'HOOK_BEFORECARRIER' => Module::hookExec('beforeCarrier', array('carriers' => $carriers))
 		));
 	}
-	
+
 	protected function _assignWrappingAndTOS()
 	{
 		// Wrapping fees
 		$wrapping_fees = (float)(Configuration::get('PS_GIFT_WRAPPING_PRICE'));
 		$wrapping_fees_tax = new Tax((int)(Configuration::get('PS_GIFT_WRAPPING_TAX')));
 		$wrapping_fees_tax_inc = $wrapping_fees * (1 + (((float)($wrapping_fees_tax->rate) / 100)));
-		
+
 		// TOS
 		$cms = new CMS((int)(Configuration::get('PS_CONDITIONS_CMS_ID')), (int)(self::$cookie->id_lang));
 		$this->link_conditions = self::$link->getCMSLink($cms, $cms->link_rewrite, true);
@@ -357,7 +357,7 @@ class ParentOrderControllerCore extends FrontController
 			$this->link_conditions .= '?content_only=1';
 		else
 			$this->link_conditions .= '&content_only=1';
-		
+
 		self::$smarty->assign(array(
 			'checkedTOS' => (int)(self::$cookie->checkedTOS),
 			'recyclablePackAllowed' => (int)(Configuration::get('PS_RECYCLABLE_PACK')),
@@ -370,7 +370,7 @@ class ParentOrderControllerCore extends FrontController
 			'total_wrapping_cost' => Tools::convertPrice($wrapping_fees_tax_inc, new Currency((int)(self::$cookie->id_currency))),
 			'total_wrapping_tax_exc_cost' => Tools::convertPrice($wrapping_fees, new Currency((int)(self::$cookie->id_currency)))));
 	}
-	
+
 	protected function _assignPayment()
 	{
 		self::$smarty->assign(array(
@@ -378,7 +378,7 @@ class ParentOrderControllerCore extends FrontController
 			'HOOK_PAYMENT' => Module::hookExecPayment()
 		));
 	}
-	
+
 	/**
 	 * Set id_carrier to 0 (no shipping price)
 	 *
@@ -389,3 +389,4 @@ class ParentOrderControllerCore extends FrontController
 		self::$cart->update();
 	}
 }
+
--- a/controllers/PasswordController.php
+++ b/controllers/PasswordController.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -31,11 +31,11 @@ class PasswordControllerCore extends FrontController
 {
 	public function __construct()
 	{
-		$this->php_self = 'password.php';
-	
+		$this->php_self = 'password';
+
 		parent::__construct();
 	}
-	
+
 	public function process()
 	{
 		parent::process();
@@ -55,13 +55,13 @@ class PasswordControllerCore extends FrontController
 					if ((strtotime($customer->last_passwd_gen.'+'.(int)($min_time = Configuration::get('PS_PASSWD_TIME_FRONT')).' minutes') - time()) > 0)
 						$this->errors[] = Tools::displayError('You can regenerate your password only each').' '.(int)($min_time).' '.Tools::displayError('minute(s)');
 					else
-					{	
-						if (Mail::Send((int)(self::$cookie->id_lang), 'password_query', Mail::l('Password query confirmation'), 
-						array('{email}' => $customer->email, 
-							  '{lastname}' => $customer->lastname, 
+					{
+						if (Mail::Send((int)(self::$cookie->id_lang), 'password_query', Mail::l('Password query confirmation'),
+						array('{email}' => $customer->email,
+							  '{lastname}' => $customer->lastname,
 							  '{firstname}' => $customer->firstname,
-							  '{url}' => self::$link->getPageLink('password.php', true).'?token='.$customer->secure_key.'&id_customer='.(int)$customer->id),
-						$customer->email, 
+							  '{url}' => self::$link->getPageLink('password', true).'?token='.$customer->secure_key.'&id_customer='.(int)$customer->id),
+						$customer->email,
 						$customer->firstname.' '.$customer->lastname))
 							self::$smarty->assign(array('confirmation' => 2, 'email' => $customer->email));
 						else
@@ -78,20 +78,20 @@ class PasswordControllerCore extends FrontController
 				$customer = new Customer();
 				$customer->getByemail($email);
 				if ((strtotime($customer->last_passwd_gen.'+'.(int)($min_time = Configuration::get('PS_PASSWD_TIME_FRONT')).' minutes') - time()) > 0)
-					Tools::redirect('authentication.php?error_regen_pwd');
+					Tools::redirect('index.php?controller=authentication&error_regen_pwd');
 				else
 				{
 					$customer->passwd = Tools::encrypt($password = Tools::passwdGen((int)(MIN_PASSWD_LENGTH)));
 					$customer->last_passwd_gen = date('Y-m-d H:i:s', time());
 					if ($customer->update())
 					{
-						if (Mail::Send((int)(self::$cookie->id_lang), 'password', Mail::l('Your password'), 
-						array('{email}' => $customer->email, 
-							  '{lastname}' => $customer->lastname, 
-							  '{firstname}' => $customer->firstname, 
-							  '{passwd}' => $password), 
-						$customer->email, 
-						$customer->firstname.' '.$customer->lastname)) 
+						if (Mail::Send((int)(self::$cookie->id_lang), 'password', Mail::l('Your password'),
+						array('{email}' => $customer->email,
+							  '{lastname}' => $customer->lastname,
+							  '{firstname}' => $customer->firstname,
+							  '{passwd}' => $password),
+						$customer->email,
+						$customer->firstname.' '.$customer->lastname))
 							self::$smarty->assign(array('confirmation' => 1, 'email' => $customer->email));
 						else
 							$this->errors[] = Tools::displayError('Error occured when sending the e-mail.');
@@ -106,7 +106,7 @@ class PasswordControllerCore extends FrontController
 		elseif (($token = Tools::getValue('token')) || ($id_customer = Tools::getValue('id_customer')))
 			$this->errors[] = Tools::displayError('We cannot regenerate your password with the data you submitted');
 	}
-	
+
 	public function displayContent()
 	{
 		parent::displayContent();
--- a/controllers/ProductController.php
+++ b/controllers/ProductController.php
@@ -54,7 +54,7 @@ class ProductControllerCore extends FrontController
 	{
 		if ($id_product = (int)Tools::getValue('id_product'))
 			$this->product = new Product($id_product, true, self::$cookie->id_lang);
-			
+
 		if (!Validate::isLoadedObject($this->product))
 		{
 			header('HTTP/1.1 404 Not Found');
@@ -67,6 +67,7 @@ class ProductControllerCore extends FrontController
 			if (Validate::isLoadedObject($this->product))
 			{
 				$canonicalURL = self::$link->getProductLink($this->product);
+				p($canonicalURL);
 				if (!preg_match('/^'.Tools::pRegexp($canonicalURL, '/').'([&?].*)?$/', Tools::getProtocol().$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']))
 				{
 					header('HTTP/1.0 301 Moved');
--- a/discount.php
+++ b/discount.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,4 +26,15 @@
 */

 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('DiscountController')->run();
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/discount'.$params);
+
--- a/get-file.php
+++ b/get-file.php
@@ -68,7 +68,7 @@ if ($cookie->isLoggedBack() AND Tools::getValue('file'))
 	}

 	if (!file_exists($file))
-		Tools::redirect('index.php');
+		Tools::redirect('index.php/index');
 }
 else
 {
@@ -78,7 +78,7 @@ else
 	$cookie = new Cookie('ps');
 	Tools::setCookieLanguage();
 	if (!$cookie->isLogged() AND !Tools::getValue('secure_key') AND !Tools::getValue('id_order'))
-		Tools::redirect('authentication.php?back=get-file.php&key='.$key);
+		Tools::redirect('index.php/authentication?back=get-file.php&key='.$key);
 	elseif (!$cookie->isLogged() AND Tools::getValue('secure_key') AND Tools::getValue('id_order'))
 	{
 		$order = new Order((int)Tools::getValue('id_order'));
--- a/guest-tracking.php
+++ b/guest-tracking.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,4 +26,15 @@
 */

 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('GuestTrackingController')->run();
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/guest-tracking'.$params);
+
--- a/history.php
+++ b/history.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,4 +26,15 @@
 */

 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('HistoryController')->run();
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/history'.$params);
+
--- a/identity.php
+++ b/identity.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,4 +26,15 @@
 */

 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('IdentityController')->run();
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/identity'.$params);
+
--- a/index.php
+++ b/index.php
@@ -1,6 +1,7 @@
+
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,4 +27,6 @@
 */

 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('IndexController')->run();
+$dispatcher = new Dispatcher();
+$dispatcher->dispatch();
+
--- a/manufacturer.php
+++ b/manufacturer.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,4 +26,15 @@
 */

 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('ManufacturerController')->run();
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/manufacturer'.$params);
+
--- a/modules/authorizeaim/validation.php
+++ b/modules/authorizeaim/validation.php
@@ -60,7 +60,7 @@ if (!isset($response[7]) OR !isset($response[3]) OR !isset($response[9]))
 }

 if ($response[0] == 3)
-	Tools::redirect('order.php?step=3&aimerror=1');
+	Tools::redirect('index.php/order?step=3&aimerror=1');
 else 
 {
 	/* Does the cart exist and is valid? */
@@ -82,6 +82,6 @@ else
 	else
 		$authorizeaim->validateOrder((int)$cart->id, _PS_OS_ERROR_, (float)$response[9], $authorizeaim->displayName, $message);

-	Tools::redirect('order-confirmation.php?id_module='.(int)$authorizeaim->id.'&id_cart='.(int)$cart->id.'&key='.$customer->secure_key);
+	Tools::redirect('index.php/order-confirmation?id_module='.(int)$authorizeaim->id.'&id_cart='.(int)$cart->id.'&key='.$customer->secure_key);
 }

--- a/modules/bankwire/payment.php
+++ b/modules/bankwire/payment.php
@@ -33,7 +33,7 @@ include(dirname(__FILE__).'/../../header.php');
 include(dirname(__FILE__).'/bankwire.php');

 if (!$cookie->isLogged(true))
-    Tools::redirect('authentication.php?back=order.php');
+    Tools::redirect('index.php/authentication?back=order.php');
 $bankwire = new BankWire();
 echo $bankwire->execPayment($cart);

--- a/modules/bankwire/payment_execution.tpl
+++ b/modules/bankwire/payment_execution.tpl
@@ -73,7 +73,7 @@
 	<b>{l s='Please confirm your order by clicking \'I confirm my order\'' mod='bankwire'}.</b>
 </p>
 <p class="cart_navigation">
-	<a href="{$link->getPageLink('order.php', true)}?step=3" class="button_large">{l s='Other payment methods' mod='bankwire'}</a>
+	<a href="{$link->getPageLink('order', true)}?step=3" class="button_large">{l s='Other payment methods' mod='bankwire'}</a>
 	<input type="submit" name="submit" value="{l s='I confirm my order' mod='bankwire'}" class="exclusive_large" />
 </p>
 </form>
--- a/modules/bankwire/payment_return.tpl
+++ b/modules/bankwire/payment_return.tpl
@@ -35,11 +35,11 @@
 		<br /><br />- {l s='Do not forget to insert your order #' mod='bankwire'} <span class="bold">{$id_order}</span> {l s='in the subject of your bank wire' mod='bankwire'}
 		<br /><br />{l s='An e-mail has been sent to you with this information.' mod='bankwire'}
 		<br /><br /><span class="bold">{l s='Your order will be sent as soon as we receive your settlement.' mod='bankwire'}</span>
-		<br /><br />{l s='For any questions or for further information, please contact our' mod='bankwire'} <a href="{$link->getPageLink('contact-form.php', true)}">{l s='customer support' mod='bankwire'}</a>.
+		<br /><br />{l s='For any questions or for further information, please contact our' mod='bankwire'} <a href="{$link->getPageLink('contact-form', true)}">{l s='customer support' mod='bankwire'}</a>.
 	</p>
 {else}
 	<p class="warning">
 		{l s='We noticed a problem with your order. If you think this is an error, you can contact our' mod='bankwire'} 
-		<a href="{$link->getPageLink('contact-form.php', true)}">{l s='customer support' mod='bankwire'}</a>.
+		<a href="{$link->getPageLink('contact-form', true)}">{l s='customer support' mod='bankwire'}</a>.
 	</p>
 {/if}
--- a/modules/blockbestsellers/blockbestsellers.tpl
+++ b/modules/blockbestsellers/blockbestsellers.tpl
@@ -26,7 +26,7 @@

 <!-- MODULE Block best sellers -->
 <div id="best-sellers_block_right" class="block products_block">
-	<h4><a href="{$link->getPageLink('best-sales.php')}">{l s='Top sellers' mod='blockbestsellers'}</a></h4>
+	<h4><a href="{$link->getPageLink('best-sales')}">{l s='Top sellers' mod='blockbestsellers'}</a></h4>
 	<div class="block_content">
 	{if $best_sellers|@count > 0}
 		<ul class="product_images">
@@ -38,7 +38,7 @@
 			<dt class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if}"><a href="{$product.link}" title="{$product.name|escape:'htmlall':'UTF-8'}">{$product.name|strip_tags:'UTF-8'|escape:'htmlall':'UTF-8'}</a></dt>
 		{/foreach}
 		</dl>
-		<p><a href="{$link->getPageLink('best-sales.php')}" title="{l s='All best sellers' mod='blockbestsellers'}" class="button_large">{l s='All best sellers' mod='blockbestsellers'}</a></p>
+		<p><a href="{$link->getPageLink('best-sales')}" title="{l s='All best sellers' mod='blockbestsellers'}" class="button_large">{l s='All best sellers' mod='blockbestsellers'}</a></p>
 	{else}
 		<p>{l s='No best sellers at this time' mod='blockbestsellers'}</p>
 	{/if}
--- a/modules/blockcart/ajax-cart.js
+++ b/modules/blockcart/ajax-cart.js
@@ -119,11 +119,11 @@ var ajaxCart = {
 		//send the ajax request to the server
 		$.ajax({
 			type: 'GET',
-			url: baseDir + 'cart.php',
+			url: baseDir + 'index.php',
 			async: true,
 			cache: false,
 			dataType : "json",
-			data: 'ajax=true&token=' + static_token,
+			data: 'controller=cart&ajax=true&token=' + static_token,
 			success: function(jsonData)
 			{
 				ajaxCart.updateCart(jsonData);
@@ -180,11 +180,11 @@ var ajaxCart = {
 		//send the ajax request to the server
 		$.ajax({
 			type: 'POST',
-			url: baseDir + 'cart.php',
+			url: baseDir + 'index.php',
 			async: true,
 			cache: false,
 			dataType : "json",
-			data: 'add=1&ajax=true&qty=' + ((quantity && quantity != null) ? quantity : '1') + '&id_product=' + idProduct + '&token=' + static_token + ( (parseInt(idCombination) && idCombination != null) ? '&ipa=' + parseInt(idCombination): ''),
+			data: 'controller=cart&add=1&ajax=true&qty=' + ((quantity && quantity != null) ? quantity : '1') + '&id_product=' + idProduct + '&token=' + static_token + ( (parseInt(idCombination) && idCombination != null) ? '&ipa=' + parseInt(idCombination): ''),
 			success: function(jsonData,textStatus,jqXHR)
 			{
 				// add appliance to whishlist module
@@ -230,11 +230,11 @@ var ajaxCart = {
 		//send the ajax request to the server
 		$.ajax({
 			type: 'POST',
-			url: baseDir + 'cart.php',
+			url: baseDir + 'index.php',
 			async: true,
 			cache: false,
 			dataType : "json",
-			data: 'delete=1&id_product=' + idProduct + '&ipa=' + ((idCombination != null && parseInt(idCombination)) ? idCombination : '') + ((customizationId && customizationId != null) ? '&id_customization=' + customizationId : '') + '&token=' + static_token + '&ajax=true',
+			data: 'controller=cart&delete=1&id_product=' + idProduct + '&ipa=' + ((idCombination != null && parseInt(idCombination)) ? idCombination : '') + ((customizationId && customizationId != null) ? '&id_customization=' + customizationId : '') + '&token=' + static_token + '&ajax=true',
 			success: function(jsonData)	{
 				ajaxCart.updateCart(jsonData);
 				if ($('body').attr('id') == 'order' || $('body').attr('id') == 'order-opc')
@@ -327,7 +327,7 @@ var ajaxCart = {
 		}
 		var removeLinks = $('#cart_block_product_' + domIdProduct).find('a.ajax_cart_block_remove_link');
 		if (!product.hasCustomizedDatas && !removeLinks.length)
-			$('#' + domIdProduct + ' span.remove_link').html('<a class="ajax_cart_block_remove_link" rel="nofollow" href="' + baseDir + 'cart.php?delete&amp;id_product=' + product['id'] + '&amp;ipa=' + product['idCombination'] + '&amp;token=' + static_token + '" title="' + removingLinkText + '"> </a>');
+			$('#' + domIdProduct + ' span.remove_link').html('<a class="ajax_cart_block_remove_link" rel="nofollow" href="' + baseDir + 'index.php?controller=cart&amp;delete&amp;id_product=' + product['id'] + '&amp;ipa=' + product['idCombination'] + '&amp;token=' + static_token + '" title="' + removingLinkText + '"> </a>');
 	},

 	doesCustomizationStillExist : function (product, customizationId)
@@ -416,7 +416,7 @@ var ajaxCart = {
 						 content += '<span class="quantity-formated"><span class="quantity">' + this.quantity + '</span>x</span>';
 						 var name = (this.name.length > 12 ? this.name.substring(0, 10) + '...' : this.name);
 						  content += '<a href="' + this.link + '" title="' + this.name + '">' + name + '</a>';
-						  content += '<span class="remove_link"><a rel="nofollow" class="ajax_cart_block_remove_link" href="' + baseDir + 'cart.php?delete&amp;id_product=' + productId + '&amp;token=' + static_token + (this.hasAttributes ? '&amp;ipa=' + parseInt(this.idCombination) : '') + '"> </a></span>';
+						  content += '<span class="remove_link"><a rel="nofollow" class="ajax_cart_block_remove_link" href="' + baseDir + 'index.php?controller=cart&amp;delete&amp;id_product=' + productId + '&amp;token=' + static_token + (this.hasAttributes ? '&amp;ipa=' + parseInt(this.idCombination) : '') + '"> </a></span>';
 						  content += '<span class="price">' + this.priceByLine + '</span>';
 						  content += '</dt>';
 					if (this.hasAttributes)
@@ -483,7 +483,7 @@ var ajaxCart = {
 			// If the customization is already displayed on the cart, no update's needed
 			if($('#cart_block').find("div[id^=deleteCustomizableProduct_" + customizationId + "_]").length)
 				return ('');
-			content += '<li name="customization"><div class="deleteCustomizableProduct" id="deleteCustomizableProduct_' + customizationId + '_' + productId + '_' + (productAttributeId ?  productAttributeId : '0') + '"><a  rel="nofollow" class="ajax_cart_block_remove_link" href="' + baseDir + 'cart.php?delete&amp;id_product=' + productId + '&amp;ipa=' + productAttributeId + '&amp;id_customization=' + customizationId + '&amp;token=' + static_token + '"> </a></div><span class="quantity-formated"><span class="quantity">' + parseInt(this.quantity) + '</span>x</span>';
+			content += '<li name="customization"><div class="deleteCustomizableProduct" id="deleteCustomizableProduct_' + customizationId + '_' + productId + '_' + (productAttributeId ?  productAttributeId : '0') + '"><a  rel="nofollow" class="ajax_cart_block_remove_link" href="' + baseDir + 'index.php?controller=cart&amp;delete&amp;id_product=' + productId + '&amp;ipa=' + productAttributeId + '&amp;id_customization=' + customizationId + '&amp;token=' + static_token + '"> </a></div><span class="quantity-formated"><span class="quantity">' + parseInt(this.quantity) + '</span>x</span>';

 			// Give to the customized product the first textfield value as name
 			$(this.datas).each(function(){
--- a/modules/blockcart/blockcart-json.tpl
+++ b/modules/blockcart/blockcart-json.tpl
@@ -86,7 +86,7 @@
 		"name":            "{$discount.name|cat:' : '|cat:$discount.description|truncate:18:'...'|addslashes}",
 		"description":     "{$discount.description|addslashes}",
 		"nameDescription": "{$discount.name|cat:' : '|cat:$discount.description|truncate:18:'...'}",
-		"link":            "{$link->getPageLink('order.php', true)}?deleteDiscount={$discount.id_discount}",
+		"link":            "{$link->getPageLink('order', true)}?deleteDiscount={$discount.id_discount}",
 		"price":           "-{if $discount.value_real != '!'}{if $priceDisplay == 1}{convertPrice|html_entity_decode:2:'UTF-8' price=$discount.value_tax_exc}{else}{convertPrice|html_entity_decode:2:'UTF-8' price=$discount.value_real}{/if}{/if}"
 	{rdelim}
 	{if !$smarty.foreach.discounts.last},{/if}
--- a/modules/blockcart/blockcart.tpl
+++ b/modules/blockcart/blockcart.tpl
@@ -38,7 +38,7 @@ var removingLinkText = '{l s='remove this product from my cart' mod='blockcart'
 <!-- MODULE Block cart -->
 <div id="cart_block" class="block exclusive">
 	<h4>
-		<a href="{$link->getPageLink("$order_process.php", true)}">{l s='Cart' mod='blockcart'}</a>
+		<a href="{$link->getPageLink("$order_process", true)}">{l s='Cart' mod='blockcart'}</a>
 		{if $ajax_allowed}
 		<span id="block_cart_expand" {if isset($colapseExpandStatus) && $colapseExpandStatus eq 'expanded' || !isset($colapseExpandStatus)}class="hidden"{/if}>&nbsp;</span>
 		<span id="block_cart_collapse" {if isset($colapseExpandStatus) && $colapseExpandStatus eq 'collapsed'}class="hidden"{/if}>&nbsp;</span>
@@ -63,7 +63,7 @@ var removingLinkText = '{l s='remove this product from my cart' mod='blockcart'
 			<dt id="cart_block_product_{$product.id_product}{if $product.id_product_attribute}_{$product.id_product_attribute}{/if}" class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if}">
 				<span class="quantity-formated"><span class="quantity">{$product.cart_quantity}</span>x</span>
 				<a class="cart_block_product_name" href="{$link->getProductLink($product.id_product, $product.link_rewrite, $product.category)}" title="{$product.name|escape:html:'UTF-8'}">{t text=$product.name length='10' encode='true'}</a>
-				<span class="remove_link">{if !isset($customizedDatas.$productId.$productAttributeId)}<a rel="nofollow" class="ajax_cart_block_remove_link" href="{$link->getPageLink('cart.php')}?delete&amp;id_product={$product.id_product}&amp;ipa={$product.id_product_attribute}&amp;token={$static_token}" title="{l s='remove this product from my cart' mod='blockcart'}">&nbsp;</a>{/if}</span>
+				<span class="remove_link">{if !isset($customizedDatas.$productId.$productAttributeId)}<a rel="nofollow" class="ajax_cart_block_remove_link" href="{$link->getPageLink('cart')}?delete&amp;id_product={$product.id_product}&amp;ipa={$product.id_product_attribute}&amp;token={$static_token}" title="{l s='remove this product from my cart' mod='blockcart'}">&nbsp;</a>{/if}</span>
 				<span class="price">{if $priceDisplay == $smarty.const.PS_TAX_EXC}{displayWtPrice p="`$product.total`"}{else}{displayWtPrice p="`$product.total_wt`"}{/if}</span>
 			</dt>
 			{if isset($product.attributes_small)}
@@ -77,7 +77,7 @@ var removingLinkText = '{l s='remove this product from my cart' mod='blockcart'
 				<ul class="cart_block_customizations" id="customization_{$productId}_{$productAttributeId}">
 					{foreach from=$customizedDatas.$productId.$productAttributeId key='id_customization' item='customization' name='customizations'}
 						<li name="customization">
-							<div class="deleteCustomizableProduct" id="deleteCustomizableProduct_{$id_customization|intval}_{$product.id_product|intval}_{$product.id_product_attribute|intval}"><a class="ajax_cart_block_remove_link" href="{$link->getPageLink('cart.php')}?delete&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;token={$static_token}"> </a></div>
+							<div class="deleteCustomizableProduct" id="deleteCustomizableProduct_{$id_customization|intval}_{$product.id_product|intval}_{$product.id_product_attribute|intval}"><a class="ajax_cart_block_remove_link" href="{$link->getPageLink('cart')}?delete&amp;id_product={$product.id_product|intval}&amp;ipa={$product.id_product_attribute|intval}&amp;id_customization={$id_customization}&amp;token={$static_token}"> </a></div>
 							<span class="quantity-formated"><span class="quantity">{$customization.quantity}</span>x</span>{if isset($customization.datas.$CUSTOMIZE_TEXTFIELD.0)}{t text=$customization.datas.$CUSTOMIZE_TEXTFIELD.0.value|replace:"<br />":" " length='28' encode='true'}
 							{else}
 							{l s='Customization #' mod='blockcart'}{$id_customization|intval}{l s=':' mod='blockcart'}
@@ -101,7 +101,7 @@ var removingLinkText = '{l s='remove this product from my cart' mod='blockcart'
 				<tr class="bloc_cart_voucher" id="bloc_cart_voucher_{$discount.id_discount}">
 					<td class="name" title="{$discount.description}">{$discount.name|cat:' : '|cat:$discount.description|truncate:18:'...'|escape:'htmlall':'UTF-8'}</td>
 					<td class="price">-{if $discount.value_real != '!'}{if $priceDisplay == 1}{convertPrice price=$discount.value_tax_exc}{else}{convertPrice price=$discount.value_real}{/if}{/if}</td>
-					<td class="delete"><a href="{$link->getPageLink("$order_process.php", true)}?deleteDiscount={$discount.id_discount}" title="{l s='Delete'}"><img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" width="11" height="13" class="icon" /></a></td>
+					<td class="delete"><a href="{$link->getPageLink("$order_process", true)}?deleteDiscount={$discount.id_discount}" title="{l s='Delete'}"><img src="{$img_dir}icon/delete.gif" alt="{l s='Delete'}" width="11" height="13" class="icon" /></a></td>
 				</tr>
 			{/foreach}
 			</tbody>
@@ -139,8 +139,8 @@ var removingLinkText = '{l s='remove this product from my cart' mod='blockcart'
 			{/if}
 		{/if}
 		<p id="cart-buttons">
-			{if $order_process == 'order'}<a href="{$link->getPageLink("$order_process.php", true)}" class="button_small" title="{l s='Cart' mod='blockcart'}">{l s='Cart' mod='blockcart'}</a>{/if}
-			<a href="{$link->getPageLink("$order_process.php", true)}{if $order_process == 'order'}?step=1{/if}" id="button_order_cart" class="exclusive{if $order_process == 'order-opc'}_large{/if}" title="{l s='Check out' mod='blockcart'}">{l s='Check out' mod='blockcart'}</a>
+			{if $order_process == 'order'}<a href="{$link->getPageLink("$order_process", true)}" class="button_small" title="{l s='Cart' mod='blockcart'}">{l s='Cart' mod='blockcart'}</a>{/if}
+			<a href="{$link->getPageLink("$order_process", true)}{if $order_process == 'order'}?step=1{/if}" id="button_order_cart" class="exclusive{if $order_process == 'order-opc'}_large{/if}" title="{l s='Check out' mod='blockcart'}">{l s='Check out' mod='blockcart'}</a>
 		</p>
 	</div>
 	</div>
--- a/modules/blockcms/blockcms.tpl
+++ b/modules/blockcms/blockcms.tpl
@@ -38,7 +38,7 @@
 				{foreach from=$cms_title.cms item=cms_page}
 					{if isset($cms_page.link)}<li><a href="{$cms_page.link}" title="{$cms_page.meta_title|escape:html:'UTF-8'}">{$cms_page.meta_title|escape:html:'UTF-8'}</a></li>{/if}
 				{/foreach}
-				{if $cms_title.display_store}<li><a href="{$link->getPageLink('stores.php')}" title="{l s='Our stores' mod='blockcms'}">{l s='Our stores' mod='blockcms'}</a></li>{/if}
+				{if $cms_title.display_store}<li><a href="{$link->getPageLink('stores')}" title="{l s='Our stores' mod='blockcms'}">{l s='Our stores' mod='blockcms'}</a></li>{/if}
 			</ul>
 		</div>
 	{/foreach}
@@ -46,11 +46,11 @@
 {else}
 	<!-- MODULE Block footer -->
 	<ul class="block_various_links" id="block_various_links_footer">
-		{if !$PS_CATALOG_MODE}<li class="first_item"><a href="{$link->getPageLink('prices-drop.php')}" title="{l s='Specials' mod='blockcms'}">{l s='Specials' mod='blockcms'}</a></li>{/if}
-		<li class="{if $PS_CATALOG_MODE}first_{/if}item"><a href="{$link->getPageLink('new-products.php')}" title="{l s='New products' mod='blockcms'}">{l s='New products' mod='blockcms'}</a></li>
-		{if !$PS_CATALOG_MODE}<li class="item"><a href="{$link->getPageLink('best-sales.php')}" title="{l s='Top sellers' mod='blockcms'}">{l s='Top sellers' mod='blockcms'}</a></li>{/if}
-		{if $display_stores_footer}<li class="item"><a href="{$link->getPageLink('stores.php')}" title="{l s='Our stores' mod='blockcms'}">{l s='Our stores' mod='blockcms'}</a></li>{/if}
-		<li class="item"><a href="{$link->getPageLink('contact-form.php', true)}" title="{l s='Contact us' mod='blockcms'}">{l s='Contact us' mod='blockcms'}</a></li>
+		{if !$PS_CATALOG_MODE}<li class="first_item"><a href="{$link->getPageLink('prices-drop')}" title="{l s='Specials' mod='blockcms'}">{l s='Specials' mod='blockcms'}</a></li>{/if}
+		<li class="{if $PS_CATALOG_MODE}first_{/if}item"><a href="{$link->getPageLink('new-products')}" title="{l s='New products' mod='blockcms'}">{l s='New products' mod='blockcms'}</a></li>
+		{if !$PS_CATALOG_MODE}<li class="item"><a href="{$link->getPageLink('best-sales')}" title="{l s='Top sellers' mod='blockcms'}">{l s='Top sellers' mod='blockcms'}</a></li>{/if}
+		{if $display_stores_footer}<li class="item"><a href="{$link->getPageLink('stores')}" title="{l s='Our stores' mod='blockcms'}">{l s='Our stores' mod='blockcms'}</a></li>{/if}
+		<li class="item"><a href="{$link->getPageLink('contact-form', true)}" title="{l s='Contact us' mod='blockcms'}">{l s='Contact us' mod='blockcms'}</a></li>
 		{foreach from=$cmslinks item=cmslink}
 			{if $cmslink.meta_title != ''}
 				<li class="item"><a href="{$cmslink.link|addslashes}" title="{$cmslink.meta_title|escape:'htmlall':'UTF-8'}">{$cmslink.meta_title|escape:'htmlall':'UTF-8'}</a></li>
--- a/modules/blockmanufacturer/blockmanufacturer.tpl
+++ b/modules/blockmanufacturer/blockmanufacturer.tpl
@@ -26,7 +26,7 @@

 <!-- Block manufacturers module -->
 <div id="manufacturers_block_left" class="block blockmanufacturer">
-	<h4>{if $display_link_manufacturer}<a href="{$link->getPageLink('manufacturer.php')}" title="{l s='Manufacturers' mod='blockmanufacturer'}">{/if}{l s='Manufacturers' mod='blockmanufacturer'}{if $display_link_manufacturer}</a>{/if}</h4>
+	<h4>{if $display_link_manufacturer}<a href="{$link->getPageLink('manufacturer')}" title="{l s='Manufacturers' mod='blockmanufacturer'}">{/if}{l s='Manufacturers' mod='blockmanufacturer'}{if $display_link_manufacturer}</a>{/if}</h4>
 	<div class="block_content">
 {if $manufacturers}
 	{if $text_list}
--- a/modules/blockmyaccount/blockmyaccount.tpl
+++ b/modules/blockmyaccount/blockmyaccount.tpl
@@ -26,18 +26,18 @@

 <!-- Block myaccount module -->
 <div class="block myaccount">
-	<h4><a href="{$link->getPageLink('my-account.php', true)}">{l s='My account' mod='blockmyaccount'}</a></h4>
+	<h4><a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='blockmyaccount'}</a></h4>
 	<div class="block_content">
 		<ul class="bullet">
-			<li><a href="{$link->getPageLink('history.php', true)}" title="">{l s='My orders' mod='blockmyaccount'}</a></li>
-			{if $returnAllowed}<li><a href="{$link->getPageLink('order-follow.php', true)}" title="">{l s='My merchandise returns' mod='blockmyaccount'}</a></li>{/if}
-			<li><a href="{$link->getPageLink('order-slip.php', true)}" title="">{l s='My credit slips' mod='blockmyaccount'}</a></li>
-			<li><a href="{$link->getPageLink('addresses.php', true)}" title="">{l s='My addresses' mod='blockmyaccount'}</a></li>
-			<li><a href="{$link->getPageLink('identity.php', true)}" title="">{l s='My personal info' mod='blockmyaccount'}</a></li>
-			{if $voucherAllowed}<li><a href="{$link->getPageLink('discount.php', true)}" title="">{l s='My vouchers' mod='blockmyaccount'}</a></li>{/if}
+			<li><a href="{$link->getPageLink('history', true)}" title="">{l s='My orders' mod='blockmyaccount'}</a></li>
+			{if $returnAllowed}<li><a href="{$link->getPageLink('order-follow', true)}" title="">{l s='My merchandise returns' mod='blockmyaccount'}</a></li>{/if}
+			<li><a href="{$link->getPageLink('order-slip', true)}" title="">{l s='My credit slips' mod='blockmyaccount'}</a></li>
+			<li><a href="{$link->getPageLink('addresses', true)}" title="">{l s='My addresses' mod='blockmyaccount'}</a></li>
+			<li><a href="{$link->getPageLink('identity', true)}" title="">{l s='My personal info' mod='blockmyaccount'}</a></li>
+			{if $voucherAllowed}<li><a href="{$link->getPageLink('discount', true)}" title="">{l s='My vouchers' mod='blockmyaccount'}</a></li>{/if}
 			{$HOOK_BLOCK_MY_ACCOUNT}
 		</ul>
-		<p class="logout"><a href="{$link->getPageLink('index.php')}?mylogout" title="{l s='Sign out' mod='blockmyaccount'}">{l s='Sign out' mod='blockmyaccount'}</a></p>
+		<p class="logout"><a href="{$link->getPageLink('index')}?mylogout" title="{l s='Sign out' mod='blockmyaccount'}">{l s='Sign out' mod='blockmyaccount'}</a></p>
 	</div>
 </div>
-<!-- /Block myaccount module -->
+<!-- /Block myaccount module -->
--- a/modules/blocknewproducts/blocknewproducts.tpl
+++ b/modules/blocknewproducts/blocknewproducts.tpl
@@ -26,7 +26,7 @@

 <!-- MODULE Block new products -->
 <div id="new-products_block_right" class="block products_block">
-	<h4><a href="{$link->getPageLink('new-products.php')}" title="{l s='New products' mod='blocknewproducts'}">{l s='New products' mod='blocknewproducts'}</a></h4>
+	<h4><a href="{$link->getPageLink('new-products')}" title="{l s='New products' mod='blocknewproducts'}">{l s='New products' mod='blocknewproducts'}</a></h4>
 	<div class="block_content">
 	{if $new_products !== false}
 		<ul class="product_images clearfix">
@@ -42,10 +42,10 @@
 			{if $newproduct.description_short}<dd class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if}"><a href="{$newproduct.link}">{$newproduct.description_short|strip_tags:'UTF-8'|truncate:50:'...'}</a>&nbsp;<a href="{$newproduct.link}"><img src="{$img_dir}bullet.gif" alt="&gt;&gt;" width="10" height="7" /></a></dd>{/if}
 		{/foreach}
 		</dl>
-		<p><a href="{$link->getPageLink('new-products.php')}" title="{l s='All new products' mod='blocknewproducts'}" class="button_large">{l s='All new products' mod='blocknewproducts'}</a></p>
+		<p><a href="{$link->getPageLink('new-products')}" title="{l s='All new products' mod='blocknewproducts'}" class="button_large">{l s='All new products' mod='blocknewproducts'}</a></p>
 	{else}
 		<p>{l s='No new products at this time' mod='blocknewproducts'}</p>
 	{/if}
 	</div>
 </div>
-<!-- /MODULE Block new products -->
+<!-- /MODULE Block new products -->
--- a/modules/blocknewsletter/blocknewsletter.tpl
+++ b/modules/blocknewsletter/blocknewsletter.tpl
@@ -32,7 +32,7 @@
 	{if isset($msg) && $msg}
 		<p class="{if $nw_error}warning_inline{else}success_inline{/if}">{$msg}</p>
 	{/if}
-		<form action="{$link->getPageLink('index.php')}" method="post">
+		<form action="{$link->getPageLink('index')}" method="post">
 			<p><input type="text" name="email" size="18" value="{if isset($value) && $value}{$value}{else}{l s='your e-mail' mod='blocknewsletter'}{/if}" onfocus="javascript:if(this.value=='{l s='your e-mail' mod='blocknewsletter'}')this.value='';" onblur="javascript:if(this.value=='')this.value='{l s='your e-mail' mod='blocknewsletter'}';" /></p>
 			<p>
 				<select name="action">
--- a/modules/blockpermanentlinks/blockpermanentlinks-header.tpl
+++ b/modules/blockpermanentlinks/blockpermanentlinks-header.tpl
@@ -26,8 +26,8 @@

 <!-- Block permanent links module HEADER -->
 <ul id="header_links">
-	<li id="header_link_contact"><a href="{$link->getPageLink('contact-form.php', true)}" title="{l s='contact' mod='blockpermanentlinks'}">{l s='contact' mod='blockpermanentlinks'}</a></li>
-	<li id="header_link_sitemap"><a href="{$link->getPageLink('sitemap.php')}" title="{l s='sitemap' mod='blockpermanentlinks'}">{l s='sitemap' mod='blockpermanentlinks'}</a></li>
+	<li id="header_link_contact"><a href="{$link->getPageLink('contact-form', true)}" title="{l s='contact' mod='blockpermanentlinks'}">{l s='contact' mod='blockpermanentlinks'}</a></li>
+	<li id="header_link_sitemap"><a href="{$link->getPageLink('sitemap')}" title="{l s='sitemap' mod='blockpermanentlinks'}">{l s='sitemap' mod='blockpermanentlinks'}</a></li>
 	<li id="header_link_bookmark">
 	 
 		<script type="text/javascript">writeBookmarkLink('{$come_from}', '{$meta_title|addslashes|addslashes}', '{l s='bookmark' mod='blockpermanentlinks'}');</script>
--- a/modules/blockpermanentlinks/blockpermanentlinks.tpl
+++ b/modules/blockpermanentlinks/blockpermanentlinks.tpl
@@ -28,13 +28,13 @@
 <div id="permanent_links">
 	<!-- Sitemap -->
 	<div class="sitemap">
-		<a href="{$link->getPageLink('sitemap.php')}"><img src="{$img_dir}icon/sitemap.gif" alt="{l s='sitemap' mod='blockpermanentlinks'}" title="{l s='sitemap' mod='blockpermanentlinks'}" /></a>&nbsp;
-		<a href="{$link->getPageLink('sitemap.php')}">{l s='sitemap' mod='blockpermanentlinks'}</a>
+		<a href="{$link->getPageLink('sitemap')}"><img src="{$img_dir}icon/sitemap.gif" alt="{l s='sitemap' mod='blockpermanentlinks'}" title="{l s='sitemap' mod='blockpermanentlinks'}" /></a>&nbsp;
+		<a href="{$link->getPageLink('sitemap')}">{l s='sitemap' mod='blockpermanentlinks'}</a>
 	</div>
 	<!-- Contact -->
 	<div class="contact">
-		<a href="{$link->getPageLink('contact-form.php', true)}"><img src="{$img_dir}icon/contact.gif" alt="{l s='contact' mod='blockpermanentlinks'}" title="{l s='contact' mod='blockpermanentlinks'}" /></a>&nbsp;
-		<a href="{$link->getPageLink('contact-form.php', true)}">{l s='contact' mod='blockpermanentlinks'}</a>
+		<a href="{$link->getPageLink('contact-form', true)}"><img src="{$img_dir}icon/contact.gif" alt="{l s='contact' mod='blockpermanentlinks'}" title="{l s='contact' mod='blockpermanentlinks'}" /></a>&nbsp;
+		<a href="{$link->getPageLink('contact-form', true)}">{l s='contact' mod='blockpermanentlinks'}</a>
 	</div>
 	<!-- Bookmark -->
 	<div class="add_bookmark">
--- a/modules/blocksearch/blocksearch-top.tpl
+++ b/modules/blocksearch/blocksearch-top.tpl
@@ -27,7 +27,7 @@
 <!-- Block search module TOP -->
 <div id="search_block_top">

-	<form method="get" action="{$link->getPageLink('search.php')}" id="searchbox">
+	<form method="get" action="{$link->getPageLink('search')}" id="searchbox">
 		<p>
 			<label for="search_query_top"><!-- image on background --></label>
 			<input type="hidden" name="orderby" value="position" />
@@ -62,7 +62,7 @@
 			if($(this).val().length > 0){
 				stopInstantSearchQueries();
 				instantSearchQuery = $.ajax({
-				url: '{/literal}{if $search_ssl == 1}{$link->getPageLink('search.php', true)}{else}{$link->getPageLink('search.php')}{/if}{literal}',
+				url: '{/literal}{if $search_ssl == 1}{$link->getPageLink('search', true)}{else}{$link->getPageLink('search')}{/if}{literal}',
 				data: 'instantSearch=1&id_lang={/literal}{$cookie->id_lang}{literal}&q='+$(this).val(),
 				dataType: 'html',
 				success: function(data){
@@ -98,7 +98,7 @@
 		$('document').ready( function() {
 			$("#search_query_top")
 				.autocomplete(
-					'{/literal}{if $search_ssl == 1}{$link->getPageLink('search.php', true)}{else}{$link->getPageLink('search.php')}{/if}{literal}', {
+					'{/literal}{if $search_ssl == 1}{$link->getPageLink('search', true)}{else}{$link->getPageLink('search')}{/if}{literal}', {
 						minChars: 3,
 						max: 10,
 						width: 500,
@@ -129,4 +129,4 @@
 	// ]]>
 	</script>
 {/if}
-<!-- /Block search module TOP -->
+<!-- /Block search module TOP -->
--- a/modules/blocksearch/blocksearch.tpl
+++ b/modules/blocksearch/blocksearch.tpl
@@ -27,7 +27,7 @@
 <!-- Block search module -->
 <div id="search_block_left" class="block exclusive">
 	<h4>{l s='Search' mod='blocksearch'}</h4>
-	<form method="get" action="{$link->getPageLink('search.php', true)}" id="searchbox">
+	<form method="get" action="{$link->getPageLink('search', true)}" id="searchbox">
 		<p class="block_content">
 			<label for="search_query_block">{l s='Enter a product name' mod='blocksearch'}</label>
 			<input type="hidden" name="orderby" value="position" />
@@ -62,7 +62,7 @@
 			if($(this).val().length > 0){
 				stopInstantSearchQueries();
 				instantSearchQuery = $.ajax({
-				url: '{/literal}{if $search_ssl == 1}{$link->getPageLink('search.php', true)}{else}{$link->getPageLink('search.php')}{/if}{literal}',
+				url: '{/literal}{if $search_ssl == 1}{$link->getPageLink('search', true)}{else}{$link->getPageLink('search')}{/if}{literal}',
 				data: 'instantSearch=1&id_lang={/literal}{$cookie->id_lang}{literal}&q='+$(this).val(),
 				dataType: 'html',
 				success: function(data){
@@ -98,7 +98,7 @@
 		$('document').ready( function() {
 			$("#search_query_block")
 				.autocomplete(
-					'{/literal}{if $search_ssl == 1}{$link->getPageLink('search.php', true)}{else}{$link->getPageLink('search.php')}{/if}{literal}', {
+					'{/literal}{if $search_ssl == 1}{$link->getPageLink('search', true)}{else}{$link->getPageLink('search')}{/if}{literal}', {
 						minChars: 3,
 						max: 10,
 						width: 500,
--- a/modules/blockspecials/blockspecials.tpl
+++ b/modules/blockspecials/blockspecials.tpl
@@ -26,7 +26,7 @@

 <!-- MODULE Block specials -->
 <div id="special_block_right" class="block products_block exclusive blockspecials">
-	<h4><a href="{$link->getPageLink('prices-drop.php')}" title="{l s='Specials' mod='blockspecials'}">{l s='Specials' mod='blockspecials'}</a></h4>
+	<h4><a href="{$link->getPageLink('prices-drop')}" title="{l s='Specials' mod='blockspecials'}">{l s='Specials' mod='blockspecials'}</a></h4>
 	<div class="block_content">

 {if $special}
@@ -48,11 +48,12 @@
 			</li>
 		</ul>
 		<p>
-			<a href="{$link->getPageLink('prices-drop.php')}" title="{l s='All specials' mod='blockspecials'}" class="button_large">{l s='All specials' mod='blockspecials'}</a>
+			<a href="{$link->getPageLink('prices-drop')}" title="{l s='All specials' mod='blockspecials'}" class="button_large">{l s='All specials' mod='blockspecials'}</a>
 		</p>
 {else}
 		<p>{l s='No specials at this time' mod='blockspecials'}</p>
 {/if}
 	</div>
 </div>
-<!-- /MODULE Block specials -->
+<!-- /MODULE Block specials -->
+
--- a/modules/blockstore/blockstore.tpl
+++ b/modules/blockstore/blockstore.tpl
@@ -26,11 +26,11 @@

 <!-- Block stores module -->
 <div id="stores_block_left" class="block">
-	<h4><a href="{$link->getPageLink('stores.php')}" title="{l s='Our stores' mod='blockstore'}">{l s='Our stores' mod='blockstore'}</a></h4>
+	<h4><a href="{$link->getPageLink('stores')}" title="{l s='Our stores' mod='blockstore'}">{l s='Our stores' mod='blockstore'}</a></h4>
 	<div class="block_content blockstore">
 		<p>
-			<a href="{$link->getPageLink('stores.php')}" title="{l s='Our stores' mod='blockstore'}"><img src="{$module_dir}{$store_img}" alt="{l s='Our stores' mod='blockstore'}" width="174" height="115" /></a><br />
-			<a href="{$link->getPageLink('stores.php')}" title="{l s='Our stores' mod='blockstore'}">{l s='Discover our stores' mod='blockstore'}</a>
+			<a href="{$link->getPageLink('stores')}" title="{l s='Our stores' mod='blockstore'}"><img src="{$module_dir}{$store_img}" alt="{l s='Our stores' mod='blockstore'}" width="174" height="115" /></a><br />
+			<a href="{$link->getPageLink('stores')}" title="{l s='Our stores' mod='blockstore'}">{l s='Discover our stores' mod='blockstore'}</a>
 		</p>
 	</div>
 </div>
--- a/modules/blocksupplier/blocksupplier.tpl
+++ b/modules/blocksupplier/blocksupplier.tpl
@@ -26,7 +26,7 @@

 <!-- Block suppliers module -->
 <div id="suppliers_block_left" class="block blocksupplier">
-	<h4>{if $display_link_supplier}<a href="{$link->getPageLink('supplier.php')}" title="{l s='Suppliers' mod='blocksupplier'}">{/if}{l s='Suppliers' mod='blocksupplier'}{if $display_link_supplier}</a>{/if}</h4>
+	<h4>{if $display_link_supplier}<a href="{$link->getPageLink('supplier')}" title="{l s='Suppliers' mod='blocksupplier'}">{/if}{l s='Suppliers' mod='blocksupplier'}{if $display_link_supplier}</a>{/if}</h4>
 	<div class="block_content">
 {if $suppliers}
 	{if $text_list}
--- a/modules/blocktags/blocktags.tpl
+++ b/modules/blocktags/blocktags.tpl
@@ -30,7 +30,7 @@
 	<p class="block_content">
 {if $tags}
 	{foreach from=$tags item=tag name=myLoop}
-		<a href="{$link->getPageLink('search.php')}?tag={$tag.name|urlencode}" title="{l s='More about' mod='blocktags'} {$tag.name|escape:html:'UTF-8'}" class="{$tag.class} {if $smarty.foreach.myLoop.last}last_item{elseif $smarty.foreach.myLoop.first}first_item{else}item{/if}">{$tag.name|escape:html:'UTF-8'}</a>
+		<a href="{$link->getPageLink('search')}?tag={$tag.name|urlencode}" title="{l s='More about' mod='blocktags'} {$tag.name|escape:html:'UTF-8'}" class="{$tag.class} {if $smarty.foreach.myLoop.last}last_item{elseif $smarty.foreach.myLoop.first}first_item{else}item{/if}">{$tag.name|escape:html:'UTF-8'}</a>
 	{/foreach}
 {else}
 	{l s='No tags specified yet' mod='blocktags'}
--- a/modules/blockuserinfo/blockuserinfo.tpl
+++ b/modules/blockuserinfo/blockuserinfo.tpl
@@ -30,15 +30,15 @@
 		{l s='Welcome' mod='blockuserinfo'},
 		{if $cookie->isLogged()}
 			<span>{$cookie->customer_firstname} {$cookie->customer_lastname}</span>
-			(<a href="{$link->getPageLink('index.php')}?mylogout" title="{l s='Log me out' mod='blockuserinfo'}">{l s='Log out' mod='blockuserinfo'}</a>)
+			(<a href="{$link->getPageLink('index')}?mylogout" title="{l s='Log me out' mod='blockuserinfo'}">{l s='Log out' mod='blockuserinfo'}</a>)
 		{else}
-			<a href="{$link->getPageLink('my-account.php', true)}">{l s='Log in' mod='blockuserinfo'}</a>
+			<a href="{$link->getPageLink('my-account', true)}">{l s='Log in' mod='blockuserinfo'}</a>
 		{/if}
 	</p>
 	<ul id="header_nav">
 		{if !$PS_CATALOG_MODE}
 		<li id="shopping_cart">
-			<a href="{$link->getPageLink("$order_process.php", true)}" title="{l s='Your Shopping Cart' mod='blockuserinfo'}">{l s='Cart:' mod='blockuserinfo'}</a>
+			<a href="{$link->getPageLink("$order_process", true)}" title="{l s='Your Shopping Cart' mod='blockuserinfo'}">{l s='Cart:' mod='blockuserinfo'}</a>
 			<span class="ajax_cart_quantity{if $cart_qties == 0} hidden{/if}">{$cart_qties}</span>
 			<span class="ajax_cart_product_txt{if $cart_qties != 1} hidden{/if}">{l s='product' mod='blockuserinfo'}</span>
 			<span class="ajax_cart_product_txt_s{if $cart_qties < 2} hidden{/if}">{l s='products' mod='blockuserinfo'}</span>
@@ -56,7 +56,7 @@
 			<span class="ajax_cart_no_product{if $cart_qties > 0} hidden{/if}">{l s='(empty)' mod='blockuserinfo'}</span>
 		</li>
 		{/if}
-		<li id="your_account"><a href="{$link->getPageLink('my-account.php', true)}" title="{l s='Your Account' mod='blockuserinfo'}">{l s='Your Account' mod='blockuserinfo'}</a></li>
+		<li id="your_account"><a href="{$link->getPageLink('my-account', true)}" title="{l s='Your Account' mod='blockuserinfo'}">{l s='Your Account' mod='blockuserinfo'}</a></li>
 	</ul>
 </div>
 <!-- /Block user information module HEADER -->
--- a/modules/blockwishlist/mywishlist.php
+++ b/modules/blockwishlist/mywishlist.php
@@ -86,7 +86,7 @@ if ($cookie->isLogged())
 }
 else
 {
-	Tools::redirect('authentication.php?back=modules/blockwishlist/mywishlist.php');
+	Tools::redirect('index.php/authentication?back=modules/blockwishlist/mywishlist.php');
 }

 $smarty->assign(array(
--- a/modules/blockwishlist/mywishlist.tpl
+++ b/modules/blockwishlist/mywishlist.tpl
@@ -31,7 +31,7 @@
 </script>

 <div id="mywishlist">
-	{capture name=path}<a href="{$link->getPageLink('my-account.php', true)}">{l s='My account' mod='blockwishlist'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My wishlists' mod='blockwishlist'}{/capture}
+	{capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='blockwishlist'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My wishlists' mod='blockwishlist'}{/capture}
 	{include file="$tpl_dir./breadcrumb.tpl"}

 	<h2>{l s='My wishlists' mod='blockwishlist'}</h2>
@@ -94,7 +94,7 @@
 	{/if}

 	<ul class="footer_links">
-		<li><a href="{$link->getPageLink('my-account.php', true)}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /></a><a href="{$link->getPageLink('my-account.php', true)}">{l s='Back to Your Account' mod='blockwishlist'}</a></li>
+		<li><a href="{$link->getPageLink('my-account', true)}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /></a><a href="{$link->getPageLink('my-account', true)}">{l s='Back to Your Account' mod='blockwishlist'}</a></li>
 		<li><a href="{$base_dir}"><img src="{$img_dir}icon/home.gif" alt="" class="icon" /></a><a href="{$base_dir}">{l s='Home' mod='blockwishlist'}</a></li>
 	</ul>
 </div>
--- a/modules/blockwishlist/view.tpl
+++ b/modules/blockwishlist/view.tpl
@@ -71,7 +71,7 @@
 			<a class="button_small clear" href="{$link->getProductLink($product.id_product,  $product.link_rewrite, $product.category_rewrite)}" title="{l s='View' mod='blockwishlist'}">{l s='View' mod='blockwishlist'}</a>
 			{if isset($product.attribute_quantity) AND $product.attribute_quantity >= 1 OR !isset($product.attribute_quantity) AND $product.product_quantity >= 1}
 			{if !$ajax}
-			<form id="addtocart_{$product.id_product|intval}_{$product.id_product_attribute|intval}" action="{$link->getPageLink('cart.php')}" method="post">
+			<form id="addtocart_{$product.id_product|intval}_{$product.id_product_attribute|intval}" action="{$link->getPageLink('cart')}" method="post">
 			<p class="hidden">
 				<input type="hidden" name="id_product" value="{$product.id_product|intval}" id="product_page_product_id"  />
 				<input type="hidden" name="add" value="1" />
--- a/modules/cashondelivery/confirmation.tpl
+++ b/modules/cashondelivery/confirmation.tpl
@@ -28,5 +28,5 @@
 	<br /><br />
 	{l s='You have chosen the cash on delivery method.' mod='cashondelivery'}
 	<br /><br /><span class="bold">{l s='Your order will be sent very soon.' mod='cashondelivery'}</span>
-	<br /><br />{l s='For any questions or for further information, please contact our' mod='cashondelivery'} <a href="{$link->getPageLink('contact-form.php', true)}">{l s='customer support' mod='cashondelivery'}</a>.
+	<br /><br />{l s='For any questions or for further information, please contact our' mod='cashondelivery'} <a href="{$link->getPageLink('contact-form', true)}">{l s='customer support' mod='cashondelivery'}</a>.
 </p>
--- a/modules/cashondelivery/validation.tpl
+++ b/modules/cashondelivery/validation.tpl
@@ -52,7 +52,7 @@
 		<b>{l s='Please confirm your order by clicking \'I confirm my order\'' mod='cashondelivery'}.</b>
 	</p>
 	<p class="cart_navigation">
-		<a href="{$link->getPageLink('order.php', true)}?step=3" class="button_large">{l s='Other payment methods' mod='cashondelivery'}</a>
+		<a href="{$link->getPageLink('order', true)}?step=3" class="button_large">{l s='Other payment methods' mod='cashondelivery'}</a>
 		<input type="submit" name="submit" value="{l s='I confirm my order' mod='cashondelivery'}" class="exclusive_large" />
 	</p>
 </form>
--- a/modules/cashticket/payment.php
+++ b/modules/cashticket/payment.php
@@ -31,11 +31,11 @@ include(dirname(__FILE__).'/cashticket.php');
 $module = new CashTicket();

 if (!$cart->id OR $cart->id_customer == 0 OR $cart->id_address_delivery == 0 OR $cart->id_address_invoice == 0 OR !$module->active)
-	Tools::redirect('order.php?step=3');
+	Tools::redirect('index.php/order?step=3');

 $currency = new Currency($cart->id_currency);
 if (!$module->isCurrencyActive($currency->iso_code))
-	Tools::redirect('order.php?step=3');
+	Tools::redirect('index.php/order?step=3');

 $amount = number_format((float)($cart->getOrderTotal(true, Cart::BOTH)), 2, '.','');
 if (Tools::getValue('hash') != md5(Configuration::get($module->prefix.'SALT') + $amount + $currency->iso_code)) 
@@ -98,7 +98,7 @@ if ($state == _PS_OS_ERROR_)
 else 
 {
 	$order = new Order($module->currentOrder);
-	Tools::redirect('order-confirmation.php?id_cart='.(int)($cart->id).'&id_module='.(int)($module->id).'&id_order='.(int)($module->currentOrder).'&key='.$order->secure_key);
+	Tools::redirect('index.php/order-confirmation?id_cart='.(int)($cart->id).'&id_module='.(int)($module->id).'&id_order='.(int)($module->currentOrder).'&key='.$order->secure_key);
 }


--- a/modules/cashticket/redirect.php
+++ b/modules/cashticket/redirect.php
@@ -31,11 +31,11 @@ include(dirname(__FILE__).'/cashticket.php');
 $module = new CashTicket();

 if (!$cart->id OR $cart->id_customer == 0 OR $cart->id_address_delivery == 0 OR $cart->id_address_invoice == 0 OR !$module->active)
-	Tools::redirect('order.php?step=3');
+	Tools::redirect('index.php/order?step=3');
 	
 $currency = new Currency($cart->id_currency);
 if (!$module->isCurrencyActive($currency->iso_code))
-	Tools::redirect('order.php?step=3');
+	Tools::redirect('index.php/order?step=3');

 $result = $module->createDisposition($cart);

--- a/modules/cheque/payment.php
+++ b/modules/cheque/payment.php
@@ -33,7 +33,7 @@ include(dirname(__FILE__).'/../../header.php');
 include(dirname(__FILE__).'/cheque.php');

 if (!$cookie->isLogged(true))
-    Tools::redirect('authentication.php?back=order.php');
+    Tools::redirect('index.php/authentication?back=order.php');
 	
 $cheque = new Cheque();
 echo $cheque->execPayment($cart);
--- a/modules/cheque/payment.tpl
+++ b/modules/cheque/payment.tpl
@@ -25,8 +25,8 @@
 *}

 <p class="payment_module">
-	<a href="{$this_path_ssl}payment.php" title="{l s='Pay by cheque' mod='cheque'}">
+	<a href="{$this_path_ssl}payment" title="{l s='Pay by cheque' mod='cheque'}">
 		<img src="{$this_path}cheque.jpg" alt="{l s='Pay by cheque' mod='cheque'}" width="86" height="49" />
 		{l s='Pay by cheque (order process will be longer)' mod='cheque'}
 	</a>
-</p>
+</p>
--- a/modules/cheque/payment_execution.tpl
+++ b/modules/cheque/payment_execution.tpl
@@ -73,7 +73,7 @@
 		<b>{l s='Please confirm your order by clicking \'I confirm my order\'' mod='cheque'}.</b>
 	</p>
 	<p class="cart_navigation">
-		<a href="{$link->getPageLink('order.php', true)}?step=3" class="button_large">{l s='Other payment methods' mod='cheque'}</a>
+		<a href="{$link->getPageLink('order', true)}?step=3" class="button_large">{l s='Other payment methods' mod='cheque'}</a>
 		<input type="submit" name="submit" value="{l s='I confirm my order' mod='cheque'}" class="exclusive_large" />
 	</p>
 </form>
--- a/modules/cheque/payment_return.tpl
+++ b/modules/cheque/payment_return.tpl
@@ -33,11 +33,11 @@
 		<br /><br />- {l s='mail to' mod='cheque'} <span class="bold">{if $chequeAddress}{$chequeAddress}{else}___________{/if}</span>
 		<br /><br />{l s='An e-mail has been sent to you with this information.' mod='cheque'}
 		<br /><br /><span class="bold">{l s='Your order will be sent as soon as we receive your payment.' mod='cheque'}</span>
-		<br /><br />{l s='For any questions or for further information, please contact our' mod='cheque'} <a href="{$link->getPageLink('contact-form.php', true)}">{l s='customer support' mod='cheque'}</a>.
+		<br /><br />{l s='For any questions or for further information, please contact our' mod='cheque'} <a href="{$link->getPageLink('contact-form', true)}">{l s='customer support' mod='cheque'}</a>.
 	</p>
 {else}
 	<p class="warning">
 		{l s='We noticed a problem with your order. If you think this is an error, you can contact our' mod='cheque'} 
-		<a href="{$link->getPageLink('contact-form.php', true)}">{l s='customer support' mod='cheque'}</a>.
+		<a href="{$link->getPageLink('contact-form', true)}">{l s='customer support' mod='cheque'}</a>.
 	</p>
 {/if}
--- a/modules/cheque/validation.php
+++ b/modules/cheque/validation.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -32,12 +32,12 @@ include(dirname(__FILE__).'/cheque.php');
 $cheque = new Cheque();

 if ($cart->id_customer == 0 OR $cart->id_address_delivery == 0 OR $cart->id_address_invoice == 0 OR !$cheque->active)
-	Tools::redirectLink(__PS_BASE_URI__.'order.php?step=1');
+	Tools::redirectLink(__PS_BASE_URI__.'index.php/order?step=1');

 $customer = new Customer((int)$cart->id_customer);

 if (!Validate::isLoadedObject($customer))
-	Tools::redirectLink(__PS_BASE_URI__.'order.php?step=1');
+	Tools::redirectLink(__PS_BASE_URI__.'index.php/order?step=1');

 $currency = new Currency((int)(isset($_POST['currency_payement']) ? $_POST['currency_payement'] : $cookie->id_currency));
 $total = (float)($cart->getOrderTotal(true, Cart::BOTH));
@@ -49,5 +49,5 @@ $mailVars =	array(

 $cheque->validateOrder((int)($cart->id), _PS_OS_CHEQUE_, $total, $cheque->displayName, NULL, $mailVars, (int)($currency->id), false, $customer->secure_key);

-Tools::redirectLink(__PS_BASE_URI__.'order-confirmation.php?id_cart='.(int)($cart->id).'&id_module='.(int)($cheque->id).'&id_order='.$cheque->currentOrder.'&key='.$customer->secure_key);
+Tools::redirectLink(__PS_BASE_URI__.'index.php/order-confirmation?id_cart='.(int)($cart->id).'&id_module='.(int)($cheque->id).'&id_order='.$cheque->currentOrder.'&key='.$customer->secure_key);

--- a/modules/gcheckout/confirm.tpl
+++ b/modules/gcheckout/confirm.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}

-{capture name=path}<a href="{$link->getPageLink('order.php', true)}">{l s='Your shopping cart' mod='gcheckout'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='Google Checkout' mod='gcheckout'}{/capture}
+{capture name=path}<a href="{$link->getPageLink('order', true)}">{l s='Your shopping cart' mod='gcheckout'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='Google Checkout' mod='gcheckout'}{/capture}
 {include file="$tpl_dir./breadcrumb.tpl"}

 <h2>{l s='Order summary' mod='gcheckout'}</h2>
@@ -49,8 +49,8 @@
 	<b>{l s='Please confirm your order by clicking \'I confirm my order\'' mod='gcheckout'}.</b>
 </p>
 <p class="cart_navigation">
-	<a href="{$link->getPageLink('order.php', true)}?step=3" class="button_large">{l s='Other payment methods' mod='gcheckout'}</a>
+	<a href="{$link->getPageLink('order', true)}?step=3" class="button_large">{l s='Other payment methods' mod='gcheckout'}</a>
 	<a href="#" class="exclusive_large" onclick="$('#gcheckout_form').submit();return false;">{l s='I confirm my order' mod='gcheckout'}</a>
 </p>

-{$googleCheckoutExtraForm}
+{$googleCheckoutExtraForm}
--- a/modules/gcheckout/payment.php
+++ b/modules/gcheckout/payment.php
@@ -30,7 +30,7 @@ include(dirname(__FILE__).'/../../init.php');
 include(dirname(__FILE__).'/gcheckout.php');

 if (!$cookie->isLogged(true))
-    Tools::redirect('authentication.php?back=order.php');
+    Tools::redirect('index.php/authentication?back=order.php');
 elseif (!$cart->getOrderTotal(true, Cart::BOTH))
 	Tools::displayError('Error: Empty cart');

--- a/modules/gsitemap/config.xml
+++ b/modules/gsitemap/config.xml
@@ -8,4 +8,5 @@
 	<tab>seo</tab>
 	<is_configurable>1</is_configurable>
 	<need_instance>1</need_instance>
+	<limited_countries></limited_countries>
 </module>
--- a/modules/gsitemap/gsitemap.php
+++ b/modules/gsitemap/gsitemap.php
@@ -185,6 +185,9 @@ XML;
 			'supplier' => false, 
 			'store' => false);

+		foreach ($pages AS $page => $ssl)
+			foreach($langs as $lang)
+				$this->_addSitemapNode($xml, $link->getPageLink($page, $ssl, $lang['id_lang']), '0.5', 'monthly');

 			if(Configuration::get('PS_REWRITING_SETTINGS'))		
 				foreach ($pages AS $page => $ssl)		
--- a/modules/hipay/redirect.php
+++ b/modules/hipay/redirect.php
@@ -33,7 +33,7 @@ include(dirname(__FILE__).'/../../init.php');
 include(dirname(__FILE__).'/hipay.php');

 if (!$cookie->isLogged(true))
-    Tools::redirect('authentication.php?back=order.php');
+    Tools::redirect('index.php/authentication?back=order.php');

 $hipay = new HiPay();
 $hipay->payment();
--- a/modules/homefeatured/homefeatured.tpl
+++ b/modules/homefeatured/homefeatured.tpl
@@ -45,7 +45,7 @@
 						<a class="button" href="{$product.link}" title="{l s='View' mod='homefeatured'}">{l s='View' mod='homefeatured'}</a>
 						{if ($product.id_product_attribute == 0 OR (isset($add_prod_display) AND ($add_prod_display == 1))) AND $product.available_for_order AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}
 							{if ($product.quantity > 0 OR $product.allow_oosp) AND $product.customizable != 2}
-							<a class="exclusive ajax_add_to_cart_button" rel="ajax_id_product_{$product.id_product}" href="{$link->getPageLink('cart.php')}?qty=1&amp;id_product={$product.id_product}&amp;token={$static_token}&amp;add" title="{l s='Add to cart' mod='homefeatured'}">{l s='Add to cart' mod='homefeatured'}</a>
+							<a class="exclusive ajax_add_to_cart_button" rel="ajax_id_product_{$product.id_product}" href="{$link->getPageLink('cart')}?qty=1&amp;id_product={$product.id_product}&amp;token={$static_token}&amp;add" title="{l s='Add to cart' mod='homefeatured'}">{l s='Add to cart' mod='homefeatured'}</a>
 							{else}
 							<span class="exclusive">{l s='Add to cart' mod='homefeatured'}</span>
 							{/if}
--- a/modules/loyalty/loyalty-program.php
+++ b/modules/loyalty/loyalty-program.php
@@ -35,7 +35,7 @@ include_once(dirname(__FILE__).'/LoyaltyModule.php');
 include_once(dirname(__FILE__).'/LoyaltyStateModule.php');

 if (!$cookie->isLogged())
-	Tools::redirect('authentication.php?back=modules/loyalty/loyalty-program.php');
+	Tools::redirect('index.php/authentication?back=modules/loyalty/loyalty-program.php');

 Tools::addCSS(_PS_CSS_DIR_.'jquery.cluetip.css', 'all');
 Tools::addJS(array(_PS_JS_DIR_.'jquery/jquery.dimensions.js',_PS_JS_DIR_.'jquery/jquery.cluetip.js'));
--- a/modules/loyalty/loyalty.tpl
+++ b/modules/loyalty/loyalty.tpl
@@ -30,7 +30,7 @@
 -->
 </script>

-{capture name=path}<a href="{$link->getPageLink('my-account.php', true)}">{l s='My account' mod='loyalty'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My loyalty points' mod='loyalty'}{/capture}
+{capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='loyalty'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My loyalty points' mod='loyalty'}{/capture}
 {include file="$tpl_dir./breadcrumb.tpl"}

 <h2>{l s='My loyalty points' mod='loyalty'}</h2>
@@ -199,6 +199,6 @@ $(document).ready(function()
 {/if}

 <ul class="footer_links">
-	<li><a href="{$link->getPageLink('my-account.php', true)}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /></a><a href="{$link->getPageLink('my-account.php', true)}">{l s='Back to Your Account' mod='loyalty'}</a></li>
+	<li><a href="{$link->getPageLink('my-account', true)}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /></a><a href="{$link->getPageLink('my-account', true)}">{l s='Back to Your Account' mod='loyalty'}</a></li>
 	<li><a href="{$base_dir}"><img src="{$img_dir}icon/home.gif" alt="" class="icon" /></a><a href="{$base_dir}">{l s='Home' mod='loyalty'}</a></li>
 </ul>
--- a/modules/mailalerts/myalerts.tpl
+++ b/modules/mailalerts/myalerts.tpl
@@ -31,7 +31,7 @@
 </script>

 <div id="myalerts">
-	{capture name=path}<a href="{$link->getPageLink('my-account.php', true)}">{l s='My account' mod='mailalerts'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My alerts' mod='mailalerts'}{/capture}
+	{capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='mailalerts'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='My alerts' mod='mailalerts'}{/capture}
 	{include file="$tpl_dir./breadcrumb.tpl"}

 	<h2>{l s='My alerts' mod='mailalerts'}</h2>
@@ -73,7 +73,7 @@
 	{/if}

 	<ul class="footer_links">
-		<li><a href="{$link->getPageLink('my-account.php', true)}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /></a><a href="{$link->getPageLink('my-account.php', true)}">{l s='Back to Your Account' mod='mailalerts'}</a></li>
+		<li><a href="{$link->getPageLink('my-account', true)}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /></a><a href="{$link->getPageLink('my-account', true)}">{l s='Back to Your Account' mod='mailalerts'}</a></li>
 		<li><a href="{$base_dir}"><img src="{$img_dir}icon/home.gif" alt="" class="icon" /></a><a href="{$base_dir}">{l s='Home' mod='mailalerts'}</a></li>
 	</ul>
 </div>
--- a/modules/mondialrelay/mondialrelay.php
+++ b/modules/mondialrelay/mondialrelay.php
@@ -340,7 +340,7 @@ class MondialRelay extends Module
 			{
 				
 				if (empty($_POST['MR_Selected_Num_'.$cart->id_carrier])) // Case error : the customer didn't choose a 'relais' but selected Relais Colis TNT as a carrier 
-					Tools::redirect('order.php?step=2&mr_null');
+					Tools::redirect('index.php/order?step=2&mr_null');
 				else
 				{
 					Db::getInstance()->delete(_DB_PREFIX_.'mr_selected','id_cart = "'.(int)($cart->id).'"');
--- a/modules/moneybookers/confirmation.tpl
+++ b/modules/moneybookers/confirmation.tpl
@@ -27,18 +27,18 @@
 {if $status == 'ok'}
 	<p>{l s='Your order on' mod='moneybookers'} <span class="bold">{$shop_name}</span> {l s='is complete.' mod='moneybookers'}
 		<br /><br /><span class="bold">{l s='Your order will be shipped as soon as possible.' mod='moneybookers'}</span>
-		<br /><br />{l s='For any questions or for further information, please contact our' mod='moneybookers'} <a href="{$link->getPageLink('contact-form.php', true)}">{l s='customer support' mod='moneybookers'}</a>.
+		<br /><br />{l s='For any questions or for further information, please contact our' mod='moneybookers'} <a href="{$link->getPageLink('contact-form', true)}">{l s='customer support' mod='moneybookers'}</a>.
 	</p>
 {else}
 	{if $status == 'pending'}
 		<p>{l s='Your order on' mod='moneybookers'} <span class="bold">{$shop_name}</span> {l s='is pending.' mod='moneybookers'}
 			<br /><br /><span class="bold">{l s='Your order will be shipped as soon as we receive your bankwire.' mod='moneybookers'}</span>
-			<br /><br />{l s='For any questions or for further information, please contact our' mod='moneybookers'} <a href="{$link->getPageLink('contact-form.php', true)}">{l s='customer support' mod='moneybookers'}</a>.
+			<br /><br />{l s='For any questions or for further information, please contact our' mod='moneybookers'} <a href="{$link->getPageLink('contact-form', true)}">{l s='customer support' mod='moneybookers'}</a>.
 		</p>
 	{else}
 		<p class="warning">
 			{l s='We noticed a problem with your order. If you think this is an error, you can contact our' mod='moneybookers'} 
-			<a href="{$link->getPageLink('contact-form.php', true)}">{l s='customer support' mod='moneybookers'}</a>.
+			<a href="{$link->getPageLink('contact-form', true)}">{l s='customer support' mod='moneybookers'}</a>.
 		</p>
 	{/if}
 {/if}
--- a/modules/ogone/config.xml
+++ b/modules/ogone/config.xml
@@ -8,4 +8,5 @@
 	<tab>payments_gateways</tab>
 	<is_configurable>1</is_configurable>
 	<need_instance>1</need_instance>
+	<limited_countries></limited_countries>
 </module>
--- a/modules/ogone/confirmation.php
+++ b/modules/ogone/confirmation.php
@@ -39,7 +39,7 @@ $smarty->assign(array(
 	'id_module' => $id_module,
 	'id_cart' => $id_cart,
 	'key' => $key,
-	'ogone_link' => (method_exists($link, 'getPageLink') ? $link->getPageLink('my-account.php') : _PS_BASE_URL_.'my-account.php')
+	'ogone_link' => (method_exists($link, 'getPageLink') ? $link->getPageLink('my-account') : _PS_BASE_URL_.'my-account')
 	));
 echo $ogone->display(__FILE__, 'waiting.tpl');

--- a/modules/ogone/ogone.php
+++ b/modules/ogone/ogone.php
@@ -186,7 +186,7 @@ class Ogone extends PaymentModule
 		else
 			$smarty->assign('status', 'failed');
 		$link = new Link();
-		$smarty->assign('ogone_link', (method_exists($link, 'getPageLink') ? $link->getPageLink('contact-form.php', true) : Tools::getHttpHost(true).'contact-form.php'));
+		$smarty->assign('ogone_link', (method_exists($link, 'getPageLink') ? $link->getPageLink('contact-form', true) : Tools::getHttpHost(true).'contact-form'));
 		return $this->display(__FILE__, 'hookorderconfirmation.tpl');
 	}
 	
--- a/modules/paypal/confirm.tpl
+++ b/modules/paypal/confirm.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}

-{capture name=path}<a href="{$link->getPageLink('order.php', true)}">{l s='Your shopping cart' mod='paypal'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='PayPal' mod='paypal'}{/capture}
+{capture name=path}<a href="{$link->getPageLink('order', true)}">{l s='Your shopping cart' mod='paypal'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='PayPal' mod='paypal'}{/capture}
 {include file="$tpl_dir./breadcrumb.tpl"}

 <h2>{l s='Order summary' mod='paypal'}</h2>
@@ -54,7 +54,7 @@
 		<b>{l s='Please confirm your order by clicking \'I confirm my order\'' mod='paypal'}.</b>
 	</p>
 	<p class="cart_navigation">
-		<a href="{$link->getPageLink('order.php', true)}?step=3" class="button_large">{l s='Other payment methods' mod='paypal'}</a>
+		<a href="{$link->getPageLink('order', true)}?step=3" class="button_large">{l s='Other payment methods' mod='paypal'}</a>
 		<input type="submit" name="submitPayment" value="{l s='I confirm my order' mod='paypal'}" class="exclusive_large" />
 	</p>
 </form>
--- a/modules/paypal/confirmation.tpl
+++ b/modules/paypal/confirmation.tpl
@@ -28,5 +28,5 @@
 	<br /><br />
 	{l s='You have chosen the PayPal method.' mod='paypal'}
 	<br /><br /><span class="bold">{l s='Your order will be sent very soon.' mod='paypal'}</span>
-	<br /><br />{l s='For any questions or for further information, please contact our' mod='paypal'} <a href="{$link->getPageLink('contact-form.php', true)}">{l s='customer support' mod='paypal'}</a>.
+	<br /><br />{l s='For any questions or for further information, please contact our' mod='paypal'} <a href="{$link->getPageLink('contact-form', true)}">{l s='customer support' mod='paypal'}</a>.
 </p>
--- a/modules/paypal/error.tpl
+++ b/modules/paypal/error.tpl
@@ -24,7 +24,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}

-{capture name=path}<a href="{$link->getPageLink('order.php', true)}">{l s='Your shopping cart' mod='paypal'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='PayPal' mod='paypal'}{/capture}
+{capture name=path}<a href="{$link->getPageLink('order', true)}">{l s='Your shopping cart' mod='paypal'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='PayPal' mod='paypal'}{/capture}
 {include file="$tpl_dir./breadcrumb.tpl"}

 <h2>{$message}</h2>
--- a/modules/paypal/express/login.tpl
+++ b/modules/paypal/express/login.tpl
@@ -47,6 +47,6 @@
 			<input type="hidden" name="payerID" value="{$payerID|escape:'htmlall'|stripslashes}" />
 			<input type="submit" id="submitLogin" name="submitLogin" class="button" value="{l s='Log in' mod='paypal'}" />
 		</p>
-		<p class="lost_password center"><a href="{$link->getPageLink('password.php')}">{l s='Forgot your password?' mod='paypal'}</a></p>
+		<p class="lost_password center"><a href="{$link->getPageLink('password')}">{l s='Forgot your password?' mod='paypal'}</a></p>
 	</fieldset>
 </form>
--- a/modules/paypal/express/submit.php
+++ b/modules/paypal/express/submit.php
@@ -88,7 +88,7 @@ function displayProcess($payerID)

 	$cookie->paypal_token = strval($cookie->paypal_token);
 	$cookie->paypal_payer_id = $payerID;
-	Tools::redirect('order.php?step=1&back=paypal');
+	Tools::redirect('index.php/order?step=1&back=paypal');
 }

 function displayConfirm()
--- a/modules/paysafecard/payment.php
+++ b/modules/paysafecard/payment.php
@@ -31,11 +31,11 @@ include(dirname(__FILE__).'/paysafecard.php');
 $module = new PaysafeCard();

 if (!$cart->id OR $cart->id_customer == 0 OR $cart->id_address_delivery == 0 OR $cart->id_address_invoice == 0 OR !$module->active)
-	Tools::redirect('order.php?step=3');
+	Tools::redirect('index.php/order?step=3');

 $currency = new Currency($cart->id_currency);
 if (!$module->isCurrencyActive($currency->iso_code))
-	Tools::redirect('order.php?step=3');
+	Tools::redirect('index.php/order?step=3');

 $amount = number_format((float)($cart->getOrderTotal(true, Cart::BOTH)), 2, '.','');
 if (Tools::getValue('hash') != md5(Configuration::get($module->prefix.'SALT') + $amount + $currency->iso_code)) 
@@ -95,7 +95,7 @@ if ($state == _PS_OS_ERROR_)
 else 
 {
 	$order = new Order($module->currentOrder);
-	Tools::redirect('order-confirmation.php?id_cart='.(int)($cart->id).'&id_module='.(int)($module->id).'&id_order='.(int)($module->currentOrder).'&key='.$order->secure_key);
+	Tools::redirect('index.php/order-confirmation?id_cart='.(int)($cart->id).'&id_module='.(int)($module->id).'&id_order='.(int)($module->currentOrder).'&key='.$order->secure_key);
 }


--- a/modules/paysafecard/redirect.php
+++ b/modules/paysafecard/redirect.php
@@ -31,11 +31,11 @@ include(dirname(__FILE__).'/paysafecard.php');
 $module = new PaysafeCard();

 if (!$cart->id OR $cart->id_customer == 0 OR $cart->id_address_delivery == 0 OR $cart->id_address_invoice == 0 OR !$module->active)
-	Tools::redirect('order.php?step=3');
+	Tools::redirect('index.php/order?step=3');
 	
 $currency = new Currency($cart->id_currency);
 if (!$module->isCurrencyActive($currency->iso_code))
-	Tools::redirect('order.php?step=3');
+	Tools::redirect('index.php/order?step=3');

 $result = $module->createDisposition($cart);

--- a/modules/referralprogram/referralprogram-program.php
+++ b/modules/referralprogram/referralprogram-program.php
@@ -33,7 +33,7 @@ require_once(dirname(__FILE__).'/../../init.php');
 include_once(dirname(__FILE__).'/ReferralProgramModule.php');

 if (!$cookie->isLogged())
-	Tools::redirect('authentication.php?back=modules/referralprogram/referralprogram-program.php');
+	Tools::redirect('index.php/authentication?back=modules/referralprogram/referralprogram-program.php');

 Tools::addCSS(_PS_CSS_DIR_.'thickbox.css', 'all');
 Tools::addJS(array(_PS_JS_DIR_.'jquery/thickbox-modified.js',_PS_JS_DIR_.'jquery/jquery.idTabs.modified.js'));
--- a/modules/referralprogram/referralprogram-program.tpl
+++ b/modules/referralprogram/referralprogram-program.tpl
@@ -38,7 +38,7 @@
 	//]]>
 </script>

-{capture name=path}<a href="{$link->getPageLink('my-account.php', true)}">{l s='My account' mod='referralprogram'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='Referral Program' mod='referralprogram'}{/capture}
+{capture name=path}<a href="{$link->getPageLink('my-account', true)}">{l s='My account' mod='referralprogram'}</a><span class="navigation-pipe">{$navigationPipe}</span>{l s='Referral Program' mod='referralprogram'}{/capture}
 {include file="$tpl_dir./breadcrumb.tpl"}

 <h2>{l s='Referral program' mod='referralprogram'}</h2>
@@ -218,6 +218,6 @@
 </div>

 <ul class="footer_links">
-	<li><a href="{$link->getPageLink('my-account.php', true)}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /></a><a href="{$link->getPageLink('my-account.php', true)}">{l s='Back to Your Account' mod='referralprogram'}</a></li>
+	<li><a href="{$link->getPageLink('my-account', true)}"><img src="{$img_dir}icon/my-account.gif" alt="" class="icon" /></a><a href="{$link->getPageLink('my-account', true)}">{l s='Back to Your Account' mod='referralprogram'}</a></li>
 	<li><a href="{$base_dir}"><img src="{$img_dir}icon/home.gif" alt="" class="icon" /></a><a href="{$base_dir_ssl}">{l s='Home' mod='referralprogram'}</a></li>
 </ul>
--- a/modules/socolissimo/validation.php
+++ b/modules/socolissimo/validation.php
@@ -63,7 +63,7 @@ if (isset($return['SIGNATURE']) AND isset($return['CENAME']) AND isset($return['
 					if (!$cart->update())
 						Tools::redirect();
 					else
-						Tools::redirect('order.php?step=3');
+						Tools::redirect('index.php/order?step=3');
 				}
 				else
 					echo '<div class="alert error"><img src="' . _PS_IMG_ . 'admin/forbbiden.gif" alt="nok" />&nbsp;'.$so->displaySoError('999').'
--- a/modules/trackingfront/stats.php
+++ b/modules/trackingfront/stats.php
@@ -31,7 +31,7 @@ include(dirname(__FILE__).'/trackingfront.php');

 $tf = new TrackingFront();
 if (!$tf->active)
-	Tools::redirect('404.php');
+	Tools::redirect('index.php/404');
 $tf->postProcess();
 echo $tf->isLogged() ? $tf->displayAccount() : $tf->displayLogin();

--- a/my-account.php
+++ b/my-account.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,4 +26,15 @@
 */

 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('MyAccountController')->run();
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/my-account'.$params);
+
--- a/new-products.php
+++ b/new-products.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,4 +26,15 @@
 */

 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('NewProductsController')->run();
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/new-products'.$params);
+
--- a/order-confirmation.php
+++ b/order-confirmation.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,4 +26,15 @@
 */

 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('OrderConfirmationController')->run();
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/order-confirmation'.$params);
+
--- a/order-detail.php
+++ b/order-detail.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,4 +26,15 @@
 */

 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('OrderDetailController')->run();
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/order-detail'.$params);
+
--- a/order-follow.php
+++ b/order-follow.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,4 +26,15 @@
 */

 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('OrderFollowController')->run();
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/order-follow'.$params);
+
--- a/order-opc.php
+++ b/order-opc.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,4 +26,15 @@
 */

 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('OrderOpcController')->run();
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/order-opc'.$params);
+
--- a/order-return.php
+++ b/order-return.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,4 +26,15 @@
 */

 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('OrderReturnController')->run();
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/order-return'.$params);
+
--- a/order-slip.php
+++ b/order-slip.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,4 +26,15 @@
 */

 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('OrderSlipController')->run();
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/order-slip'.$params);
+
--- a/order.php
+++ b/order.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -26,4 +26,15 @@
 */

 require(dirname(__FILE__).'/config/config.inc.php');
-ControllerFactory::getController('OrderController')->run();
+Tools::displayFileAsDeprecated();
+
+// init front controller in order to use Tools::redirect
+$controller = new FrontController();
+$controller->init();
+
+$params = $_SERVER['QUERY_STRING'];
+if (!empty($params))
+	$params = '?'.$params;
+
+Tools::redirect('index.php/order'.$params);
+
--- a/Show More
+++ b/Show More