From c0224d4958f12eb29e8ff8a33b0badad0d6af4e6 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Fri, 16 Sep 2011 15:02:29 +0000
Subject: [PATCH] // Merge -> revision 8624

---
 classes/SpecificPrice.php                | 89 ++++++++++++------------
 classes/Upgrader.php                     | 63 +++++++++++++++++
 install-dev/xml/checkConfig.php          |  3 +-
 modules/autoupgrade/AdminSelfUpgrade.php | 66 +++++++++++++++++-
 modules/autoupgrade/Upgrader.php         | 64 +++++++++++++++++
 modules/autoupgrade/jquery.xml2json.js   |  1 +
 modules/blocklayered/blocklayered.php    | 82 +++++++++++-----------
 7 files changed, 281 insertions(+), 87 deletions(-)
 create mode 100755 modules/autoupgrade/jquery.xml2json.js

diff --git a/classes/SpecificPrice.php b/classes/SpecificPrice.php
index 259f28773..224d9949a 100644
--- a/classes/SpecificPrice.php
+++ b/classes/SpecificPrice.php
@@ -52,14 +52,14 @@ class SpecificPriceCore extends ObjectModel
 	public function getFields()
 	{
 		$this->validateFields();
-		$fields['id_product'] = (int)($this->id_product);
-		$fields['id_shop'] = (int)($this->id_shop);
-		$fields['id_currency'] = (int)($this->id_currency);
-		$fields['id_country'] = (int)($this->id_country);
-		$fields['id_group'] = (int)($this->id_group);
-		$fields['price'] = (float)($this->price);
-		$fields['from_quantity'] = (int)($this->from_quantity);
-		$fields['reduction'] = (float)($this->reduction);
+		$fields['id_product'] = (int)$this->id_product;
+		$fields['id_shop'] = (int)$this->id_shop;
+		$fields['id_currency'] = (int)$this->id_currency;
+		$fields['id_country'] = (int)$this->id_country;
+		$fields['id_group'] = (int)$this->id_group;
+		$fields['price'] = (float)$this->price;
+		$fields['from_quantity'] = (int)$this->from_quantity;
+		$fields['reduction'] = (float)$this->reduction;
 		$fields['reduction_type'] = pSQL($this->reduction_type);
 		$fields['from'] = pSQL($this->from);
 		$fields['to'] = pSQL($this->to);
@@ -68,17 +68,16 @@ class SpecificPriceCore extends ObjectModel
 
 	public static function getByProductId($id_product)
 	{
-		return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
-			SELECT * 
-			FROM `'._DB_PREFIX_.'specific_price` 
-			WHERE `id_product` = '.(int)$id_product);
+		return Db::getInstance()->ExecuteS('
+			SELECT * FROM `'._DB_PREFIX_.'specific_price` WHERE `id_product` = '.(int)$id_product
+		);
 	}
 
 	public static function getIdsByProductId($id_product)
 	{
 		return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
-			SELECT `id_specific_price` 
-			FROM `'._DB_PREFIX_.'specific_price` 
+			SELECT `id_specific_price`
+			FROM `'._DB_PREFIX_.'specific_price`
 			WHERE `id_product` = '.(int)$id_product);
 	}
 
@@ -91,7 +90,7 @@ class SpecificPriceCore extends ObjectModel
        $select .= ' IF (\''.$now.'\' >= `from` AND \''.$now.'\' <= `to`, '.pow(2, 0).', 0) + ';
 
 	    $priority = SpecificPrice::getPriority($id_product);
-	    foreach (array_reverse($priority) AS $k => $field)
+	    foreach (array_reverse($priority) as $k => $field)
            $select .= ' IF (`'.$field.'` = '.(int)(${$field}).', '.pow(2, $k + 1).', 0) + ';
 
 	    return rtrim($select, ' +').') AS `score`';
@@ -121,7 +120,7 @@ class SpecificPriceCore extends ObjectModel
 	{
 		if (!self::isFeatureActive())
 			return array();
-		
+
 		/*
 		** The date is not taken into account for the cache, but this is for the better because it keeps the consistency for the whole script.
 		** The price must not change between the top and the bottom of the page
@@ -146,7 +145,7 @@ class SpecificPriceCore extends ObjectModel
 					AND
 					(`to` = \'0000-00-00 00:00:00\' OR \''.$now.'\' <= `to`)
 				)
-				ORDER BY `from_quantity` DESC, `score` DESC, `from_quantity` DESC');
+				ORDER BY `from_quantity` DESC, `score` DESC');
 		}
 		return self::$_specificPriceCache[$key];
 	}
@@ -186,17 +185,17 @@ class SpecificPriceCore extends ObjectModel
 	{
 		if (!self::isFeatureActive())
 			return array();
-		
+
 		$now = date('Y-m-d H:i:s');
 		$res =  Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
 			SELECT *,
 					'.self::_getScoreQuery($id_product, $id_shop, $id_currency, $id_country, $id_group).'
 			FROM `'._DB_PREFIX_.'specific_price`
-			WHERE	`id_product` IN(0, '.(int)($id_product).') AND
-					`id_shop` IN(0, '.(int)($id_shop).') AND
-					`id_currency` IN(0, '.(int)($id_currency).') AND
-					`id_country` IN(0, '.(int)($id_country).') AND
-					`id_group` IN(0, '.(int)($id_group).')
+			WHERE   `id_product` IN(0, '.(int)$id_product.') AND
+					`id_shop` IN(0, '.(int)$id_shop.') AND
+					`id_currency` IN(0, '.(int)$id_currency.') AND
+					`id_country` IN(0, '.(int)$id_country.') AND
+					`id_group` IN(0, '.(int)$id_group.')
 					AND
 					(
 						(`from` = \'0000-00-00 00:00:00\' OR \''.$now.'\' >= `from`)
@@ -207,16 +206,16 @@ class SpecificPriceCore extends ObjectModel
 		');
 
 		$targeted_prices = array();
-		$last_quantity = NULL; 
+		$last_quantity = null;
 
 		foreach($res as $specific_price)
 		{
 			if (!isset($last_quantity))
-				 $last_quantity = $specific_price['from_quantity']; 
+				 $last_quantity = $specific_price['from_quantity'];
 			else if ($last_quantity == $specific_price['from_quantity'])
 		        break;
 
-			$last_quantity = $specific_price['from_quantity']; 
+			$last_quantity = $specific_price['from_quantity'];
             if ($specific_price['from_quantity'] > 1)
     		    $targeted_prices[] = $specific_price;
 		}
@@ -228,25 +227,25 @@ class SpecificPriceCore extends ObjectModel
 	{
 		if (!self::isFeatureActive())
 			return array();
-		
+
 		$now = date('Y-m-d H:i:s');
 		return Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
 			SELECT *,
 					'.self::_getScoreQuery($id_product, $id_shop, $id_currency, $id_country, $id_group).'
 			FROM `'._DB_PREFIX_.'specific_price`
-			WHERE	`id_product` IN(0, '.(int)($id_product).') AND
-					`id_shop` IN(0, '.(int)($id_shop).') AND
-					`id_currency` IN(0, '.(int)($id_currency).') AND
-					`id_country` IN(0, '.(int)($id_country).') AND
-					`id_group` IN(0, '.(int)($id_group).') AND
-					`from_quantity` >= '.(int)($quantity).'
+			WHERE	`id_product` IN(0, '.(int)$id_product.') AND
+					`id_shop` IN(0, '.(int)$id_shop.') AND
+					`id_currency` IN(0, '.(int)$id_currency.') AND
+					`id_country` IN(0, '.(int)$id_country.') AND
+					`id_group` IN(0, '.(int)$id_group.') AND
+					`from_quantity` >= '.(int)$quantity.'
 					AND
 					(
 						(`from` = \'0000-00-00 00:00:00\' OR \''.$now.'\' >= `from`)
 						AND
 						(`to` = \'0000-00-00 00:00:00\' OR \''.$now.'\' <= `to`)
 					)
-					ORDER BY `score` DESC, `from_quantity` DESC
+					ORDER BY `from_quantity` DESC, `score` DESC
 		');
 	}
 
@@ -254,14 +253,14 @@ class SpecificPriceCore extends ObjectModel
 	{
 		if (!self::isFeatureActive())
 			return array();
-		
+
 		$resource = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
 			SELECT `id_product`
 			FROM `'._DB_PREFIX_.'specific_price`
-			WHERE	`id_shop` IN(0, '.(int)($id_shop).') AND
-					`id_currency` IN(0, '.(int)($id_currency).') AND
-					`id_country` IN(0, '.(int)($id_country).') AND
-					`id_group` IN(0, '.(int)($id_group).') AND
+			WHERE	`id_shop` IN(0, '.(int)$id_shop.') AND
+					`id_currency` IN(0, '.(int)$id_currency.') AND
+					`id_country` IN(0, '.(int)$id_country.') AND
+					`id_group` IN(0, '.(int)$id_group.') AND
 					`from_quantity` = 1 AND
 					(
 						(`from` = \'0000-00-00 00:00:00\' OR \''.$beginning.'\' >= `from`)
@@ -273,22 +272,22 @@ class SpecificPriceCore extends ObjectModel
 		', false);
 		$ids_product = array();
 		while ($row = DB::getInstance()->nextRow($resource))
-			$ids_product[] = (int)($row['id_product']);
+			$ids_product[] = (int)$row['id_product'];
 		return $ids_product;
 	}
 
 	public static function deleteByProductId($id_product)
 	{
-		return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'specific_price` WHERE `id_product` = '.(int)($id_product));
+		return Db::getInstance()->Execute('DELETE FROM `'._DB_PREFIX_.'specific_price` WHERE `id_product` = '.(int)$id_product);
 	}
 
 	public function duplicate($id_product = false)
 	{
 		if ($id_product)
-			$this->id_product = (int)($id_product);
+			$this->id_product = (int)$id_product;
 		return $this->add();
 	}
-	
+
 	/**
 	 * This method is allow to know if a feature is used or active
 	 * @since 1.5.0.1
@@ -298,10 +297,10 @@ class SpecificPriceCore extends ObjectModel
 	{
 		if (self::$feature_active === null)
 			self::$feature_active = (bool)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
-				SELECT COUNT(*) 
+				SELECT COUNT(*)
 				FROM `'._DB_PREFIX_.'specific_price`
 			');
 		return self::$feature_active;
-	} 
+	}
 }
 
diff --git a/classes/Upgrader.php b/classes/Upgrader.php
index 96790abbe..66d28fb78 100644
--- a/classes/Upgrader.php
+++ b/classes/Upgrader.php
@@ -28,6 +28,7 @@
 class UpgraderCore{
 	const DEFAULT_CHECK_VERSION_DELAY_HOURS = 24;
 	public $rss_version_link = 'http://www.prestashop.com/xml/version.xml';
+	public $rss_md5file_link_dir = 'http://www.prestashop.com/xml/md5/';
 	/**
 	 * link contains hte url where to download the file
 	 * 
@@ -35,6 +36,9 @@ class UpgraderCore{
 	 */
 	private $needUpgrade = false;
 	private $noRefresh = false;
+	private $changedFiles = array();
+	private $missingFiles = array();
+	private $versionIsModified = false;
 
 	public $version_name;
 	public $version_num;
@@ -154,4 +158,63 @@ class UpgraderCore{
 			return false;
 	}
 
+	public function getChangedFilesList()
+	{
+		$checksum = simplexml_load_file($this->rss_md5file_link_dir._PS_VERSION_.'.xml');
+		if ($checksum === false)
+			throw new Exception('No checksum xml file for your Prestashop version');
+		$this->browseXmlAndCompare($checksum);	
+		
+		return $this->changedFiles;
+}
+	protected function addChangedFile($path)
+	{
+		$this->versionIsModified = true;
+		$this->changedFiles[] = $path;
+	}
+
+	protected function addMissingFile($path)
+	{
+		$this->versionIsModified = true;
+		$this->missingFiles[] = $path;
+	}
+
+	protected function browseXmlAndCompare($node, &$currentPath = array(), $level = 0)
+	{
+		foreach ($node as $key => $child)
+		{
+			if (is_object($child) && $child->getName() != 'md5file')
+			{
+				$level += 1;
+				$currentPath[$level] = $child->getName();
+				$this->browseXmlAndCompare($child, $currentPath, $level);
+				$level -= 1;
+			}
+			else
+			{
+				$path = '';
+				for ($i=1;$i<=$level;$i++)
+					$path .= $currentPath[$i].'/';
+				$path .= (string)$child->attributes()->name;
+				$path = str_replace('ps_root_dir',_PS_ROOT_DIR_,$path);
+				if(!file_exists($path))
+					$this->addMissingFile($path);
+				else if (!$this->compareChecksum($path, (string)$child->attributes()->sum))
+					$this->addChangedFile($path);
+			}
+		}
+	}
+
+	protected function compareChecksum($path, $originalSum)
+	{
+		if (md5_file($path) == $originalSum)
+			return true;
+		return false;
+	}
+
+	public function isAuthenticPrestashopVersion()
+	{
+		return !$this->versionIsModified;
+	}
+
 }
diff --git a/install-dev/xml/checkConfig.php b/install-dev/xml/checkConfig.php
index a086d3354..ee3e3d9c5 100644
--- a/install-dev/xml/checkConfig.php
+++ b/install-dev/xml/checkConfig.php
@@ -26,7 +26,8 @@
 */
 header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
 header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date dans le passé
-include_once(INSTALL_PATH.'/../classes/ConfigurationTest.php');
+if (!class_exists('ConfigurationTest',false))
+	require_once(INSTALL_PATH.'/../classes/ConfigurationTest.php');
 
 // Functions list to test with 'test_system'
 $funcs = array('fopen', 'fclose', 'fread', 'fwrite', 'rename', 'file_exists', 'unlink', 'rmdir', 'mkdir', 'getcwd', 'chdir', 'chmod');
diff --git a/modules/autoupgrade/AdminSelfUpgrade.php b/modules/autoupgrade/AdminSelfUpgrade.php
index 049556f11..105e2ff83 100644
--- a/modules/autoupgrade/AdminSelfUpgrade.php
+++ b/modules/autoupgrade/AdminSelfUpgrade.php
@@ -457,7 +457,19 @@ $this->standalone = true;
 		$this->nextDesc = $this->l('Upgrade process done. Congratulations ! You can now reactive your shop.');
 		$this->next = '';
 	}
