Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Regis Houssin
2011-08-01 13:15:53 +00:00
parent daad796a54
commit b34bc4f8c0
2 changed files with 56 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
htdocs/user/group/perms.php
View File

@@ -22,7 +22,7 @@
/**
* \file htdocs/user/group/perms.php
* \brief Onglet user et permissions de la fiche utilisateur
* \version $Id: perms.php,v 1.39 2011/07/31 23:21:25 eldy Exp $
* \version $Id: perms.php,v 1.40 2011/08/01 13:15:53 hregis Exp $
*/
require("../../main.inc.php");
@@ -93,10 +93,34 @@ if ($_GET["id"])
// Charge les modules soumis a permissions
$modules = array();
foreach ($conf->file->dol_document_root as $dirroot)
$modulesdir = array();
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)
{
$dir = $dirroot . "/includes/modules/";
// Load modules attributes in arrays (name, numero, orders) from dir directory
//print $dir."\n<br>";
$handle=@opendir($dir);
@@ -292,5 +316,5 @@ if ($_GET["id"])
$db->close();
llxFooter('$Date: 2011/07/31 23:21:25 $ - $Revision: 1.39 $');
llxFooter('$Date: 2011/08/01 13:15:53 $ - $Revision: 1.40 $');
?>

32
htdocs/user/perms.php
View File

@@ -22,7 +22,7 @@
/**
* \file htdocs/user/perms.php
* \brief Onglet user et permissions de la fiche utilisateur
* \version $Id: perms.php,v 1.56 2011/07/31 23:19:42 eldy Exp $
* \version $Id: perms.php,v 1.57 2011/08/01 13:15:54 hregis Exp $
*/
require("../main.inc.php");
@@ -120,12 +120,34 @@ $db->begin();
// Search all modules with permission and reload permissions def.
$modules = array();
$modulesdir = array();
$listdir=$conf->file->dol_document_root;
foreach($listdir as $dirroot)
foreach ($conf->file->dol_document_root as $type => $dirroot)
{
$dir=$dirroot."/includes/modules/";
$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)
{
$handle=opendir($dir);
if (is_resource($handle))
{
@@ -373,5 +395,5 @@ print '</table>';
$db->close();
llxFooter('$Date: 2011/07/31 23:19:42 $ - $Revision: 1.56 $');
llxFooter('$Date: 2011/08/01 13:15:54 $ - $Revision: 1.57 $');
?>