Fix: Fix regression by adding "custom" feature making web server hang in infinite loop.

This commit is contained in:
Laurent Destailleur
2010-12-15 18:15:08 +00:00
parent ebd25c5c75
commit b5e5dc3849
40 changed files with 1892 additions and 1795 deletions

View File

@@ -64,33 +64,36 @@ class ModeleExports
// Recherche des fichiers drivers exports disponibles
$var=True;
$i=0;
while (($file = readdir($handle))!==false)
{
if (preg_match("/^export_(.*)\.modules\.php$/i",$file,$reg))
{
$moduleid=$reg[1];
if (is_resource($handle))
{
while (($file = readdir($handle))!==false)
{
if (preg_match("/^export_(.*)\.modules\.php$/i",$file,$reg))
{
$moduleid=$reg[1];
// Chargement de la classe
$file = $dir."/export_".$moduleid.".modules.php";
$classname = "Export".ucfirst($moduleid);
// Chargement de la classe
$file = $dir."/export_".$moduleid.".modules.php";
$classname = "Export".ucfirst($moduleid);
require_once($file);
$module = new $classname($db);
require_once($file);
$module = new $classname($db);
// Picto
$this->picto[$module->id]=$module->picto;
// Driver properties
$this->driverlabel[$module->id]=$module->getDriverLabel();
$this->driverdesc[$module->id]=$module->getDriverDesc();
$this->driverversion[$module->id]=$module->getDriverVersion();
// If use an external lib
$this->liblabel[$module->id]=$module->getLibLabel();
$this->libversion[$module->id]=$module->getLibVersion();
$i++;
}
}
// Picto
$this->picto[$module->id]=$module->picto;
// Driver properties
$this->driverlabel[$module->id]=$module->getDriverLabel();
$this->driverdesc[$module->id]=$module->getDriverDesc();
$this->driverversion[$module->id]=$module->getDriverVersion();
// If use an external lib
$this->liblabel[$module->id]=$module->getLibLabel();
$this->libversion[$module->id]=$module->getLibVersion();
$i++;
}
}
close($handle);
}
return $this->driverlabel;
}