+	public function ajaxProcessCheckFilesVersion()
+	{
+		if ($testOrigCore = $this->upgrader->isAuthenticPrestashopVersion() !== false)
+			$this->nextParams['status'] = 'ok';
+		else
+			$this->nextParams['status'] = 'nok';
 
+		$changedFileList = $this->upgrader->getChangedFilesList();
+
+	//		echo '<img src="'.$originalCore.'" /> '.
+		$this->nextParams['msg'] = ($testOrigCore?$this->l('Core files are ok'):sprintf($this->l('%s core files have been modified'), sizeof($changedFileList)));
+		$this->nextParams['result'] = $changedFileList;
+	}
 	public function ajaxProcessUpgradeNow()
 	{
 		$this->nextDesc = $this->l('Starting upgrade ...');
@@ -1570,7 +1582,11 @@ txtError[37] = "'.$this->l('The config/defines.inc.php file was not found. Where
 				$configurationDone = '../img/admin/disabled.gif';
 			echo '<b>'.$this->l('Options chosen').' : </b>'.'<img src="'.$configurationDone.'" /> '.($testConfigDone?$this->l('autoupgrade configuration ok'):$this->l('Please configure autoupgrade options')).'<br/><br/>';
 
-			echo '<a class="button" id="scrollToOptions" href="#options">'.$this->l('Modify your options').'</a>';
+			echo '<b>'.$this->l('PrestaShop Original version').' : </b>'.'<span id="checkPrestaShopFilesVersion">
+			<img id="pleaseWait" src="'.__PS_BASE_URI__.'img/loader.gif"/>
+			</span>';
+
+			echo '<p> <a class="button" id="scrollToOptions" href="#options">'.$this->l('Modify your options').'</a></p>';
 			echo '</fieldset>';
 
 			echo '<br/>';
@@ -1687,6 +1703,8 @@ echo '</script>';
 .button-autoupgrade {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
 .processing {border:2px outset grey;margin-top:1px;overflow: auto;}
 #dbResultCheck{ padding-left:20px;}
+#checkPrestaShopFilesVersion{margin-bottom:20px;}
+#changedList ul{list-style-type:circle}
 </style>';
 		$this->displayWarning($this->l('This function is experimental. It\'s highly recommended to make a backup of your files and database before starting the upgrade process.'));
 
@@ -1882,8 +1900,8 @@ function afterUpgradeDb()
 {
 	// console.info("inside afterUpgradeDb");
 	// console.log(resGlobal);
-
 }
+
 function afterUpgradeComplete()
 {
 	$("#pleaseWait").hide();
@@ -2093,6 +2111,50 @@ function handleError(res)
 	}
 }
 ';
+// ajax to check md5 files
+$js.= '$(document).ready(function(){
+	$.ajax({
+			type:"POST",
+			url : "'.($this->standalone? __PS_BASE_URI__ . trim($this->adminDir,DIRECTORY_SEPARATOR).'/autoupgrade/ajax-upgradetab.php' : str_replace('index','ajax-tab',$currentIndex)).'",
+			async: true,
+			data : {
+				dir:"'.trim($this->adminDir,DIRECTORY_SEPARATOR).'",
+				token : "'.$this->token.'",
+				tab : "'.get_class($this).'",
+				action : "checkFilesVersion",
+				params : {}
+			},
+			success : function(res,textStatus,jqXHR)
+			{
+				res = $.parseJSON(res);
+				answer = res.nextParams;
+				$("#checkPrestaShopFilesVersion").html("<span>"+answer.msg+"</span> ");
+				$("#checkPrestaShopFilesVersion").append("<a id=\"toggleChangedList\" class=\"button\" href=\"\">'.$this->l('See or hide the list').'</a><br/>");
+
+				$("#checkPrestaShopFilesVersion").append("<div id=\"changedList\" style=\"display:none \">");
+				
+				$("#changedList").html("<ul>");
+				$(answer.result).each(function(k,v){
+					$("#changedList ul").append("<li>"+v+"</li>");
+				});
+
+$("#toggleChangedList").bind("click",function(e){e.preventDefault();$("#changedList").toggle();});
+
+			}
+			,
+			error: function(res,textStatus,jqXHR)
+			{
+				if (textStatus == "timeout" && action == "download")
+				{
+					updateInfoStep("'.$this->l('Your server can\'t download the file. Please upload it first by ftp in your admin/autoupgrade directory').'");
+				}
+				else
+				{
+					updateInfoStep("[Server Error] Status message : " + textStatus);
+				}
+			}
+		})
+});';
 		return $js;
 	}
 	private function _cleanUp($path)
