From e1bc58080cdfdd62daf01ec79e1429478d200204 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 7 Sep 2010 10:05:00 +0000
Subject: [PATCH] Qual: Rename method loadControl into doActions to have a more
 common name used by MVC frameworks.

---
 htdocs/core/class/canvas.class.php                         | 7 ++++---
 htdocs/societe/canvas/actions_card_common.class.php        | 2 +-
 .../societe/canvas/default/actions_card_default.class.php  | 7 ++++---
 .../canvas/individual/actions_card_individual.class.php    | 7 ++++---
 htdocs/societe/soc.php                                     | 7 +++----
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php
index 4e74dbadebb..5d21a82476c 100644
--- a/htdocs/core/class/canvas.class.php
+++ b/htdocs/core/class/canvas.class.php
@@ -81,11 +81,12 @@ class Canvas
 	}
 
 	/**
-	 * 	Load data control
+	 * 	Execute actions
+	 * 	@param 		Id of object (may be empty for creation)
 	 */
-	function loadControl($socid)
+	function doActions($socid)
 	{
-		return $this->control->loadControl($socid);
+		return $this->control->doActions($socid);
 	}
 
 	/**
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index 7d75518dedb..3469a5dcca3 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -337,7 +337,7 @@ class CardCommon
     /**
      *    Load data control
      */
-    function loadControl($socid)
+    function doActions($socid)
     {
     	global $conf, $user, $langs;
 
diff --git a/htdocs/societe/canvas/default/actions_card_default.class.php b/htdocs/societe/canvas/default/actions_card_default.class.php
index 992aa55be13..88a96b0fd60 100644
--- a/htdocs/societe/canvas/default/actions_card_default.class.php
+++ b/htdocs/societe/canvas/default/actions_card_default.class.php
@@ -69,11 +69,12 @@ class ActionsCardDefault extends CardCommon
     }
 
 	/**
-	 * 	Load data control
+	 * 	Execute actions
+	 * 	@param 		Id of object (may be empty for creation)
 	 */
-	function loadControl($socid)
+	function doActions($socid)
 	{
-		$return = parent::loadControl($socid);
+		$return = parent::doActions($socid);
 
 		return $return;
 	}
diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php
index 575cd630d7d..d4fe02bdcf8 100644
--- a/htdocs/societe/canvas/individual/actions_card_individual.class.php
+++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php
@@ -69,11 +69,12 @@ class ActionsCardIndividual extends CardCommon
     }
 
 	/**
-	 * 	Load data control
+	 * 	Execute actions
+	 * 	@param 		Id of object (may be empty for creation)
 	 */
-	function loadControl($socid)
+	function doActions($socid)
 	{
-		$return = parent::loadControl($socid);
+		$return = parent::doActions($socid);
 
 		return $return;
 	}
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 8f4b9e6d9a2..15473c047ac 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -30,7 +30,6 @@
  */
 
 require("../main.inc.php");
-require_once(DOL_DOCUMENT_ROOT."/core/class/canvas.class.php");
 require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formadmin.class.php");
 require_once(DOL_DOCUMENT_ROOT."/core/class/html.formcompany.class.php");
@@ -353,15 +352,15 @@ if (empty($canvas))
 }
 else
 {
-    // -----------------------------------------
+	// -----------------------------------------
     // When used with CANVAS
     // -----------------------------------------
-
+	require_once(DOL_DOCUMENT_ROOT."/core/class/canvas.class.php");
     $soccanvas = new Canvas($db);
     $soccanvas->getCanvas('thirdparty','card',$canvas);
 
     // Load data control
-    $soccanvas->loadControl($socid);
+    $soccanvas->doActions($socid);
 }