From 0ac656b2187be47f96a8db76187303c21399d85e Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Fri, 2 Apr 2010 11:56:23 +0000 Subject: [PATCH] Fix: check if directory exists --- htdocs/admin/triggers.php | 3 +++ htdocs/interfaces.class.php | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/htdocs/admin/triggers.php b/htdocs/admin/triggers.php index eebbae9b87f..070edb5d7ea 100644 --- a/htdocs/admin/triggers.php +++ b/htdocs/admin/triggers.php @@ -68,6 +68,9 @@ $i = 0; foreach($interfaces->dir as $dir) { + // Check if directory exists + if (!is_dir($dir)) continue; + $handle=opendir($dir); while (($file = readdir($handle))!==false) diff --git a/htdocs/interfaces.class.php b/htdocs/interfaces.class.php index b07d2d7415d..cd634602fee 100644 --- a/htdocs/interfaces.class.php +++ b/htdocs/interfaces.class.php @@ -63,7 +63,7 @@ class Interfaces dol_syslog('interface::run_triggers was called with wrong parameters object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING); } - // Load all directory + // Load the list of directories containing triggers $this->getModulesTriggers(); foreach($this->dir as $dir) @@ -157,8 +157,8 @@ class Interfaces } /** - * \brief Return list of modules contains triggers. - * \return array List of module name. + * \brief Returns the list of directories containing triggers. + * \return array List of directories. */ function getModulesTriggers() {