diff --git a/modules/autoupgrade/Upgrader.php b/modules/autoupgrade/Upgrader.php
index c3c000581..da4669ebc 100644
--- a/modules/autoupgrade/Upgrader.php
+++ b/modules/autoupgrade/Upgrader.php
@@ -28,6 +28,7 @@
 class UpgraderCore{
 	const DEFAULT_CHECK_VERSION_DELAY_HOURS = 24;
 	public $rss_version_link = 'http://www.prestashop.com/xml/version.xml';
+	public $rss_md5file_link_dir = 'http://www.prestashop.com/xml/md5/';
 	/**
 	 * link contains hte url where to download the file
 	 * 
@@ -35,6 +36,8 @@ class UpgraderCore{
 	 */
 	private $needUpgrade = false;
 	private $noRefresh = false;
+	private $changedFiles = array();
+	private $missingFiles = array();
 
 	public $version_name;
 	public $version_num;
@@ -158,4 +161,65 @@ class UpgraderCore{
 			return false;
 	}
 
+	public function getChangedFilesList()
+	{
+		$checksum = simplexml_load_file($this->rss_md5file_link_dir._PS_VERSION_.'.xml');
+		if ($checksum === false)
+			throw new Exception('No checksum xml file for your Prestashop version');
+		$this->browseXmlAndCompare($checksum);	
+		
+		return $this->changedFiles;
+}
+	protected function addChangedFile($path)
+	{
+		$this->versionIsModified = true;
+		$this->changedFiles[] = $path;
+		//array_unique($this->changedFiles);
+	}
+
+	protected function addMissingFile($path)
+	{
+		$this->versionIsModified = true;
+		$this->missingFiles[] = $path;
+		//array_unique($this->missingFile);
+	}
+
+	protected function browseXmlAndCompare($node, &$currentPath = array(), $level = 0)
+	{
+		foreach ($node as $key => $child)
+		{
+			if (is_object($child) && $child->getName() != 'md5file')
+			{
+				$level += 1;
+				$currentPath[$level] = $child->getName();
+				$this->browseXmlAndCompare($child, $currentPath, $level);
+				$level -= 1;
+			}
+			else
+			{
+				$path = '';
+				for ($i=1;$i<=$level;$i++)
+					$path .= $currentPath[$i].'/';
+				$path .= (string)$child->attributes()->name;
+				$path = str_replace('ps_root_dir',_PS_ROOT_DIR_,$path);
+				if(!file_exists($path))
+					$this->addMissingFile($path);
+				else if (!$this->compareChecksum($path, (string)$child->attributes()->sum))
+					$this->addChangedFile($path);
+			}
+		}
+	}
+
+	protected function compareChecksum($path, $originalSum)
+	{
+		if (md5_file($path) == $originalSum)
+			return true;
+		return false;
+	}
+
+	public function isAuthenticPrestashopVersion()
+	{
+		return !$this->versionIsModified;
+	}
+
 }
