lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Init at the wrong place

Browse Source
This commit is contained in:
Laurent Destailleur 2011-02-02 19:34:44 +00:00
parent b6b67dc4a6
commit c57e3e3d13
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/exports/class/export.class.php
View File

@ -70,18 +70,19 @@ class Export
dol_syslog("Export::load_arrays user=".$user->id." filter=".$filter); dol_syslog("Export::load_arrays user=".$user->id." filter=".$filter);
$var=true;
$i=0;
//$dir=DOL_DOCUMENT_ROOT."/includes/modules"; //$dir=DOL_DOCUMENT_ROOT."/includes/modules";
foreach($conf->file->dol_document_root as $dirroot) foreach($conf->file->dol_document_root as $dirroot)
{ {
$dir = $dirroot.'/includes/modules'; $dir = $dirroot.'/includes/modules';
$handle=opendir($dir);
// Search available exports // Search available exports
$handle=@opendir($dir); $handle=@opendir($dir);
if (is_resource($handle)) if (is_resource($handle))
{ {
$var=True; // Search module files
$i=0;
while (($file = readdir($handle))!==false) while (($file = readdir($handle))!==false)
{ {
if (preg_match("/^(mod.*)\.class\.php$/i",$file,$reg)) if (preg_match("/^(mod.*)\.class\.php$/i",$file,$reg))
@ -105,6 +106,7 @@ class Export
{ {
foreach($module->export_code as $r => $value) foreach($module->export_code as $r => $value)
{ {
//print $i.'-'.$filter.'-'.$modulename.'-'.join(',',$module->export_code).'<br>';
if ($filter && ($filter != $module->export_code[$r])) continue; if ($filter && ($filter != $module->export_code[$r])) continue;
// Test si permissions ok \todo tester sur toutes permissions // Test si permissions ok \todo tester sur toutes permissions

7
htdocs/imports/class/import.class.php
View File

@ -63,6 +63,9 @@ class Import
dol_syslog("Import::load_arrays user=".$user->id." filter=".$filter); dol_syslog("Import::load_arrays user=".$user->id." filter=".$filter);
$var=true;
$i=0;
//$dir=DOL_DOCUMENT_ROOT."/includes/modules"; //$dir=DOL_DOCUMENT_ROOT."/includes/modules";
foreach($conf->file->dol_document_root as $dirroot) foreach($conf->file->dol_document_root as $dirroot)
{ {
@ -72,9 +75,7 @@ class Import
$handle=@opendir($dir); $handle=@opendir($dir);
if (is_resource($handle)) if (is_resource($handle))
{ {
// Recherche des exports disponibles // Search module files
$var=True;
$i=0;
while (($file = readdir($handle))!==false) while (($file = readdir($handle))!==false)
{ {
if (preg_match("/^(mod.*)\.class\.php/i",$file,$reg)) if (preg_match("/^(mod.*)\.class\.php/i",$file,$reg))