From 26d7bb3a66ae53c4182046d9359815e631bfb7c4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 13 Sep 2011 12:28:09 +0000 Subject: [PATCH] Qual: Move function that should be local to class as private --- .../canvas/product/actions_card_product.class.php | 4 ++-- .../canvas/service/actions_card_service.class.php | 2 +- htdocs/societe/canvas/actions_card_common.class.php | 9 +++++---- .../actions_card_company.class.php} | 13 +++++++------ .../dao_thirdparty_company.class.php} | 13 +++++++------ .../societe/canvas/{default => company}/index.php | 0 .../{default => company}/tpl/card_create.tpl.php | 0 .../{default => company}/tpl/card_edit.tpl.php | 0 .../{default => company}/tpl/card_view.tpl.php | 0 .../canvas/{default => company}/tpl/index.php | 0 .../individual/actions_card_individual.class.php | 2 +- 11 files changed, 23 insertions(+), 20 deletions(-) rename htdocs/societe/canvas/{default/actions_card_default.class.php => company/actions_card_company.class.php} (96%) rename htdocs/societe/canvas/{default/dao_thirdparty_default.class.php => company/dao_thirdparty_company.class.php} (90%) rename htdocs/societe/canvas/{default => company}/index.php (100%) rename htdocs/societe/canvas/{default => company}/tpl/card_create.tpl.php (100%) rename htdocs/societe/canvas/{default => company}/tpl/card_edit.tpl.php (100%) rename htdocs/societe/canvas/{default => company}/tpl/card_view.tpl.php (100%) rename htdocs/societe/canvas/{default => company}/tpl/index.php (100%) diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php index ca531655eb9..7e17a84272a 100755 --- a/htdocs/product/canvas/product/actions_card_product.class.php +++ b/htdocs/product/canvas/product/actions_card_product.class.php @@ -65,7 +65,7 @@ class ActionsCardProduct extends Product /** * Return the title of card */ - function getTitle() + private function getTitle() { global $langs; @@ -250,7 +250,7 @@ class ActionsCardProduct extends Product /** * Fetch field list */ - function getFieldList() + private function getFieldList() { global $conf, $langs; diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php index ca7ea4e11c1..fb23f213c71 100755 --- a/htdocs/product/canvas/service/actions_card_service.class.php +++ b/htdocs/product/canvas/service/actions_card_service.class.php @@ -65,7 +65,7 @@ class ActionsCardService extends Product /** * Return the title of card */ - function getTitle() + private function getTitle() { global $langs; diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index e42eb3eb147..1ad0920ae45 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -348,7 +348,7 @@ abstract class ActionsCardCommon /** * Return the title of card */ - function getTitle($action) + private function getTitle($action) { global $langs; @@ -363,7 +363,8 @@ abstract class ActionsCardCommon /** * Assigne les valeurs par defaut pour le canvas - * @param action Type of template + * + * @param string $action Type of template */ function assign_values($action) { @@ -395,7 +396,7 @@ abstract class ActionsCardCommon jQuery(document).ready(function () { jQuery("#radiocompany").click(function() { document.formsoc.action.value="create"; - document.formsoc.canvas.value="default"; + document.formsoc.canvas.value="company"; document.formsoc.private.value=0; document.formsoc.submit(); }); @@ -652,7 +653,7 @@ abstract class ActionsCardCommon /** * Assigne les valeurs POST dans l'objet */ - function assign_post($action) + private function assign_post($action) { global $langs, $mysoc; diff --git a/htdocs/societe/canvas/default/actions_card_default.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php similarity index 96% rename from htdocs/societe/canvas/default/actions_card_default.class.php rename to htdocs/societe/canvas/company/actions_card_company.class.php index b85fd705a49..3f8d828b7b8 100644 --- a/htdocs/societe/canvas/default/actions_card_default.class.php +++ b/htdocs/societe/canvas/company/actions_card_company.class.php @@ -17,17 +17,17 @@ */ /** - * \file htdocs/societe/canvas/default/actions_card_default.class.php + * \file htdocs/societe/canvas/default/actions_card_company.class.php * \ingroup thirdparty * \brief Fichier de la classe Thirdparty card controller (default canvas) */ include_once(DOL_DOCUMENT_ROOT.'/societe/canvas/actions_card_common.class.php'); /** - * \class ActionsCardDefault + * \class ActionsCardCompany * \brief Class with controller methods for thirdparty canvas */ -class ActionsCardDefault extends ActionsCardCommon +class ActionsCardCompany extends ActionsCardCommon { var $db; var $targetmodule; @@ -42,7 +42,7 @@ class ActionsCardDefault extends ActionsCardCommon * @param string $canvas Name of canvas * @param string $card Name of tab (sub-canvas) */ - function ActionsCardDefault($DB,$targetmodule,$canvas,$card) + function ActionsCardCompany($DB,$targetmodule,$canvas,$card) { $this->db = $DB; $this->targetmodule = $targetmodule; @@ -53,7 +53,7 @@ class ActionsCardDefault extends ActionsCardCommon /** * Return the title of card */ - function getTitle($action) + private function getTitle($action) { global $langs; @@ -96,7 +96,8 @@ class ActionsCardDefault extends ActionsCardCommon $this->tpl['profid3'] = $this->object->ape; $this->tpl['profid4'] = $this->object->idprof4; - if ($conf->use_javascript_ajax && empty($conf->global->MAIN_DISABLEVATCHECK)) { + if ($conf->use_javascript_ajax && empty($conf->global->MAIN_DISABLEVATCHECK)) + { $js = "\n"; $js.= '