diff --git a/modules/autoupgrade/jquery.xml2json.js b/modules/autoupgrade/jquery.xml2json.js
new file mode 100755
index 000000000..b50c87b16
--- /dev/null
+++ b/modules/autoupgrade/jquery.xml2json.js
@@ -0,0 +1 @@
+eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}(';5(10.M)(w($){$.N({11:w(j,k){5(!j)t{};w B(d,e){5(!d)t y;6 f=\'\',2=y,E=y;6 g=d.x,12=l(d.O||d.P);6 h=d.v||d.F||\'\';5(d.G){5(d.G.7>0){$.Q(d.G,w(n,a){6 b=a.x,u=l(a.O||a.P);6 c=a.v||a.F||\'\';5(b==8){t}z 5(b==3||b==4||!u){5(c.13(/^\\s+$/)){t};f+=c.H(/^\\s+/,\'\').H(/\\s+$/,\'\')}z{2=2||{};5(2[u]){5(!2[u].7)2[u]=p(2[u]);2[u][2[u].7]=B(a,R);2[u].7=2[u].7}z{2[u]=B(a)}}})}};5(d.I){5(d.I.7>0){E={};2=2||{};$.Q(d.I,w(a,b){6 c=l(b.14),C=b.15;E[c]=C;5(2[c]){5(!2[c].7)2[c]=p(2[c]);2[c][2[c].7]=C;2[c].7=2[c].7}z{2[c]=C}})}};5(2){2=$.N((f!=\'\'?A J(f):{}),2||{});f=(2.v)?(D(2.v)==\'16\'?2.v:[2.v||\'\']).17([f]):f;5(f)2.v=f;f=\'\'};6 i=2||f;5(k){5(f)i={};f=i.v||f||\'\';5(f)i.v=f;5(!e)i=p(i)};t i};6 l=w(s){t J(s||\'\').H(/-/g,"18")};6 m=w(s){t(D s=="19")||J((s&&D s=="K")?s:\'\').1a(/^((-)?([0-9]*)((\\.{0,1})([0-9]+))?$)/)};6 p=w(o){5(!o.7)o=[o];o.7=o.7;t o};5(D j==\'K\')j=$.S(j);5(!j.x)t;5(j.x==3||j.x==4)t j.F;6 q=(j.x==9)?j.1b:j;6 r=B(q,R);j=y;q=y;t r},S:w(a){6 b;T{6 c=($.U.V)?A 1c("1d.1e"):A 1f();c.1g=W}X(e){Y A L("Z 1h 1i 1j 1k 1l")};T{5($.U.V)b=(c.1m(a))?c:W;z b=c.1n(a,"v/1o")}X(e){Y A L("L 1p Z K")};t b}})})(M);',62,88,'||obj|||if|var|length||||||||||||||||||||||return|cnn|text|function|nodeType|null|else|new|parseXML|atv|typeof|att|nodeValue|childNodes|replace|attributes|String|string|Error|jQuery|extend|localName|nodeName|each|true|text2xml|try|browser|msie|false|catch|throw|XML|window|xml2json|nn|match|name|value|object|concat|_|number|test|documentElement|ActiveXObject|Microsoft|XMLDOM|DOMParser|async|Parser|could|not|be|instantiated|loadXML|parseFromString|xml|parsing'.split('|'),0,{}))
diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php
index 7830ef171..a5351525a 100644
--- a/modules/blocklayered/blocklayered.php
+++ b/modules/blocklayered/blocklayered.php
@@ -653,14 +653,17 @@ class BlockLayered extends Module
 			foreach ($filterBlock['title_values'] as $key => $val)
 				$title .= $key.' '.implode('/', $val).' – ';
 		$title = rtrim($title, ' – ');
