From 4bbb7fb4b8706f2253a1099d9fa9d745daaebfae Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Wed, 4 Jan 2012 11:03:51 +0000
Subject: [PATCH] // Set admin display hooks in templates

---
 admin-dev/themes/default/template/customers/view.tpl     | 4 +---
 admin-dev/themes/default/template/feature_value/form.tpl | 2 +-
 admin-dev/themes/default/template/footer.tpl             | 2 +-
 admin-dev/themes/default/template/header.tpl             | 4 ++--
 admin-dev/themes/default/template/home/content.tpl       | 6 +++---
 admin-dev/themes/default/template/orders/view.tpl        | 9 ++++-----
 classes/AdminController.php                              | 8 --------
 controllers/admin/AdminCustomersController.php           | 3 ---
 controllers/admin/AdminFeaturesController.php            | 2 +-
 controllers/admin/AdminHomeController.php                | 5 -----
 controllers/admin/AdminOrdersController.php              | 2 --
 11 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/admin-dev/themes/default/template/customers/view.tpl b/admin-dev/themes/default/template/customers/view.tpl
index 6efe6350a..6b02f572e 100644
--- a/admin-dev/themes/default/template/customers/view.tpl
+++ b/admin-dev/themes/default/template/customers/view.tpl
@@ -148,9 +148,7 @@
 	{/if}
 	
 	{* display hook specified to this page : AdminCustomers *}
-	{if $hook !== false}
-		<div>{$hook}</div>
-	{/if}
+	<div>{hook h="displayAdminCustomers" id_customer=$customer->id}</div>
 	
 	<div class="clear">&nbsp;</div>
 	
diff --git a/admin-dev/themes/default/template/feature_value/form.tpl b/admin-dev/themes/default/template/feature_value/form.tpl
index 09c1444c8..e3cf0bcf9 100644
--- a/admin-dev/themes/default/template/feature_value/form.tpl
+++ b/admin-dev/themes/default/template/feature_value/form.tpl
@@ -28,6 +28,6 @@
 {block name="end_field_block"}
 	</div>
 	{if $input.name == 'id_feature'}
-		{if isset($hook)}{$hook}{/if}
+		{hook h="displayFeatureValueForm" id_feature_value=$feature_value->id}
 	{/if}
 {/block}
diff --git a/admin-dev/themes/default/template/footer.tpl b/admin-dev/themes/default/template/footer.tpl
index d47f2f7cb..a462583b4 100644
--- a/admin-dev/themes/default/template/footer.tpl
+++ b/admin-dev/themes/default/template/footer.tpl
@@ -27,7 +27,7 @@
 					</div>
 				</div>
 		{if $display_footer}
-				{$HOOK_FOOTER}
+				{hook h="displayBackOfficeFooter"}
 				<div id="footer">
 					<div class="footerLeft">
 						<a href="http://www.prestashop.com/" target="_blank">PrestaShop&trade; {$ps_version}</a><br />
diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index 870849725..de45740ba 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -81,7 +81,7 @@
 
 		<link rel="shortcut icon" href="{$img_dir}favicon.ico" />
 		{if $display_header}
-			{$HOOK_HEADER}
+			{hook h="displayBackOfficeHeader"}
 		{/if}
 		<!--[if IE]>
 		<link type="text/css" rel="stylesheet" href="{$base_url}css/admin-ie.css" />
@@ -191,7 +191,7 @@
 	{if $multi_shop}
 		<div id="header_shoplist"><span>{l s='Select your shop:'}</span>{$shop_list}</div>
 	{/if}
-	{$HOOK_TOP}
+	{hook h="displayBackOfficeTop"}
 	</div>
 	<ul id="menu">
 		{if !$tab}
