diff --git a/dev/skeletons/modMyModule.class.php b/dev/skeletons/modMyModule.class.php index 17fa97ec523309bdc0c74f55b4de96675ed13abf..8fa37d04ecb7e195893bcebba7f785100e542b90 100644 --- a/dev/skeletons/modMyModule.class.php +++ b/dev/skeletons/modMyModule.class.php @@ -242,7 +242,7 @@ class modMyModule extends DolibarrModules { $sql = array(); - $result=$this->load_tables(); + $result=$this->_load_tables('/mymodule/sql/'); return $this->_init($sql, $options); } @@ -262,19 +262,6 @@ class modMyModule extends DolibarrModules return $this->_remove($sql, $options); } - - /** - * Create tables, keys and data required by module - * Files llx_table1.sql, llx_table1.key.sql llx_data.sql with create table, create keys - * and create data commands must be stored in directory /mymodule/sql/ - * This function is called by this->init - * - * @return int <=0 if KO, >0 if OK - */ - function load_tables() - { - return $this->_load_tables('/mymodule/sql/'); - } } -?> +?> \ No newline at end of file diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php index ca709ba4e32566e0bdd38e6c95544f5d20818473..6e30e9785469244e7c2d9ff9e372b44900a4a295 100644 --- a/htdocs/core/modules/DolibarrModules.class.php +++ b/htdocs/core/modules/DolibarrModules.class.php @@ -3,7 +3,7 @@ * Copyright (C) 2004 Sebastien Di Cintio <sdicintio@ressource-toi.org> * Copyright (C) 2004 Benoit Mortier <benoit.mortier@opensides.be> * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com> - * Copyright (C) 2005-2012 Laurent Destailleur <eldy@users.sourceforge.net> + * Copyright (C) 2005-2013 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com> * * This program is free software; you can redistribute it and/or modify @@ -22,13 +22,12 @@ /** * \file htdocs/core/modules/DolibarrModules.class.php - * \brief Fichier de description et activation des modules Dolibarr + * \brief File of parent class of module descriptor class files */ /** - * \class DolibarrModules - * \brief Classe mere des classes de description et activation des modules Dolibarr + * Parent class of module descriptor class files */ abstract class DolibarrModules { @@ -420,7 +419,7 @@ abstract class DolibarrModules if (empty($reldir)) return 1; include_once DOL_DOCUMENT_ROOT .'/core/lib/admin.lib.php'; - + $ok = 1; foreach($conf->file->dol_document_root as $dirroot) { diff --git a/htdocs/core/modules/modGravatar.class.php b/htdocs/core/modules/modGravatar.class.php index 47e337d96d3a7f745c77afa9362d0b5892ac65d9..9a8106619cb961eba7d3093729c666c8051946df 100644 --- a/htdocs/core/modules/modGravatar.class.php +++ b/htdocs/core/modules/modGravatar.class.php @@ -189,7 +189,7 @@ class modGravatar extends DolibarrModules { $sql = array(); - $result=$this->load_tables(); + //$result=$this->_load_tables(''); return $this->_init($sql,$options); } @@ -209,19 +209,6 @@ class modGravatar extends DolibarrModules return $this->_remove($sql,$options); } - - /** - * Create tables, keys and data required by module - * Files llx_table1.sql, llx_table1.key.sql llx_data.sql with create table, create keys - * and create data commands must be stored in directory /mymodule/sql/ - * This function is called by this->init. - * - * @return int <=0 if KO, >0 if OK - */ - function load_tables() - { - return $this->_load_tables(''); - } } ?> diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php index 573d1c41af9970fa1f6e0675e8f32dbe915b8f0e..36d02d3260bd3cfb3e5dc04db98e47323d88919b 100644 --- a/htdocs/core/modules/modHoliday.class.php +++ b/htdocs/core/modules/modHoliday.class.php @@ -290,7 +290,7 @@ class modHoliday extends DolibarrModules { $sql = array(); - $result=$this->load_tables(); + //$result=$this->_load_tables(''); return $this->_init($sql); } @@ -309,19 +309,6 @@ class modHoliday extends DolibarrModules return $this->_remove($sql); } - - /** - * Create tables, keys and data required by module - * Files llx_table1.sql, llx_table1.key.sql llx_data.sql with create table, create keys - * and create data commands must be stored in directory /mymodule/sql/ - * This function is called by this->init. - * - * @return int <=0 if KO, >0 if OK - */ - function load_tables() - { - return $this->_load_tables(''); - } } -?> +?> \ No newline at end of file diff --git a/htdocs/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php index 47ae79bf7dfb392c4a38ace90b5054b349bac7e4..4aceaa1f73d99c2826f490fcf67a943dd37df3e9 100644 --- a/htdocs/core/modules/modMargin.class.php +++ b/htdocs/core/modules/modMargin.class.php @@ -124,7 +124,7 @@ class modMargin extends DolibarrModules { $sql = array(); - $result=$this->load_tables(); + //$result=$this->_load_tables(); return $this->_init($sql); } @@ -143,19 +143,6 @@ class modMargin extends DolibarrModules return $this->_remove($sql); } - - /** - * Create tables and keys required by module - * Files mymodule.sql and mymodule.key.sql with create table and create keys - * commands must be stored in directory /mymodule/sql/ - * This function is called by this->init. - * - * @return int <=0 if KO, >0 if OK - */ - function load_tables() - { - //return $this->_load_tables(); - } } -?> +?> \ No newline at end of file diff --git a/htdocs/core/modules/modPaybox.class.php b/htdocs/core/modules/modPaybox.class.php index 0d4e5fc8a219021775b747af88ee973f05231ae5..b00de1a93f010275bd6d9428d7f6e812aec33a61 100644 --- a/htdocs/core/modules/modPaybox.class.php +++ b/htdocs/core/modules/modPaybox.class.php @@ -185,7 +185,7 @@ class modPayBox extends DolibarrModules { $sql = array(); - $result=$this->load_tables(); + //$result=$this->_load_tables(''); return $this->_init($sql,$options); } @@ -205,18 +205,6 @@ class modPayBox extends DolibarrModules return $this->_remove($sql,$options); } - /** - * Create tables and keys required by module - * Files mymodule.sql and mymodule.key.sql with create table and create keys - * commands must be stored in directory /mymodule/sql/ - * This function is called by this->init. - * - * @return int <=0 if KO, >0 if OK - */ - function load_tables() - { - return $this->_load_tables(''); - } } -?> +?> \ No newline at end of file diff --git a/htdocs/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php index 5c19c00b363701708aae5b56d03d1c788bda8880..1e3645745dabb26e323cc3d0f8035e963e89309f 100644 --- a/htdocs/core/modules/modPaypal.class.php +++ b/htdocs/core/modules/modPaypal.class.php @@ -177,7 +177,7 @@ class modPaypal extends DolibarrModules { $sql = array(); - $result=$this->load_tables(); + //$result=$this->_load_tables(''); return $this->_init($sql,$options); } @@ -197,19 +197,6 @@ class modPaypal extends DolibarrModules return $this->_remove($sql,$options); } - - /** - * Create tables and keys required by module - * Files mymodule.sql and mymodule.key.sql with create table and create keys - * commands must be stored in directory /mymodule/sql/ - * This function is called by this->init. - * - * @return int <=0 if KO, >0 if OK - */ - function load_tables() - { - return $this->_load_tables(''); - } } -?> +?> \ No newline at end of file diff --git a/htdocs/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php index c8e744d9b7452f2bd323f2b63df512de4bae6a7b..7757f2a2548c1439ee537831088a84b80330d98f 100644 --- a/htdocs/core/modules/modWorkflow.class.php +++ b/htdocs/core/modules/modWorkflow.class.php @@ -165,15 +165,5 @@ class modWorkflow extends DolibarrModules return $this->_remove($sql,$options); } - /** - * Create tables and keys required by module - * This function is called by this->init. - * - * @return int <=0 if KO, >0 if OK - */ - function load_tables() - { - return $this->_load_tables(''); - } } ?>