-		$metaComplement = ucfirst(strtolower($title));
-		$metaKeyWordsComplement = str_replace(' – ', ', ', strtolower($title));
+		$metaComplement = $title;
+		$metaKeyWordsComplement = substr(str_replace(' – ', ', ', strtolower($title)), 1000);
 		
 		if (!empty($metaComplement))
 		{
-			$smarty->assign('meta_title', str_replace(' - '.Configuration::get('PS_SHOP_NAME'), ' – '.$metaComplement.' - '.Configuration::get('PS_SHOP_NAME'), $categoryMetas['meta_title']));
+			$smarty->assign('meta_title', ucfirst(strtolower(str_replace(' - '.Configuration::get('PS_SHOP_NAME'), ' – '.$metaComplement.' - '.Configuration::get('PS_SHOP_NAME'), $categoryMetas['meta_title']))));
 			$smarty->assign('meta_description', rtrim($categoryTitle.' – '.$metaComplement.' – '.$categoryMetas['meta_description'], ' – '));
 		}
+		else
+			$smarty->assign('meta_title', ucfirst(strtolower($categoryMetas['meta_title'])));
+		
 		if (!empty($metaKeyWordsComplement))
 			$smarty->assign('meta_keywords', rtrim($categoryTitle.', '.$metaKeyWordsComplement.', '.$categoryMetas['meta_keywords'], ', '));
 		