diff --git a/admin-dev/themes/default/template/home/content.tpl b/admin-dev/themes/default/template/home/content.tpl
index 6840fd4e3..6e7f40bdf 100644
--- a/admin-dev/themes/default/template/home/content.tpl
+++ b/admin-dev/themes/default/template/home/content.tpl
@@ -110,16 +110,16 @@ $(document).ready(function() {
 	<div id="partner_preactivation"><p class="center"><img src="../img/loader.gif" alt="" />{l s='Loading...'}</p></div>
 	<div id="discover_prestashop"><p class="center"><img src="../img/loader.gif" alt="" />{l s='Loading...'}</p></div>
 	</div>
-	{$HOOK_BACKOFFICEHOME}
+	{hook h="displayBackOfficeHome"}
 </div>
 	<div class="clear">&nbsp;</div>
 <script type="text/javascript">
 $(document).ready(function() {
 
-	if({$refresh_check_version})
+	if ({$refresh_check_version})
 	{
 		$('#blockNewVersionCheck').hide();
-	$.ajax({
+		$.ajax({
 			type : 'POST',
 			data : {
 				ajax : '1',
diff --git a/admin-dev/themes/default/template/orders/view.tpl b/admin-dev/themes/default/template/orders/view.tpl
index c77bfc66d..b663cc5a4 100755
--- a/admin-dev/themes/default/template/orders/view.tpl
+++ b/admin-dev/themes/default/template/orders/view.tpl
@@ -56,8 +56,9 @@
 	{/foreach}
 	</script>
 
-	{if ($HOOK_INVOICE)}
-	<div style="float: right; margin: -40px 40px 10px 0;">{$HOOK_INVOICE}</div><br class="clear" />';
+	{assign var="hook_invoice" value={hook h="displayInvoice" id_order=$order->id}}
+	{if ($hook_invoice)}
+	<div style="float: right; margin: -40px 40px 10px 0;">{$hook_invoice}</div><br class="clear" />';
 	{/if}
 
 <div class="bloc-command">
@@ -183,9 +184,7 @@
 			{/if}
 
 			<!-- Admin order hook -->
-			{if $HOOK_ADMIN_ORDER}
-				{$HOOK_ADMIN_ORDER}
-			{/if}
+			{hook h="displayAdminOrder" id_order=$order->id}
 		</div>
 		<!-- END Left column -->
 
diff --git a/classes/AdminController.php b/classes/AdminController.php
index 256a31685..63b9122ea 100644
--- a/classes/AdminController.php
+++ b/classes/AdminController.php
@@ -1336,10 +1336,6 @@ class AdminControllerCore extends Controller
 			'is_multishop' => $is_multishop,
 			'pic_dir' => _THEME_PROD_PIC_DIR_
 		));
-		$this->context->smarty->assign(array(
-			'HOOK_HEADER' => Hook::exec('displayBackOfficeHeader'),
-			'HOOK_TOP' => Hook::exec('displayBackOfficeTop'),
-		));
 	}
 
 	/**
@@ -1426,10 +1422,6 @@ class AdminControllerCore extends Controller
 			'end_time' => number_format(microtime(true) - $this->timerStart, 3, '.', ''),
 			'iso_is_fr' => strtoupper($this->context->language->iso_code) == 'FR',
 		));
-
-		$this->context->smarty->assign(array(
-			'HOOK_FOOTER' => Hook::exec('displayBackOfficeFooter'),
-		));
 	}
 
 	/**
diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php
index e1c06cc83..46afd72d1 100644
--- a/controllers/admin/AdminCustomersController.php
+++ b/controllers/admin/AdminCustomersController.php
@@ -657,9 +657,6 @@ class AdminCustomersControllerCore extends AdminController
 			// Messages
 			'messages' => $messages,
 
-			// Display hook specified to this page : AdminCustomers
-			'hook' => Hook::exec('displayAdminCustomers', array('id_customer' => $customer->id)),
-
 			// Groups
 			'groups' => $groups,
 
diff --git a/controllers/admin/AdminFeaturesController.php b/controllers/admin/AdminFeaturesController.php
index 917acc02b..9997605e1 100644
--- a/controllers/admin/AdminFeaturesController.php
+++ b/controllers/admin/AdminFeaturesController.php
@@ -263,7 +263,7 @@ class AdminFeaturesControllerCore extends AdminController
 		$feature_value = new FeatureValue(Tools::getValue('id_feature_value'));
 
 		$this->tpl_vars = array(
-			'hook' => Hook::exec('displayFeatureValueForm', array('id_feature_value' => $feature_value->id))
+			'feature_value' => $feature_value,
 		);
 
 		$this->getlanguages();
diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php
index 9ae6707b5..c721f4601 100644
--- a/controllers/admin/AdminHomeController.php
+++ b/controllers/admin/AdminHomeController.php
@@ -564,11 +564,6 @@ class AdminHomeControllerCore extends AdminController
 		$tpl_vars['last_orders'] =$this->getLastOrders();
 		$tpl_vars['tips_optimization'] =  $this->_displayOptimizationTips();
 
-		$HOOK_BACKOFFICEHOME = Hook::exec('displayBackOfficeHome');
-		$tpl_vars['HOOK_BACKOFFICEHOME'] = $HOOK_BACKOFFICEHOME;
 		$smarty->assign($tpl_vars);
-
 	}
 }
-
-
diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php
index fc177b0f3..b58dd447f 100755
--- a/controllers/admin/AdminOrdersController.php
+++ b/controllers/admin/AdminOrdersController.php
@@ -1050,8 +1050,6 @@ class AdminOrdersControllerCore extends AdminController
 			'invoices_collection' => $order->getInvoicesCollection(),
 			'not_paid_invoices_collection' => $order->getNotPaidInvoicesCollection(),
 			'payment_methods' => $payment_methods,
-			'HOOK_INVOICE' => Hook::exec('displayInvoice', array('id_order' => $order->id)),
-			'HOOK_ADMIN_ORDER' => Hook::exec('displayAdminOrder', array('id_order' => $order->id))
 		);
 
 		return parent::renderView();