From a551a424b6de88a72c1c5eaede100a3ecec1d73b Mon Sep 17 00:00:00 2001
From: mMarinetti <michael.marinetti@prestashop.com>
Date: Fri, 9 Dec 2011 15:52:37 +0000
Subject: [PATCH] // new modules hooked for default theme, fixed hook names

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11087 b9a71923-0436-4b27-9f14-aed3839534dd
---
 install-dev/sql/db_settings_extends.sql       |  7 +++----
 install-dev/sql/db_settings_lite.sql          |  2 +-
 modules/blocksupplier/blocksupplier.php       |  8 ++++----
 modules/favoriteproducts/favoriteproducts.php | 16 ++++++++--------
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/install-dev/sql/db_settings_extends.sql b/install-dev/sql/db_settings_extends.sql
index 1a24dc71a..abb367f39 100644
--- a/install-dev/sql/db_settings_extends.sql
+++ b/install-dev/sql/db_settings_extends.sql
@@ -213,6 +213,7 @@ INSERT INTO `PREFIX_hook_module` (`id_module`, `id_hook`, `position`) VALUES
 (56, 14, 6),
 /* blocksharefb */
 (57, 21, 7),
+(57, 40, 1),
 /* blocksocial */
 (58, 9, 5),
 (58, 21, 5),
@@ -226,8 +227,8 @@ INSERT INTO `PREFIX_hook_module` (`id_module`, `id_hook`, `position`) VALUES
 (62, 21, 1),
 /* favoriteproducts */
 (64, 9, 22),
-(64, 25, 1),
-(64, 40, 1),
+(64, 26, 1),
+(64, 40, 2),
 (64, 96, 1),
 /* blocknewsletter */
 (65, 9, 24),
@@ -1583,8 +1584,6 @@ REPLACE INTO `PREFIX_configuration` (id_group_shop, id_shop, name, value, `date_
 	(NULL, NULL, 'PS_STORES_DISPLAY_FOOTER','1', NOW(), NOW()),
 	(NULL, NULL, 'SHOP_LOGO_WIDTH','224', NOW(), NOW()),
 	(NULL, NULL, 'SHOP_LOGO_HEIGHT','73', NOW(), NOW()),
-	(NULL, NULL, 'EDITORIAL_IMAGE_WIDTH','530', NOW(), NOW()),
-	(NULL, NULL, 'EDITORIAL_IMAGE_HEIGHT','228', NOW(), NOW()),
 	(NULL, NULL, 'PS_DISPLAY_SUPPLIERS','1', NOW(), NOW()),
 	(NULL, NULL, 'PS_LEGACY_IMAGES','1', NOW(), NOW()),
 	(NULL, NULL, 'PS_IMAGE_QUALITY','jpg', NOW(), NOW()),
diff --git a/install-dev/sql/db_settings_lite.sql b/install-dev/sql/db_settings_lite.sql
index 179035447..9775300e4 100644
--- a/install-dev/sql/db_settings_lite.sql
+++ b/install-dev/sql/db_settings_lite.sql
@@ -174,7 +174,7 @@ INSERT INTO `PREFIX_hook` (`id_hook`, `name`, `title`, `description`, `position`
 (93, 'actionAttributeDelete', 'On deleting attribute feature value', 'On deleting attribute feature value', 0, 0),
 (94, 'actionAttributeSave', 'On saving attribute feature value', 'On saving attribute feature value', 0, 0),
 (95, 'actionTaxManager', 'Tax Manager Factory', '' , 0, 0),
-(96, 'myAccountBlock', 'My account block', 'Display extra informations inside the "my account" block', 1, 0);
+(96, 'displayMyAccountBlock', 'My account block', 'Display extra informations inside the "my account" block', 1, 0);
 
 INSERT INTO `PREFIX_configuration` (`id_configuration`, `name`, `value`, `date_add`, `date_upd`) VALUES
 (1, 'PS_LANG_DEFAULT', '1', NOW(), NOW()),
diff --git a/modules/blocksupplier/blocksupplier.php b/modules/blocksupplier/blocksupplier.php
index 80c6b77ec..ccc3bfa30 100644
--- a/modules/blocksupplier/blocksupplier.php
+++ b/modules/blocksupplier/blocksupplier.php
@@ -58,7 +58,7 @@ class BlockSupplier extends Module
 		return true;
 	}
 
-	function hookLeftColumn($params)
+	function hookDisplayLeftColumn($params)
 	{
 		$this->context->smarty->assign(array(
 			'suppliers' => Supplier::getSuppliers(false),
@@ -125,12 +125,12 @@ class BlockSupplier extends Module
 		return $output;
 	}
 	
-	function hookRightColumn($params)
+	function hookDisplayRightColumn($params)
 	{
-		return $this->hookLeftColumn($params);
+		return $this->hookDisplayLeftColumn($params);
 	}
 	
-	function hookHeader($params)
+	function hookDisplayHeader($params)
 	{
 		$this->context->controller->addCSS(($this->_path).'blocksupplier.css', 'all');
 	}
diff --git a/modules/favoriteproducts/favoriteproducts.php b/modules/favoriteproducts/favoriteproducts.php
index 7402346e3..8c27e5784 100644
--- a/modules/favoriteproducts/favoriteproducts.php
+++ b/modules/favoriteproducts/favoriteproducts.php
@@ -47,9 +47,9 @@ class FavoriteProducts extends Module
 	public function install()
 	{
 			if (!parent::install()
-				OR !$this->registerHook('myAccountBlock')
-				OR !$this->registerHook('extraLeft')
-				OR !$this->registerHook('header'))
+				|| !$this->registerHook('displayMyAccountBlock')
+				|| !$this->registerHook('displayLeftColumnProduct')
+				|| !$this->registerHook('displayHeader'))
 					return false;
 
 			if (!Db::getInstance()->execute('
@@ -74,7 +74,7 @@ class FavoriteProducts extends Module
 		return true;
 	}
 
-	public function hookCustomerAccount($params)
+	public function hookDisplayCustomerAccount($params)
 	{
 		include_once(dirname(__FILE__).'/FavoriteProduct.php');
 
@@ -85,12 +85,12 @@ class FavoriteProducts extends Module
 		return $this->display(__FILE__, 'my-account.tpl');
 	}
 
-	public function hookMyAccountBlock($params)
+	public function hookDisplayMyAccountBlock($params)
 	{
-		return $this->hookCustomerAccount($params);
+		return $this->hookDisplayCustomerAccount($params);
 	}
 
-	public function hookExtraLeft($params)
+	public function hookDisplayaLeftColumnProduct($params)
 	{
 		include_once(dirname(__FILE__).'/FavoriteProduct.php');
 
@@ -100,7 +100,7 @@ class FavoriteProducts extends Module
 		return $this->display(__FILE__, 'favoriteproducts-extra.tpl');
 	}
 
-	public function hookHeader($params)
+	public function hookDisplayHeader($params)
 	{
 		$this->context->controller->addCSS($this->_path.'favoriteproducts.css', 'all');
 	}