@@ -738,13 +741,13 @@ class BlockLayered extends Module
 			{
 				/* Clean categoryBox before use */
 				if (isset($_POST['categoryBox']) AND is_array($_POST['categoryBox']))
-					foreach ($_POST['categoryBox'] AS &$value)
-						$value = (int)$value;
+						foreach ($_POST['categoryBox'] AS &$categoryBoxTmp)
+							$categoryBoxTmp = (int)$categoryBoxTmp;
 				
 				Db::getInstance()->Execute('DELETE FROM '._DB_PREFIX_.'layered_category WHERE id_category IN ('.implode(',', $_POST['categoryBox']).')');
 
 				$filterValues = array();
-					foreach (Tools::getValue('categoryBox') AS $idc)
+					foreach ($_POST['categoryBox'] AS $idc)
 						$filterValues['categories'][] = (int)$idc;
 
 				$sqlToInsert = 'INSERT INTO '._DB_PREFIX_.'layered_category (id_category, id_value, type, position) VALUES ';
@@ -1389,13 +1392,15 @@ class BlockLayered extends Module
 		if ($id_parent == 1)
 			return false;
 
-		$queryFilters = ' AND p.active = 1';
+		$queryFiltersWhere = ' AND p.active = 1';
+		$queryFiltersFrom = '';
 		
 		$parent = new Category((int)$id_parent);
 		if (!sizeof($selectedFilters['category']))
-			 $queryFilters .= ' AND p.id_product IN (SELECT id_product FROM '._DB_PREFIX_.'category_product cp 
-			 LEFT JOIN '._DB_PREFIX_.'category c ON (c.id_category = cp.id_category) 
-			 WHERE 1 AND c.nleft >= '.(int)$parent->nleft.' AND c.nright <= '.(int)$parent->nright.')';
+			$queryFiltersFrom .= ' INNER JOIN '._DB_PREFIX_.'category_product cp
+			ON p.id_product = cp.id_product
+			INNER JOIN '._DB_PREFIX_.'category c ON (c.id_category = cp.id_category
+			AND c.nleft >= '.(int)$parent->nleft.' AND c.nright <= '.(int)$parent->nright.')';
 
 		foreach ($selectedFilters AS $key => $filterValues)
 		{
@@ -1415,12 +1420,12 @@ class BlockLayered extends Module
 						if(!isset($subQueries[$filterValueArray[0]]))
 							$subQueries[$filterValueArray[0]] = array();
 						$subQueries[$filterValueArray[0]][] = 'fp.`id_feature_value` = '.(int)$filterValueArray[1];
-						//$queryFilters .= 'pac.`id_attribute` = '.(int)$filterValue.' OR ';
+						//$queryFiltersWhere .= 'pac.`id_attribute` = '.(int)$filterValue.' OR ';
 					}
 					foreach($subQueries as $subQuery)
 					{
-						$queryFilters .= ' AND p.id_product IN (SELECT `id_product` FROM `'._DB_PREFIX_.'feature_product` fp WHERE ';
-						$queryFilters .= implode(' OR ', $subQuery).') ';
+						$queryFiltersWhere .= ' AND p.id_product IN (SELECT `id_product` FROM `'._DB_PREFIX_.'feature_product` fp WHERE ';
+						$queryFiltersWhere .= implode(' OR ', $subQuery).') ';
 					}
 				break;
 
