New: possibility to use includes/modules in external modules dir

This commit is contained in:
Regis Houssin
2011-08-01 12:25:14 +00:00
parent 69eda48e8e
commit fef34412d5
243 changed files with 1141 additions and 1045 deletions

View File

@@ -3,7 +3,7 @@
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
/**
* \file htdocs/admin/modules.php
* \brief Page to activate/disable all modules
* \version $Id: modules.php,v 1.156 2011/07/31 22:23:22 eldy Exp $
* \version $Id: modules.php,v 1.158 2011/08/01 12:28:09 hregis Exp $
*/
require("../main.inc.php");
@@ -79,12 +79,36 @@ $modules = array();
$orders = array();
$categ = array();
$dirmod = array();
$modulesdir = array();
$i = 0; // is a sequencer of modules found
$j = 0; // j is module number. Automatically affected if module number not defined.
foreach ($conf->file->dol_document_root as $dirroot)
{
$dir = $dirroot . "/includes/modules/";
foreach ($conf->file->dol_document_root as $type => $dirroot)
{
$modulesdir[] = $dirroot . "/includes/modules/";
if ($type == 'alt')
{
$handle=@opendir($dirroot);
if (is_resource($handle))
{
while (($file = readdir($handle))!==false)
{
if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
{
if (is_dir($dirroot . '/' . $file . '/includes/modules/'))
{
$modulesdir[] = $dirroot . '/' . $file . '/includes/modules/';
}
}
}
closedir($handle);
}
}
}
foreach ($modulesdir as $dir)
{
// Load modules attributes in arrays (name, numero, orders) from dir directory
//print $dir."\n<br>";
dol_syslog("Scan directory ".$dir." for modules");
@@ -449,5 +473,5 @@ print '</div>';
$db->close();
llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.156 $');
llxFooter('$Date: 2011/08/01 12:28:09 $ - $Revision: 1.158 $');
?>

View File

@@ -14,14 +14,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/admin/system/index.php
* \brief Home page of system information
* \version $Id: index.php,v 1.48 2011/07/27 23:50:52 eldy Exp $
* \version $Id: index.php,v 1.49 2011/07/31 22:23:14 eldy Exp $
*/
require("../../main.inc.php");
@@ -127,5 +126,5 @@ print '<br>';
print info_admin($langs->trans("SystemInfoDesc")).'<br>';
llxFooter('$Date: 2011/07/27 23:50:52 $ - $Revision: 1.48 $');
llxFooter('$Date: 2011/07/31 22:23:14 $ - $Revision: 1.49 $');
?>

View File

@@ -12,14 +12,15 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/admin/tools/dolibarr_export.php
* \ingroup core
* \brief Page to export database
* \version $Id: dolibarr_export.php,v 1.40 2011/08/03 00:45:43 eldy Exp $
* \version $Id$
*/
require("../../main.inc.php");
@@ -331,5 +332,5 @@ $result=$formfile->show_documents('systemtools','backup',$conf->admin->dir_outpu
$db->close();
llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.40 $');
llxFooter('$Date$ - $Revision$');
?>

View File

@@ -12,14 +12,15 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/admin/tools/dolibarr_import.php
* \ingroup core
* \brief Page to import database
* \version $Id: dolibarr_import.php,v 1.24 2011/08/03 00:45:43 eldy Exp $
* \version $Id$
*/
require("../../main.inc.php");
@@ -184,5 +185,5 @@ else if ($db->label == 'PostgreSQL')
$db->close();
llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.24 $');
llxFooter('$Date$ - $Revision$');
?>

View File

@@ -12,13 +12,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/admin/tools/eaccelerator.php
* \brief Page administration de eaccelerator
* \version $Id: eaccelerator.php,v 1.18 2011/08/03 00:45:43 eldy Exp $
* \version $Id$
*/
require("../../main.inc.php");
@@ -39,7 +40,7 @@ llxHeader();
if (!function_exists('eaccelerator_info'))
{
print 'eAccelerator is not installed.';
llxfooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.18 $');
llxfooter('$Date$ - $Revision$');
exit;
}
@@ -338,5 +339,5 @@ print '<strong>Eaccelerator is created by the eAccelerator team, <a href="http:/
print "</td></tr></table>";
llxfooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.18 $');
llxfooter('$Date$ - $Revision$');
?>

View File

@@ -12,13 +12,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/admin/tools/export.php
* \brief Page to export a database into a dump file
* \version $Id: export.php,v 1.45 2011/08/03 00:45:43 eldy Exp $
* \version $Id$
*/
require("../../main.inc.php");
@@ -316,5 +317,5 @@ print '<br>';
$time_end = time();
llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.45 $');
llxFooter('$Date$ - $Revision$');
?>

View File

@@ -13,13 +13,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/admin/tools/index.php
* \brief Page d'accueil de l'espace outils admin
* \version $Id: index.php,v 1.7 2011/08/03 00:45:43 eldy Exp $
* \version $Id$
*/
require("../../main.inc.php");
@@ -56,5 +57,5 @@ print info_admin($langs->trans("SystemAreaForAdminOnly")).'<br>';
$db->close();
llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.7 $');
llxFooter('$Date$ - $Revision$');
?>

View File

@@ -13,14 +13,15 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/admin/tools/listevents.php
* \ingroup core
* \brief List of security events
* \version $Id: listevents.php,v 1.32 2011/08/03 00:45:43 eldy Exp $
* \version $Id: listevents.php,v 1.31 2011/07/18 23:28:30 eldy Exp $
*/
require("../../main.inc.php");
@@ -255,5 +256,5 @@ else
$db->close();
llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.32 $');
llxFooter('$Date: 2011/07/18 23:28:30 $ - $Revision: 1.31 $');
?>

View File

@@ -13,14 +13,15 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/admin/tools/listsessions.php
* \ingroup core
* \brief List of PHP sessions
* \version $Id: listsessions.php,v 1.12 2011/08/03 00:45:43 eldy Exp $
* \version $Id$
*/
require("../../main.inc.php");
@@ -210,5 +211,5 @@ print '<br>';
$db->close();
llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.12 $');
llxFooter('$Date$ - $Revision$');
?>

View File

@@ -12,13 +12,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/admin/tools/purge.php
* \brief Page to purge files (temporary or not)
* \version $Id: purge.php,v 1.19 2011/08/03 00:45:43 eldy Exp $
* \version $Id$
*/
require("../../main.inc.php");
@@ -171,5 +172,5 @@ if (preg_match('/^confirm/i',$_REQUEST["choice"]))
}
llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.19 $');
llxFooter('$Date$ - $Revision$');
?>

View File

@@ -13,13 +13,14 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/**
* \file htdocs/admin/tools/update.php
* \brief Page to make a Dolibarr online upgrade
* \version $Id: update.php,v 1.17 2011/08/03 00:45:43 eldy Exp $
* \version $Id$
*/
require("../../main.inc.php");
@@ -143,5 +144,5 @@ print $langs->trans("SetupIsReadyForUse").'<br>';
print '</form>';
llxFooter('$Date: 2011/08/03 00:45:43 $ - $Revision: 1.17 $');
llxFooter('$Date$ - $Revision$');
?>