Fix: Can manage permissions for module on 2 different roots

This commit is contained in:
Laurent Destailleur 2008-05-22 00:03:58 +00:00
parent ae89bd0307
commit e8cfcd8952

View File

@ -99,9 +99,14 @@ dolibarr_fiche_head($head, 'rights', $langs->trans("User"));
$db->begin(); $db->begin();
// Charge les modules soumis a permissions // Charge les modules soumis a permissions
$dir = DOL_DOCUMENT_ROOT . "/includes/modules/";
$handle=opendir($dir);
$modules = array(); $modules = array();
$listdir=array();
$listdir[]=DOL_DOCUMENT_ROOT . "/includes/modules/";
if (defined('DOL_DOCUMENT_ROOT_BIS') && DOL_DOCUMENT_ROOT_BIS) $listdir[]=DOL_DOCUMENT_ROOT_BIS . "/includes/modules/";
foreach($listdir as $dir)
{
$handle=opendir($dir);
while (($file = readdir($handle))!==false) while (($file = readdir($handle))!==false)
{ {
if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, strlen($file) - 10) == '.class.php') if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, strlen($file) - 10) == '.class.php')
@ -110,7 +115,7 @@ while (($file = readdir($handle))!==false)
if ($modName) if ($modName)
{ {
include_once("../includes/modules/$file"); include_once($dir.$file);
$objMod = new $modName($db); $objMod = new $modName($db);
if ($objMod->rights_class) { if ($objMod->rights_class) {
@ -122,6 +127,7 @@ while (($file = readdir($handle))!==false)
} }
} }
} }
}
$db->commit(); $db->commit();