@@ -1434,47 +1439,47 @@ class BlockLayered extends Module
 						if(!isset($subQuery[$filterValueArray[0]]))
 							$subQueries[$filterValueArray[0]] = array();
 						$subQueries[$filterValueArray[0]][] = 'pac.`id_attribute` = '.(int)$filterValueArray[1];
-						//$queryFilters .= 'pac.`id_attribute` = '.(int)$filterValue.' OR ';
+						//$queryFiltersWhere .= 'pac.`id_attribute` = '.(int)$filterValue.' OR ';
 					}
 					foreach($subQueries as $subQuery)
 					{
-					$queryFilters .= ' AND p.id_product IN (SELECT pa.`id_product`
+						$queryFiltersWhere .= ' AND p.id_product IN (SELECT pa.`id_product`
 										FROM `'._DB_PREFIX_.'product_attribute_combination` pac
 										LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa
 										ON (pa.`id_product_attribute` = pac.`id_product_attribute`) WHERE ';
-						$queryFilters .= implode(' OR ', $subQuery).') ';
+						$queryFiltersWhere .= implode(' OR ', $subQuery).') ';
 					}
 				break;
 
 				case 'category':
-					$queryFilters .= ' AND p.id_product IN (SELECT id_product FROM '._DB_PREFIX_.'category_product cp WHERE ';				
+					$queryFiltersWhere .= ' AND p.id_product IN (SELECT id_product FROM '._DB_PREFIX_.'category_product cp WHERE ';
 					foreach ($selectedFilters['category'] AS $id_category)
-						$queryFilters .= 'cp.`id_category` = '.(int)$id_category.' OR ';
-					$queryFilters = rtrim($queryFilters, 'OR ').')';
+						$queryFiltersWhere .= 'cp.`id_category` = '.(int)$id_category.' OR ';
+					$queryFiltersWhere = rtrim($queryFiltersWhere, 'OR ').')';
 				break;
 
 				case 'quantity':
 					if (sizeof($selectedFilters['quantity']) == 2)
 						break;
-					$queryFilters .= ' AND p.quantity '.(!$selectedFilters['quantity'][0] ? '=' : '>').' 0';
+					$queryFiltersWhere .= ' AND p.quantity '.(!$selectedFilters['quantity'][0] ? '=' : '>').' 0';
 				break;
 
 				case 'manufacturer':
-					$queryFilters .= ' AND p.id_manufacturer IN ('.implode($selectedFilters['manufacturer'], ',').')';
+					$queryFiltersWhere .= ' AND p.id_manufacturer IN ('.implode($selectedFilters['manufacturer'], ',').')';
 				break;
 
 				case 'condition':
 					if (sizeof($selectedFilters['condition']) == 3)
 						break;
-					$queryFilters .= ' AND p.condition IN (';
+					$queryFiltersWhere .= ' AND p.condition IN (';
 					foreach ($selectedFilters['condition'] AS $cond)
