From c57e3e3d13be6bc4fde836e303abdc1c72c2d050 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 2 Feb 2011 19:34:44 +0000
Subject: [PATCH] Fix: Init at the wrong place
---
htdocs/exports/class/export.class.php | 14 ++++++++------
htdocs/imports/class/import.class.php | 7 ++++---
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index 5e9dbf4b47c..b7770ffbccc 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -70,19 +70,20 @@ class Export
dol_syslog("Export::load_arrays user=".$user->id." filter=".$filter);
+ $var=true;
+ $i=0;
+
//$dir=DOL_DOCUMENT_ROOT."/includes/modules";
foreach($conf->file->dol_document_root as $dirroot)
{
$dir = $dirroot.'/includes/modules';
- $handle=opendir($dir);
// Search available exports
$handle=@opendir($dir);
if (is_resource($handle))
{
- $var=True;
- $i=0;
- while (($file = readdir($handle))!==false)
+ // Search module files
+ while (($file = readdir($handle))!==false)
{
if (preg_match("/^(mod.*)\.class\.php$/i",$file,$reg))
{
@@ -103,9 +104,10 @@ class Export
if (is_array($module->export_code))
{
- foreach($module->export_code as $r => $value)
+ foreach($module->export_code as $r => $value)
{
- if ($filter && ($filter != $module->export_code[$r])) continue;
+ //print $i.'-'.$filter.'-'.$modulename.'-'.join(',',$module->export_code).'<br>';
+ if ($filter && ($filter != $module->export_code[$r])) continue;
// Test si permissions ok \todo tester sur toutes permissions
$perm=$module->export_permission[$r][0];
diff --git a/htdocs/imports/class/import.class.php b/htdocs/imports/class/import.class.php
index 1d18487b9a5..911d81da033 100644
--- a/htdocs/imports/class/import.class.php
+++ b/htdocs/imports/class/import.class.php
@@ -63,6 +63,9 @@ class Import
dol_syslog("Import::load_arrays user=".$user->id." filter=".$filter);
+ $var=true;
+ $i=0;
+
//$dir=DOL_DOCUMENT_ROOT."/includes/modules";
foreach($conf->file->dol_document_root as $dirroot)
{
@@ -72,9 +75,7 @@ class Import
$handle=@opendir($dir);
if (is_resource($handle))
{
- // Recherche des exports disponibles
- $var=True;
- $i=0;
+ // Search module files
while (($file = readdir($handle))!==false)
{
if (preg_match("/^(mod.*)\.class\.php/i",$file,$reg))
--
GitLab