From e7f94d345b3c5c2ed1254538006c5107389a77ab Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 7 Sep 2010 09:57:11 +0000 Subject: [PATCH] Qual: Use a more common name of class. --- htdocs/core/class/canvas.class.php | 14 ++++++------- ...s.php => dao_thirdparty_default.class.php} | 20 +++++++++---------- ...hp => dao_thirdparty_individual.class.php} | 18 ++++++++--------- 3 files changed, 26 insertions(+), 26 deletions(-) rename htdocs/societe/canvas/default/{thirdparty.default.class.php => dao_thirdparty_default.class.php} (95%) rename htdocs/societe/canvas/individual/{thirdparty.individual.class.php => dao_thirdparty_individual.class.php} (95%) diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php index 7a4e46bcb60..4e74dbadebb 100644 --- a/htdocs/core/class/canvas.class.php +++ b/htdocs/core/class/canvas.class.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/core/class/canvas.class.php + * \file htdocs/core/class/canvas.class.php * \ingroup core * \brief Fichier de la classe de gestion des canvas * \version $Id$ @@ -128,23 +128,23 @@ class Canvas if (! $conf->$childmodule->enabled || ! $conf->$targetmodule->enabled) accessforbidden(); - if (file_exists(DOL_DOCUMENT_ROOT.'/'.$this->aliasmodule.'/canvas/'.$this->canvas.'/'.$this->targetmodule.'.'.$this->canvas.'.class.php') && - file_exists(DOL_DOCUMENT_ROOT.'/'.$this->aliasmodule.'/canvas/'.$this->canvas.'/'.$this->card.'.'.$this->canvas.'.class.php')) + if (file_exists(DOL_DOCUMENT_ROOT.'/'.$this->aliasmodule.'/canvas/'.$this->canvas.'/dao_'.$this->targetmodule.'_'.$this->canvas.'.class.php') && + file_exists(DOL_DOCUMENT_ROOT.'/'.$this->aliasmodule.'/canvas/'.$this->canvas.'/actions_'.$this->card.'_'.$this->canvas.'.class.php')) { // Include dataservice class (model) - $modelclassfile = DOL_DOCUMENT_ROOT.'/'.$this->aliasmodule.'/canvas/'.$this->canvas.'/'.$this->targetmodule.'.'.$this->canvas.'.class.php'; + $modelclassfile = DOL_DOCUMENT_ROOT.'/'.$this->aliasmodule.'/canvas/'.$this->canvas.'/dao_'.$this->targetmodule.'_'.$this->canvas.'.class.php'; include_once($modelclassfile); // Include actions class (controller) - $controlclassfile = DOL_DOCUMENT_ROOT.'/'.$this->aliasmodule.'/canvas/'.$this->canvas.'/'.$this->card.'.'.$this->canvas.'.class.php'; + $controlclassfile = DOL_DOCUMENT_ROOT.'/'.$this->aliasmodule.'/canvas/'.$this->canvas.'/actions_'.$this->card.'_'.$this->canvas.'.class.php'; include_once($controlclassfile); // Instantiate actions class (controller) - $controlclassname = ucfirst($this->card).ucfirst($this->canvas); + $controlclassname = 'Actions'.ucfirst($this->card).ucfirst($this->canvas); $this->control = new $controlclassname($this->db); // Instantiate dataservice class (model) - $modelclassname = ucfirst($this->targetmodule).ucfirst($this->canvas); + $modelclassname = 'Dao'.ucfirst($this->targetmodule).ucfirst($this->canvas); $this->control->object = new $modelclassname($this->db); // Canvas diff --git a/htdocs/societe/canvas/default/thirdparty.default.class.php b/htdocs/societe/canvas/default/dao_thirdparty_default.class.php similarity index 95% rename from htdocs/societe/canvas/default/thirdparty.default.class.php rename to htdocs/societe/canvas/default/dao_thirdparty_default.class.php index 7cc03de4e69..a86b6e0d764 100644 --- a/htdocs/societe/canvas/default/thirdparty.default.class.php +++ b/htdocs/societe/canvas/default/dao_thirdparty_default.class.php @@ -24,13 +24,13 @@ */ /** - * \class ThirdPartyDefault + * \class DaoThirdPartyDefault * \brief Classe permettant la gestion des tiers par defaut, cette classe surcharge la classe societe */ -class ThirdPartyDefault extends Societe +class DaoThirdPartyDefault extends Societe { var $db; - + //! Numero d'erreur Plage 1280-1535 var $errno = 0; @@ -38,7 +38,7 @@ class ThirdPartyDefault extends Societe * Constructeur de la classe * @param DB Handler acces base de donnees */ - function ThirdPartyDefault($DB) + function DaoThirdPartyDefault($DB) { $this->db = $DB; } @@ -54,7 +54,7 @@ class ThirdPartyDefault extends Societe return $result; } - + /** * Create third party in database * @param user Object of user that ask creation @@ -66,7 +66,7 @@ class ThirdPartyDefault extends Societe return $result; } - + /** * Update parameters of third party * @param id id societe @@ -79,10 +79,10 @@ class ThirdPartyDefault extends Societe function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0) { $result = parent::update($id, $user, $call_trigger, $allowmodcodeclient, $allowmodcodefournisseur); - + return $result; } - + /** * Delete third party in database * @param id id de la societe a supprimer @@ -90,10 +90,10 @@ class ThirdPartyDefault extends Societe function delete($id) { $result = parent::delete($id); - + return $result; } - + /** * Fetch datas list */ diff --git a/htdocs/societe/canvas/individual/thirdparty.individual.class.php b/htdocs/societe/canvas/individual/dao_thirdparty_individual.class.php similarity index 95% rename from htdocs/societe/canvas/individual/thirdparty.individual.class.php rename to htdocs/societe/canvas/individual/dao_thirdparty_individual.class.php index 66d26060a69..1cc567276dd 100644 --- a/htdocs/societe/canvas/individual/thirdparty.individual.class.php +++ b/htdocs/societe/canvas/individual/dao_thirdparty_individual.class.php @@ -24,10 +24,10 @@ */ /** - * \class ThirdPartyIndividual + * \class DaoThirdPartyIndividual * \brief Classe permettant la gestion des particuliers, cette classe surcharge la classe societe */ -class ThirdPartyIndividual extends Societe +class DaoThirdPartyIndividual extends Societe { //! Numero d'erreur Plage 1280-1535 var $errno = 0; @@ -36,7 +36,7 @@ class ThirdPartyIndividual extends Societe * Constructeur de la classe * @param DB Handler acces base de donnees */ - function ThirdPartyIndividual($DB) + function DaoThirdPartyIndividual($DB) { $this->db = $DB; } @@ -52,7 +52,7 @@ class ThirdPartyIndividual extends Societe return $result; } - + /** * Create third party in database * @param user Object of user that ask creation @@ -64,7 +64,7 @@ class ThirdPartyIndividual extends Societe return $result; } - + /** * Update parameters of third party * @param id id societe @@ -77,10 +77,10 @@ class ThirdPartyIndividual extends Societe function update($id, $user='', $call_trigger=1, $allowmodcodeclient=0, $allowmodcodefournisseur=0) { $result = parent::update($id, $user, $call_trigger, $allowmodcodeclient, $allowmodcodefournisseur); - + return $result; } - + /** * Delete third party in database * @param id id de la societe a supprimer @@ -88,10 +88,10 @@ class ThirdPartyIndividual extends Societe function delete($id) { $result = parent::delete($id); - + return $result; } - + /** * Fetch datas list */