-						$queryFilters .= '\''.$cond.'\',';
-					$queryFilters = rtrim($queryFilters, ',').')';
+						$queryFiltersWhere .= '\''.$cond.'\',';
+					$queryFiltersWhere = rtrim($queryFiltersWhere, ',').')';
 				break;
 
 				case 'weight':
 					if ($selectedFilters['weight'][0] != 0 OR $selectedFilters['weight'][1] != 0)
-						$queryFilters .= ' AND p.`weight` BETWEEN '.(float)($selectedFilters['weight'][0] - 0.001).' AND '.(float)($selectedFilters['weight'][1] + 0.001);
+						$queryFiltersWhere .= ' AND p.`weight` BETWEEN '.(float)($selectedFilters['weight'][0] - 0.001).' AND '.(float)($selectedFilters['weight'][1] + 0.001);
 
 				case 'price':
 					if (isset($selectedFilters['price']))
@@ -1516,20 +1521,22 @@ class BlockLayered extends Module
 		SELECT p.`id_product` id_product
 		FROM `'._DB_PREFIX_.'product` p
 		'.$priceFilterQueryOut.'
-		WHERE 1 '.$queryFilters.' GROUP BY id_product');
+		'.$queryFiltersFrom.'
+		WHERE 1 '.$queryFiltersWhere.' GROUP BY id_product', false);
 		
 		$allProductsIn = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
 		SELECT p.`id_product` id_product
 		FROM `'._DB_PREFIX_.'product` p
 		'.$priceFilterQueryIn.'
-		WHERE 1 '.$queryFilters.' GROUP BY id_product');
+		'.$queryFiltersFrom.'
+		WHERE 1 '.$queryFiltersWhere.' GROUP BY id_product', false);
 
 		$productIdList = array();
 		
-		foreach ($allProductsIn as $product)
+		while ($product = DB::getInstance()->nextRow($allProductsIn))
 			$productIdList[] = (int)$product['id_product'];
 
-		foreach ($allProductsOut as $product)
+		while ($product = DB::getInstance()->nextRow($allProductsOut))
 			if (isset($priceFilter) AND $priceFilter)
 			{
 				$price = Product::getPriceStatic($product['id_product']);
@@ -1605,13 +1612,8 @@ class BlockLayered extends Module
 				case 'condition':
 				case 'quantity':
 					$sqlQuery['select'] = '
-					SELECT p.`id_product`, p.`condition`, p.`id_manufacturer`, p.`quantity`, p.`weight`,
-					(SELECT GROUP_CONCAT(`id_category`) FROM `'._DB_PREFIX_.'category_product` cp WHERE cp.`id_product` = p.`id_product`) ids_cat,
-					(SELECT GROUP_CONCAT(`id_feature_value`) FROM `'._DB_PREFIX_.'feature_product` fp WHERE fp.`id_product` = p.`id_product`) ids_feat,
-					(SELECT GROUP_CONCAT(DISTINCT(pac.`id_attribute`)) 
-					FROM `'._DB_PREFIX_.'product_attribute_combination` pac
-					LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa ON (pa.`id_product_attribute` = pac.`id_product_attribute`) 
-					WHERE pa.`id_product` = p.`id_product`) ids_attr';
+					SELECT p.`id_product`, p.`condition`, p.`id_manufacturer`, p.`quantity`, p.`weight`
+					';
 					$sqlQuery['from'] = '
 					FROM '._DB_PREFIX_.'product p ';
 					$sqlQuery['join'] = '
@@ -1906,6 +1908,7 @@ class BlockLayered extends Module
 		}
 		
 		$blackList = array('weight','price');
+		$nofollow = false;
 		foreach ($filterBlocks as &$typeFilter)
 		{	
 			if(count($typeFilter) > 0 AND !in_array($typeFilter['type'], $blackList))
@@ -1987,11 +1990,12 @@ class BlockLayered extends Module
 			INNER JOIN `'._DB_PREFIX_.'price_static_index` psi ON (psi.id_product = p.id_product AND psi.id_currency = '.(int)$idCurrency.'
 			AND psi.price_min <= '.(int)$filterValue[1].' AND psi.price_max >= '.(int)$filterValue[0].') ';
 		}
-		else{
+		else
+		{
 			$idCurrency = Currency::getCurrent()->id;
 			$priceFilterQuery = '
-			INNER JOIN `'._DB_PREFIX_.'price_static_index` psi ON (psi.id_product = p.id_product AND psi.id_currency = '.(int)$idCurrency.'
-			AND psi.`id_product` = p.`id_product` AND psi.`id_currency` = '.(int)$idCurrency.') ';
+			INNER JOIN `'._DB_PREFIX_.'price_static_index` psi 
+			ON (psi.id_product = p.id_product AND psi.id_currency = '.(int)$idCurrency.') ';
 		}
 		
 		return array('join' => $priceFilterQuery, 'select' => ', psi.price_min, psi.price_max');